-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Amphibian Additions - Phase 1 - Non-Monstrous Frogs, Toads, and Treefrogs #67259
Amphibian Additions - Phase 1 - Non-Monstrous Frogs, Toads, and Treefrogs #67259
Conversation
Hopefully cleaner than last time.
Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Reworked spawn groupings. Added descriptions for eggs and tadpoles. Reworked other details, mostly reproduction/egg related. Removed the giant tadpole/egg (for now).
"WHISTLE" flag seemed to break something, removing it. Will replace with parroted lines eventually.
Removed progression from all proxy entries (egg, tadpole, frog) and deleted the attached egg group.
Remove old frog, toad, and their respective tadpole monsters. Also removed them from all monster groups. Remove old frog egg and toad egg items. Replace old frog egg item in the only recipe it appears in (batrachian mutagen). Now able to use any variety of frog or toad egg. Replace old frog spawns with new in mapgen\sewage_treatment.json. I believe this was the cause of previous errors I encountered.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
As title
Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com>
(Hopefully) last cleanup of abstracts. Added a new tiny mutant harvest set and assigned it to all mutant tadpoles and frogs. Changed the various eggs to copy_from roe rather than chicken's eggs. Made all four toad variants poisonous and gave all mutant variants an amount of mutant toxin.
Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details. Click to expand
This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to |
Not entirely sure what's going on with test failures but it looks like you have issues with the mods since you removed normal frogs and toads. On top of my head this breaks Tameable Wildlife, I'd assume TropiCata is affected as well but you should double check all the mods to see if they don't reference things you just removed. On top of that, and I only realized it now, you're removing the eggs instead of obsoleting them which will cause errors on any saves that have those items. Either migrate them or obsolete them, please. |
I've restored the 2 items (egg_frog, egg_toad) and 4 monsters (mon_frog, mon_tadpole, mon_toad, mon_tadpole_brown) that were removed. They have been moved to the 'json\obsoletion' folder. New file (obsolete_monster.json) for the monsters. "OBSOLETE" flag added to all entries.
Sorry about that. The newest commit restores all of the deleted entries flagged and sorted for obsoletion. If I understand correctly, mods will still be able to call to the entries from the obsoletion folder. That should fix any issues of dead references, though Tamable Wildlife would need a future PR for the new species. |
Don't obsolete monsters. We don't do that. They'll just turn to breathers silently. And please don't just assume someone will make a PR to fix it for mod content, this will just break when we remove obsolete entries after next stable. Really this should be handled here. Yes, I know this can be annoying. You could hope it gets merged without that but it's a bad practice. |
Ah ok, monsters were listed among other categories in the documentation. That would explain why there were none already in the folder. So is the solution for monsters to simply remove them from spawning? If so, I can remove the obsolete flag from the 4 monsters and move them back to reptiles_amphibians.json and that should fix the mod issues. To clarify, I'm referring to making the new creatures tamable in a future PR, not fixing the errors. I wasn't assuming someone else would do that, I intend to. |
Just remove the monsters entirely. No obsoletion, no moving around. Just remove them completely - them not needing obsoletion is a relatively new thing. If they're unused you should definitely not keep them around, much less so in a normal file. Realistically you should just remove those and fix the mod conflicts in the mod files and then it should be good to go. Keeping unused content in mainline to fix mod errors isn't the way to go.
Integration isn't necessary for anything, I am only talking about fixing the mod conflicts. Tameable Wildlife has its own monsters that copy from vanilla monsters you removed. You should either remove them from Tameable Wildlife as well or make them copy from your replacements you introduced here. Having said that - other mods have errors, too. I think TropiCata animals copy from the amphibians you removed as well. Hence your test errors. Integrating things into mods isn't a necessity, I think we just had a misunderstanding in what we were talking about here. |
Fully remove old amphibian mobs. Replace Megafauna spawns for mon_frog with GROUP_FROGS_ALL. Replace old references in Tamable Wildlife with new ones to all new "normal-sized" frogs. Change copy_from's in TropiCata from egg_frog to egg_proxy_frog.
Ok, I've done all of that that in the latest commit. Old monsters have been removed entirely.
I think so, sorry for my part in it. |
Sure did, was meant to replace. Thanks for catching that! Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me so if the tests pass this looks acceptable
Right that's an awkward test to fail. Your PR Summary isn't written correctly. You only have the context in |
Ok, I think that's all that was needed |
Summary
Content "Add diversity to amphibian species to reflect other animal varieties in game and set space to expand monstrous amphibian mutants (and their zombified remains)."
Purpose of change
Add more specific natural species that function like wildlife and expand mutant varieties beyond size-growth.
Expounded on and first implementation of #67029
Describe the solution
Adds 6 new frog species, a strange (non-monstrous) version of each, and tadpoles and eggs for all 12 varieties.
The strange versions are for flavor and potential future development where they will progress into more mutated species.
Describe alternatives you've considered
Removing the existing frog, toad, and tadpoles. I still intend to eventually. My previous attempt to work them into this PR broke something so I simply worked around them and have left them for the time being.This is done in the newest commit. Everything looks clean from my initial test.
Spawns and group weights still need a lot of testing and adjustment.These have been updated and I'm happy with the current balance.
Create a weakpoints set for frog-a-forms and/or unique harvest results/items/descriptions. Neither seems very relevant with these little fellers. I expect to add them in the future with mutants the player might actually fight.
Testing
Created a world and character, teleported around checking spawns. Frog and tadpole varieties appear to be spawning in desired locations. Old entities are completely absent and the number and placement of new species feels appropriate.