Organize the remaining unorganized EOCs #68940
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
github-actions
bot
added
<Documentation>
github-actions
bot
added
astyled
|
I'm also cooking up new prosthetics stuff, and I'd prefer that this be merged beforehand so all of the EOCs can go to one place. |
|
I’m merging this so the prosthetic EOC’s are located appropriately but don’t make more organization PRs. Some of these things you’ve thoroughly broken git blame on by moving them twice. |
|
How do you fix git blame? If it's not to hard, I could try and do it. |
By never moving things in the first place. The issue comes when a thing is created by one person in one place then moved by someone else. The more times it’s moved the harder it is to find the original commit adding it. |
Maleclypse
pushed a commit
that referenced
this pull request
Nov 7, 2023
* First Draft Changes: Add new monsters (mutant frog species & their tadpoles), eggs and monstergroups for them to reproduce and spawn. Add weakpoint sets for amphibians, and effects for those weakpoints. Old monsters have been replaced in monstergroups, and rotspawn/upgrade/reproduction references. For Megafauna mod as well. Updated all amphibian data in Tamable Wildlife. Fix my own poor judgement; change all instances of "toad" in id's to "frog" for consistency. * Update reptile_amphibian.json Change "Stuntongue" to "Taser Tongue" * Error fixes, Flag updates, Stink frog stinks Mostly error fixes. Add "SMALL_HIDE" flag to frogs, as suggested in #68387 Begin testing special abilities for foul toad line. Currently, tear gas emission for aerosolized bufotoxin; NO_BREATHE flag is an imperfect solution to them gassing themselves into submission. * Update egg.json Revert ID changes * Update amphibian.json Revert ID changes * Update eggs.json Revert ID changes * Update reptile_amphibian.json Revert ID changes Fix syntax error Rename 'Foul Hogtoad' to 'Giant Hogtoad.' * Update cooking_components.json Revert ID changes * Update wilderness.json Typo fix * Update reptile_amphibian.json Revert ID changes * Update reptile_amphibian.json Remove old monster IDs * Leaps & Flavor Text Clean up some descriptions. Adjust leap values for foul toad line. Add "NO_BREATHE" flag to foul toad line to prevent gassing by kin. * Give Croaker a Croak Add Shriek and Shriek_Stun to Colossal Croaker * Evo Rate, Taser Tongue Size, Hogtoad Flavor Update all amphibian evolution rates to account for default evo factor. Embiggen the taser tongue so it can pull PCs of higher than skeletal weight. Clean up giant hogtoad description for brevity and clarity. * Taser tongue-ing message, proxy tad no grow Change taser tongue tongue attack message Remove reproduction line from tadpole abstract * Growth Rate Fine Tune Increase timers for higher tier upgrades back to something reasonable * Clean Tongue Messages & Flavor Text Tidy up some descriptions and fix more repeated articles in tongue-dodging messages. * Stat tweaks, emissions, upgrade weights Minor changes to frog stats. Added new emit for stinktoad, gave weak emit to hogtoad. Adjusted weights within upgrade groups. * Update data/json/items/comestibles/egg.json Co-authored-by: TheShadowFerret <[email protected]> * Update data/json/monsters/reptile_amphibian.json Co-authored-by: TheShadowFerret <[email protected]> * Lower spawn rates * Incorporate Minor froggy edits #68748 Adjust spawn rates and default factions to match changes in #68748 * Typos Fix typos in great beaked toad description * Typos Fix typos in great beaked toad description * Syntax fix Remove extra space in description string * Add a missing 'R' Fix flag misspelling * MOM Monster Overrides Replace 'mon_frog_mega' with new mega frog references for monster regeneration overrides in Mind Over Matter. * First Draft Changes: Add new monsters (mutant frog species & their tadpoles), eggs and monstergroups for them to reproduce and spawn. Add weakpoint sets for amphibians, and effects for those weakpoints. Old monsters have been replaced in monstergroups, and rotspawn/upgrade/reproduction references. For Megafauna mod as well. Updated all amphibian data in Tamable Wildlife. Fix my own poor judgement; change all instances of "toad" in id's to "frog" for consistency. * Update reptile_amphibian.json Change "Stuntongue" to "Taser Tongue" * Error fixes, Flag updates, Stink frog stinks Mostly error fixes. Add "SMALL_HIDE" flag to frogs, as suggested in #68387 Begin testing special abilities for foul toad line. Currently, tear gas emission for aerosolized bufotoxin; NO_BREATHE flag is an imperfect solution to them gassing themselves into submission. * Update egg.json Revert ID changes * Update amphibian.json Revert ID changes * Update eggs.json Revert ID changes * Update reptile_amphibian.json Revert ID changes Fix syntax error Rename 'Foul Hogtoad' to 'Giant Hogtoad.' * Update cooking_components.json Revert ID changes * Update wilderness.json Typo fix * Update reptile_amphibian.json Revert ID changes * Update reptile_amphibian.json Remove old monster IDs * Leaps & Flavor Text Clean up some descriptions. Adjust leap values for foul toad line. Add "NO_BREATHE" flag to foul toad line to prevent gassing by kin. * Give Croaker a Croak Add Shriek and Shriek_Stun to Colossal Croaker * Evo Rate, Taser Tongue Size, Hogtoad Flavor Update all amphibian evolution rates to account for default evo factor. Embiggen the taser tongue so it can pull PCs of higher than skeletal weight. Clean up giant hogtoad description for brevity and clarity. * Taser tongue-ing message, proxy tad no grow Change taser tongue tongue attack message Remove reproduction line from tadpole abstract * Growth Rate Fine Tune Increase timers for higher tier upgrades back to something reasonable * Clean Tongue Messages & Flavor Text Tidy up some descriptions and fix more repeated articles in tongue-dodging messages. * Stat tweaks, emissions, upgrade weights Minor changes to frog stats. Added new emit for stinktoad, gave weak emit to hogtoad. Adjusted weights within upgrade groups. * Update data/json/items/comestibles/egg.json Co-authored-by: TheShadowFerret <[email protected]> * Update data/json/monsters/reptile_amphibian.json Co-authored-by: TheShadowFerret <[email protected]> * Lower spawn rates * Incorporate Minor froggy edits #68748 Adjust spawn rates and default factions to match changes in #68748 * Typos Fix typos in great beaked toad description * Update electronics.json * Fixing Itemgroups (#69011) * Fixing Itemgroups Fixing up some itemgroups and spawns * Update locations.json * Update clothing.json * Update clothing.json * fix typos * Bugfix: Ensure all selected books are scanned to ereader * Fixes issue where not all selected books were scanned to ereader. * The problem before was that: * `ebooksave_activity_actor` expected an exact number of calls to `do_turn()` until the current books was scanned. * But player speed affects the speed of activities such as this one. * In effect, `do_turn()` is called to few times compared to `to_turns<int>( duration )` when player speed > 100. * This change therefore makes sure that all selected books are fully scanned when the activity is finished, regardless of number of calls to `do_turn()`. * The number of calls to `do_turn()` does not really matter anyway, it's just used for supporting that some books are fully scanned while the activity is running. * display selected proficiency when opening proficiency UI from character display * add more (zombie) leather mask variant (#69013) * Update masks.json * Update data/json/items/armor/masks.json 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> * fix pharmacy and doctor's office loot (#68995) * what the fuck * Update science_and_tech.json * rare drugs * painkillers * antiseptic powder * [Xedra Evolved] Misc additions (#68931) * Initial commit * spell check fixes * Thank you Ferret Co-authored-by: TheShadowFerret <[email protected]> * Update gunmods.json --------- Co-authored-by: TheShadowFerret <[email protected]> * Adjust hungry and overweight coloring in sidebar (#69005) * Update hunger.json * Update weight.json * Update sidebar-mobile.json * Update hunger.json * Remove boat hull coverage penalty for protrusions and carried vehicles (#69024) * Remove penalty from protrusions and carried parts when calculating boat hull coverage * Fix possible uninitialized value in vehicle.cpp * Increase(?) water drag coefficients for land vehicles with protrusions * Remove trailing zeroes in drag test JSON * Organize the remaining unorganized EOCs (#68940) * Organize the stuff * Update FREQUENTLY_MADE_SUGGESTIONS.md * Revert "Update FREQUENTLY_MADE_SUGGESTIONS.md" This reverts commit 0ca0c05. * Update FREQUENTLY_MADE_SUGGESTIONS.md * Organize the lab eocs * Opps, rename * try to fix some weirdness with Github * Syntax fix Remove extra space in description string * Add a missing 'R' Fix flag misspelling * MOM Monster Overrides Replace 'mon_frog_mega' with new mega frog references for monster regeneration overrides in Mind Over Matter. * MOM Overrides Fix No pattern megafrog, no regen * Effect & Family Updates -Tune up and capitalize Electrocution effect. -Add physiology dissection proficiency family to all frog monsters to match #68760 * Pattern Frog Flavor Touch up description text for pattern frogs --------- Co-authored-by: TheShadowFerret <[email protected]> Co-authored-by: gettingusedto <[email protected]> Co-authored-by: LordBarkBread <[email protected]> Co-authored-by: Tim Nordenfur <[email protected]> Co-authored-by: inogenous <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: KeremBaba <[email protected]> Co-authored-by: Anton Simakov <[email protected]> Co-authored-by: Risuga <[email protected]> Co-authored-by: Evan Balster <[email protected]> Co-authored-by: MNG-cataclysm <[email protected]>
Maleclypse
pushed a commit
to Maleclypse/Cataclysm-DDA
that referenced
this pull request
Nov 16, 2023
* Organize the stuff * Update FREQUENTLY_MADE_SUGGESTIONS.md * Revert "Update FREQUENTLY_MADE_SUGGESTIONS.md" This reverts commit 0ca0c05. * Update FREQUENTLY_MADE_SUGGESTIONS.md * Organize the lab eocs * Opps, rename * try to fix some weirdness with Github
Maleclypse
pushed a commit
to Maleclypse/Cataclysm-DDA
that referenced
this pull request
Nov 16, 2023
) * First Draft Changes: Add new monsters (mutant frog species & their tadpoles), eggs and monstergroups for them to reproduce and spawn. Add weakpoint sets for amphibians, and effects for those weakpoints. Old monsters have been replaced in monstergroups, and rotspawn/upgrade/reproduction references. For Megafauna mod as well. Updated all amphibian data in Tamable Wildlife. Fix my own poor judgement; change all instances of "toad" in id's to "frog" for consistency. * Update reptile_amphibian.json Change "Stuntongue" to "Taser Tongue" * Error fixes, Flag updates, Stink frog stinks Mostly error fixes. Add "SMALL_HIDE" flag to frogs, as suggested in CleverRaven#68387 Begin testing special abilities for foul toad line. Currently, tear gas emission for aerosolized bufotoxin; NO_BREATHE flag is an imperfect solution to them gassing themselves into submission. * Update egg.json Revert ID changes * Update amphibian.json Revert ID changes * Update eggs.json Revert ID changes * Update reptile_amphibian.json Revert ID changes Fix syntax error Rename 'Foul Hogtoad' to 'Giant Hogtoad.' * Update cooking_components.json Revert ID changes * Update wilderness.json Typo fix * Update reptile_amphibian.json Revert ID changes * Update reptile_amphibian.json Remove old monster IDs * Leaps & Flavor Text Clean up some descriptions. Adjust leap values for foul toad line. Add "NO_BREATHE" flag to foul toad line to prevent gassing by kin. * Give Croaker a Croak Add Shriek and Shriek_Stun to Colossal Croaker * Evo Rate, Taser Tongue Size, Hogtoad Flavor Update all amphibian evolution rates to account for default evo factor. Embiggen the taser tongue so it can pull PCs of higher than skeletal weight. Clean up giant hogtoad description for brevity and clarity. * Taser tongue-ing message, proxy tad no grow Change taser tongue tongue attack message Remove reproduction line from tadpole abstract * Growth Rate Fine Tune Increase timers for higher tier upgrades back to something reasonable * Clean Tongue Messages & Flavor Text Tidy up some descriptions and fix more repeated articles in tongue-dodging messages. * Stat tweaks, emissions, upgrade weights Minor changes to frog stats. Added new emit for stinktoad, gave weak emit to hogtoad. Adjusted weights within upgrade groups. * Update data/json/items/comestibles/egg.json Co-authored-by: TheShadowFerret <[email protected]> * Update data/json/monsters/reptile_amphibian.json Co-authored-by: TheShadowFerret <[email protected]> * Lower spawn rates * Incorporate Minor froggy edits CleverRaven#68748 Adjust spawn rates and default factions to match changes in CleverRaven#68748 * Typos Fix typos in great beaked toad description * Typos Fix typos in great beaked toad description * Syntax fix Remove extra space in description string * Add a missing 'R' Fix flag misspelling * MOM Monster Overrides Replace 'mon_frog_mega' with new mega frog references for monster regeneration overrides in Mind Over Matter. * First Draft Changes: Add new monsters (mutant frog species & their tadpoles), eggs and monstergroups for them to reproduce and spawn. Add weakpoint sets for amphibians, and effects for those weakpoints. Old monsters have been replaced in monstergroups, and rotspawn/upgrade/reproduction references. For Megafauna mod as well. Updated all amphibian data in Tamable Wildlife. Fix my own poor judgement; change all instances of "toad" in id's to "frog" for consistency. * Update reptile_amphibian.json Change "Stuntongue" to "Taser Tongue" * Error fixes, Flag updates, Stink frog stinks Mostly error fixes. Add "SMALL_HIDE" flag to frogs, as suggested in CleverRaven#68387 Begin testing special abilities for foul toad line. Currently, tear gas emission for aerosolized bufotoxin; NO_BREATHE flag is an imperfect solution to them gassing themselves into submission. * Update egg.json Revert ID changes * Update amphibian.json Revert ID changes * Update eggs.json Revert ID changes * Update reptile_amphibian.json Revert ID changes Fix syntax error Rename 'Foul Hogtoad' to 'Giant Hogtoad.' * Update cooking_components.json Revert ID changes * Update wilderness.json Typo fix * Update reptile_amphibian.json Revert ID changes * Update reptile_amphibian.json Remove old monster IDs * Leaps & Flavor Text Clean up some descriptions. Adjust leap values for foul toad line. Add "NO_BREATHE" flag to foul toad line to prevent gassing by kin. * Give Croaker a Croak Add Shriek and Shriek_Stun to Colossal Croaker * Evo Rate, Taser Tongue Size, Hogtoad Flavor Update all amphibian evolution rates to account for default evo factor. Embiggen the taser tongue so it can pull PCs of higher than skeletal weight. Clean up giant hogtoad description for brevity and clarity. * Taser tongue-ing message, proxy tad no grow Change taser tongue tongue attack message Remove reproduction line from tadpole abstract * Growth Rate Fine Tune Increase timers for higher tier upgrades back to something reasonable * Clean Tongue Messages & Flavor Text Tidy up some descriptions and fix more repeated articles in tongue-dodging messages. * Stat tweaks, emissions, upgrade weights Minor changes to frog stats. Added new emit for stinktoad, gave weak emit to hogtoad. Adjusted weights within upgrade groups. * Update data/json/items/comestibles/egg.json Co-authored-by: TheShadowFerret <[email protected]> * Update data/json/monsters/reptile_amphibian.json Co-authored-by: TheShadowFerret <[email protected]> * Lower spawn rates * Incorporate Minor froggy edits CleverRaven#68748 Adjust spawn rates and default factions to match changes in CleverRaven#68748 * Typos Fix typos in great beaked toad description * Update electronics.json * Fixing Itemgroups (CleverRaven#69011) * Fixing Itemgroups Fixing up some itemgroups and spawns * Update locations.json * Update clothing.json * Update clothing.json * fix typos * Bugfix: Ensure all selected books are scanned to ereader * Fixes issue where not all selected books were scanned to ereader. * The problem before was that: * `ebooksave_activity_actor` expected an exact number of calls to `do_turn()` until the current books was scanned. * But player speed affects the speed of activities such as this one. * In effect, `do_turn()` is called to few times compared to `to_turns<int>( duration )` when player speed > 100. * This change therefore makes sure that all selected books are fully scanned when the activity is finished, regardless of number of calls to `do_turn()`. * The number of calls to `do_turn()` does not really matter anyway, it's just used for supporting that some books are fully scanned while the activity is running. * display selected proficiency when opening proficiency UI from character display * add more (zombie) leather mask variant (CleverRaven#69013) * Update masks.json * Update data/json/items/armor/masks.json 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> * fix pharmacy and doctor's office loot (CleverRaven#68995) * what the fuck * Update science_and_tech.json * rare drugs * painkillers * antiseptic powder * [Xedra Evolved] Misc additions (CleverRaven#68931) * Initial commit * spell check fixes * Thank you Ferret Co-authored-by: TheShadowFerret <[email protected]> * Update gunmods.json --------- Co-authored-by: TheShadowFerret <[email protected]> * Adjust hungry and overweight coloring in sidebar (CleverRaven#69005) * Update hunger.json * Update weight.json * Update sidebar-mobile.json * Update hunger.json * Remove boat hull coverage penalty for protrusions and carried vehicles (CleverRaven#69024) * Remove penalty from protrusions and carried parts when calculating boat hull coverage * Fix possible uninitialized value in vehicle.cpp * Increase(?) water drag coefficients for land vehicles with protrusions * Remove trailing zeroes in drag test JSON * Organize the remaining unorganized EOCs (CleverRaven#68940) * Organize the stuff * Update FREQUENTLY_MADE_SUGGESTIONS.md * Revert "Update FREQUENTLY_MADE_SUGGESTIONS.md" This reverts commit 0ca0c05. * Update FREQUENTLY_MADE_SUGGESTIONS.md * Organize the lab eocs * Opps, rename * try to fix some weirdness with Github * Syntax fix Remove extra space in description string * Add a missing 'R' Fix flag misspelling * MOM Monster Overrides Replace 'mon_frog_mega' with new mega frog references for monster regeneration overrides in Mind Over Matter. * MOM Overrides Fix No pattern megafrog, no regen * Effect & Family Updates -Tune up and capitalize Electrocution effect. -Add physiology dissection proficiency family to all frog monsters to match CleverRaven#68760 * Pattern Frog Flavor Touch up description text for pattern frogs --------- Co-authored-by: TheShadowFerret <[email protected]> Co-authored-by: gettingusedto <[email protected]> Co-authored-by: LordBarkBread <[email protected]> Co-authored-by: Tim Nordenfur <[email protected]> Co-authored-by: inogenous <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: KeremBaba <[email protected]> Co-authored-by: Anton Simakov <[email protected]> Co-authored-by: Risuga <[email protected]> Co-authored-by: Evan Balster <[email protected]> Co-authored-by: MNG-cataclysm <[email protected]>
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
Infrastructure "Organize the remaining unorganized EOCs."
Purpose of change
I noticed that quite a few mutation EOCs were still located in the mutations folder, and not the new EOC folder. I decided moving those there was a good idea. In the process, I decided to split up the generic mutation_eocs file into a more specialized, organized folder. I also noticed that the nested labs had a lot of EOCs in it's own folder, and so I though that it would be a good idea to list those in the
mapgen_eocsfolder for ease of access.Describe the solution
Move all the mutation EOCs in the mutations folder into the EOCs folder, and split the file up into more specialized ones. That includes EOCs on activation, recurring passive ones, and the stuff related to prosthetics. Also, move all the EOC code from the lab mapgen subfolder into its own file under
mapgen_eocs, and have the old one store the mapgen updates for that lab.Describe alternatives you've considered
I considered moving the prosthetics stuff to the item EOCs file, but since they interface with mutations so much, I decided to keep them with the mutations. I also thought about moving the whole lab EOCs folder with mapgen updates included, but I decided against it because that would violate the organizational precedents set by EOC moving.
Testing
Loaded the game up, no issues.
Additional context
I hope that these changes can justify modifying gitblame, like Maleclypse said last time.
Also, I don't know what in the world is happening with the frequently made suggestions file, I just copy-pasted the version from the Github docs on this site into it to try and fix that.Whatever strangeness was going on with the documentation has been fixed.