[ Xedra Evolved ] Fix Gracken trait improving items #82716
Merged
Conversation
This file contains hidden or 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
code changes
github-actions
bot
added
NPC / Factions
github-actions
bot
added
the
json-styled
Maleclypse
changed the title
github-actions
bot
added
astyled
Maleclypse
commented
Aug 31, 2025
Maleclypse
commented
Aug 31, 2025
github-actions
bot
added
astyled
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Maleclypse
force-pushed
the
Gracken-get-their-crap-working
branch
from
42f9184 to
5a261e1
Compare
github-actions
bot
added
Crafting / Construction / Recipes
Maleclypse
commented
Sep 3, 2025
Maleclypse
commented
Sep 3, 2025
Maleclypse
commented
Sep 3, 2025
github-actions
bot
added
the
astyled
Maleclypse
changed the title
…aleclypse/Cataclysm-DDA into Gracken-get-their-crap-working
Maleclypse
commented
Sep 3, 2025
Maleclypse
commented
Sep 3, 2025
…aleclypse/Cataclysm-DDA into Gracken-get-their-crap-working
Maleclypse
commented
Sep 13, 2025
github-actions
bot
added
the
BasicBuildPassed
|
Clang error should be resolved |
Blueflowerss
pushed a commit
to Blueflowerss/Cataclysm-DDA
that referenced
this pull request
Sep 22, 2025
* Update monster_drops.json * Quick and dirty craft failure explosions code changes * Update crafting.cpp * Update mutation.cpp * Update src/mutation.cpp * Update src/mutation.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update mutation.cpp * Update mutation.cpp * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/mutation.cpp * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * items work again * Fix EOC not respecting mutation type * Test * Update src/npctalk.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update npctalk.cpp * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/npctalk.cpp * Update src/npctalk.cpp * Update src/npctalk.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update iuse_test.cpp * Apply suggestions from code review * Update iuse_test.cpp * Update src/mutation.cpp * Update tests/iuse_test.cpp * Apply suggestions from code review * Update npctalk.cpp --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@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.
Summary
None
Purpose of change
Fixes the issues where Gracken parts were broken as unusable comestibles. Might make a test to confirm these work in perpetuity.
Describe the solution
Make them single use tools and add code to make Type conflicting traits get deleted when an EOC adds a trait with the same type.
Describe alternatives you've considered
Deleting gracken characters entirely if I couldn't get this to work as the alternatives were things that would spiral out of control.
Testing
Tested and it works.
Additional context