Skip to content
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

Merged

Conversation

TheSaddestGoomba
Copy link
Contributor

@TheSaddestGoomba TheSaddestGoomba commented Jul 29, 2023

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.

Hopefully cleaner than last time.
Remove redundancy
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map labels Jul 29, 2023
data/json/monsters/reptile_amphibian.json Outdated Show resolved Hide resolved
data/json/monstergroups/eggs.json Outdated Show resolved Hide resolved
data/json/monsters/reptile_amphibian.json Outdated Show resolved Hide resolved
TheSaddestGoomba and others added 6 commits July 29, 2023 10:50
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.
@TheSaddestGoomba TheSaddestGoomba marked this pull request as ready for review August 5, 2023 21:59
@github-actions github-actions bot added the Map / Mapgen Overmap, Mapgen, Map extras, Map display label Aug 5, 2023
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Aug 8, 2023
data/json/monsters/reptile_amphibian.json Show resolved Hide resolved
data/json/items/comestibles/egg.json Outdated Show resolved Hide resolved
data/json/items/comestibles/egg.json Outdated Show resolved Hide resolved
data/json/items/comestibles/egg.json Outdated Show resolved Hide resolved
TheSaddestGoomba and others added 2 commits August 10, 2023 15:42
(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.
@github-actions
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • Based on its vestigial tail, you might call it a polliwog. That is if it weren't so large and didn't already move like an adult frog. In any case, it looks to have some growing left to do.
  • This large frog is covered in chaotic markings like a fractal river map over a background of tv static.
  • This treefrog can change its coloration much like a chameleon, shifting from a near-white gray, through greens and browns, to a dark, almost charcoal color.
  • gray treefrog
  • gray treefrogs
  • shifting treefrog
  • shifting treefrogs
  • vocal treefrog
  • vocal treefrogs

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@Karol1223
Copy link
Contributor

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.
@github-actions github-actions bot added the Monsters Monsters both friendly and unfriendly. label Aug 13, 2023
@TheSaddestGoomba
Copy link
Contributor Author

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.
The old entities have already been removed from all monstergroups in mainline so shouldn't spawn there.
I think that should leave everything sorted now.

@Karol1223
Copy link
Contributor

Karol1223 commented Aug 13, 2023

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.

@TheSaddestGoomba
Copy link
Contributor Author

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.
I don't mind including the mod integration in this one, and I don't find it annoying; it will simply take more time.
I do however think it's a large barrier to contributing if any new creature addition is expected to also be integrated into mod features out the gate.

@Karol1223
Copy link
Contributor

Karol1223 commented Aug 13, 2023

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.

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.

I do however think it's a large barrier to contributing if any new creature addition is expected to also be integrated into mod features out the gate.

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.
@github-actions github-actions bot added Mods Issues related to mods or modding Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods: Tamable Wildlife labels Aug 15, 2023
@TheSaddestGoomba
Copy link
Contributor Author

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.

Ok, I've done all of that that in the latest commit. Old monsters have been removed entirely.
I believe I got everything in TropiCata and Tamable Wildlife updated with new references. Megafauna also had some references to mon_frog in monstergroups.

Integrating things into mods isn't a necessity, I think we just had a misunderstanding in what we were talking about here.

I think so, sorry for my part in it.

Sure did, was meant to replace. Thanks for catching that!

Co-authored-by: Karol1223 <[email protected]>
Copy link
Contributor

@Karol1223 Karol1223 left a 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

@Karol1223
Copy link
Contributor

Karol1223 commented Aug 17, 2023

Right that's an awkward test to fail. Your PR Summary isn't written correctly. You only have the context in ", without the word prefix you gotta choose from

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 17, 2023
@TheSaddestGoomba
Copy link
Contributor Author

Ok, I think that's all that was needed

@Maleclypse Maleclypse merged commit 65e16f9 into CleverRaven:master Aug 19, 2023
@TheSaddestGoomba TheSaddestGoomba deleted the Amphibian_Additions_Phase_1 branch August 20, 2023 16:24
@TheSaddestGoomba TheSaddestGoomba mentioned this pull request Sep 3, 2023
82 tasks
@Karol1223 Karol1223 mentioned this pull request Oct 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods: Tamable Wildlife Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly. Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants