Fix-up prying until builds + works #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix compile errors Finish up pry_result loading Add pry_result checking Add JSON for previously hardcoded prying results
chaosvolt
pushed a commit
that referenced
this pull request
Jan 19, 2025
* Mana circlet wearing The mana circlet couldn't be worn with helmets or any other headwear for some reason; this allows it to be worn underneath other helmets or just with hats, making it more useful. * Stone fists fix Stone fists are no longer armor, and thus will spawn wielded instead of worn, making them much more useful as emergency melee weapons.
chaosvolt
added a commit
that referenced
this pull request
Feb 25, 2025
* mroe based_on speed * tmp * temp * json tidy * restructure #1 * more fields * style(autofix.ci): automated formatting * wb_wrapper * speed recalc * speed calculation overhaul pt.1 * json overhaul #2 * minor logic fixes * revert crafting changes (for now) * style(autofix.ci): automated formatting * Resolving reviews * missied a spot * consistency with player_activity constructor * total moves must be set * Activity message * some saved info * damn optional * static * Revert "consistency with player_activity constructor" This reverts commit 60aa333. * remove balance changes for now * bool speacial and some other vals * complex progress calc * fix tests to use new value * style(autofix.ci): automated formatting * possible test fix * I don't like this * i don't like this less * stats, skills and qualities * style(autofix.ci): automated formatting * fix json * commentaries and json de//serializers * style(autofix.ci): automated formatting * fix de//serialization try 1 * minor fixes * deserialize done right * docs * style(autofix.ci): automated formatting * data migration * fix migration * Update src/activity_actor.cpp Co-authored-by: scarf <greenscarf005@gmail.com> * style(autofix.ci): automated formatting * remove default constructor * reviews * Apply suggestions from code review Co-authored-by: OrenAudeles <orenaudeles@gmail.com> * Update src/activity_actor.cpp Co-authored-by: OrenAudeles <orenaudeles@gmail.com> * review suggestions * Update src/activity_actor.cpp Co-authored-by: OrenAudeles <orenaudeles@gmail.com> * more suggestions * move progress to actor * style(autofix.ci): automated formatting * back to deque * forgotten returns * fix endless gates * fucking type * json additions * docs * style(autofix.ci): automated formatting * Apply suggestions from code review Co-authored-by: OrenAudeles <orenaudeles@gmail.com> * empty() and debugmsg * removed debug msg * shuffle funcs * reviews * missed few benches * style(autofix.ci): automated formatting * get map * nullptr check * remove unused vars * style(autofix.ci): automated formatting * better way * revert "some fucky arbitrary json formatting stuff" * few more unused vars * Woe, non-verbose tooltip upon thee * I did it wrong way --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: scarf <greenscarf005@gmail.com> Co-authored-by: OrenAudeles <orenaudeles@gmail.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix compile errors
Finish up pry_result loading
Add pry_result checking
Add JSON for previously hardcoded prying results