Amphibian Additions - Phase 1 - Non-Monstrous Frogs, Toads, and Treef…

…rogs (#67259) * Rebuild of Phase 1 Hopefully cleaner than last time. * Bugfix Remove redundancy * Update data/json/monsters/reptile_amphibian.json Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> * Update reptile_amphibian.json * Clean up of new monsters and groups Reworked spawn groupings. Added descriptions for eggs and tadpoles. Reworked other details, mostly reproduction/egg related. Removed the giant tadpole/egg (for now). * Remove "WHISTLE" flag "WHISTLE" flag seemed to break something, removing it. Will replace with parroted lines eventually. * Cleanup Abstracts Removed progression from all proxy entries (egg, tadpole, frog) and deleted the attached egg group. * Remove old monsters and replace references 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. * Update data/json/requirements/cooking_components.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix missing double-spaces As title * Make abstract egg an abstract Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> * Mutant meat and egg nutrition (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. * Restore deleted entries, set for obsoletion 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. * Mods Updates 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. * Update data/mods/Megafauna/monstergroups/wilderness.json Sure did, was meant to replace. Thanks for catching that! Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> --------- Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Aug 19, 2023 · 65e16f9 · 65e16f9
1 parent b7e3e97
commit 65e16f9
Show file tree

Hide file tree

Showing 14 changed files with 1,112 additions and 159 deletions.
diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -462,6 +462,15 @@
       { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 }
     ]
   },
+  {
+    "id": "mutant_tiny",
+    "//": "mutants so tiny they don't drop chunks of meat",
+    "type": "harvest",
+    "entries": [
+      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.5 },
+      { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 }
+    ]
+  },
   {
     "id": "mammal_small_fur",
     "//": "does not drop stomach or other small organs",

diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -1028,16 +1028,6 @@
     "fun": 5,
     "flags": [  ]
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_frog",
-    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
-    "copy-from": "egg_chicken",
-    "weight": "20 g",
-    "volume": "650 ml",
-    "description": "A large clump of frog eggs.  They're gelatinous and transparent.",
-    "rot_spawn": "GROUP_EGG_FROG"
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_goose",
@@ -1097,14 +1087,6 @@
     "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_GREBE"
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_toad",
-    "name": { "str": "cluster of toad's eggs", "str_pl": "clusters of toad's eggs" },
-    "copy-from": "egg_frog",
-    "description": "A large clump of the eggs of a toad.  The eggs themselves are gelatinous and transparent.",
-    "rot_spawn": "GROUP_EGG_TOAD"
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_water_beetle",
@@ -1165,5 +1147,115 @@
     "material": [ "egg", "veggy" ],
     "fun": 5,
     "flags": [ "EATEN_HOT", "FREEZERBURN" ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "abstract": "egg_proxy_frog",
+    "copy-from": "egg_fish",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "color": "brown",
+    "description": "A large clump of frog eggs.  They're gelatinous and transparent.",
+    "price": 25,
+    "price_postapoc": 50,
+    "fun": -16,
+    "vitamins": [ [ "iron", 4 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_leo_frog",
+    "copy-from": "egg_proxy_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "description": "This is a dense cluster of dark frog's eggs, not dissimilar in appearance to caviar.",
+    "rot_spawn": "GROUP_EGG_LEO_FROG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_pattern_frog",
+    "copy-from": "egg_leo_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "rot_spawn": "GROUP_EGG_PATTERN_FROG",
+    "vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_bullfrog_frog",
+    "copy-from": "egg_proxy_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "description": "A thin film of frog eggs floats together atop the water in a roughly circular mass.",
+    "rot_spawn": "GROUP_EGG_BULLFROG_FROG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_strange_frog",
+    "copy-from": "egg_bullfrog_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "rot_spawn": "GROUP_EGG_STRANGE_FROG",
+    "vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_fowler_toad",
+    "copy-from": "egg_proxy_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "description": "These eggs float in long strands, drifting in the still water.",
+    "use_action": [ "POISON" ],
+    "rot_spawn": "GROUP_EGG_FOWLER_TOAD"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_foul_toad",
+    "copy-from": "egg_fowler_toad",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "rot_spawn": "GROUP_EGG_FOUL_TOAD",
+    "vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_freedom_toad",
+    "copy-from": "egg_proxy_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "description": "A spiral strand of frog eggs adorns a patch of underwater vegetation.",
+    "use_action": [ "POISON" ],
+    "rot_spawn": "GROUP_EGG_FREEDOM_TOAD"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_odd_toad",
+    "copy-from": "egg_freedom_toad",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "rot_spawn": "GROUP_EGG_ODD_TOAD",
+    "vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_peeper_frog",
+    "copy-from": "egg_proxy_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "description": "A loose grouping of surprisingly few frog's eggs, anchored to submerged vegetation.",
+    "rot_spawn": "GROUP_EGG_PEEPER_FROG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_vocal_frog",
+    "copy-from": "egg_peeper_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "rot_spawn": "GROUP_EGG_VOCAL_FROG",
+    "vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_gray_frog",
+    "copy-from": "egg_proxy_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "description": "A small patch of frog's eggs rests on the water's surface.",
+    "rot_spawn": "GROUP_EGG_GRAY_FROG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_shift_frog",
+    "copy-from": "egg_gray_frog",
+    "name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
+    "rot_spawn": "GROUP_EGG_SHIFT_FROG",
+    "vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
   }
 ]
diff --git a/data/json/mapgen/sewage_treatment.json b/data/json/mapgen/sewage_treatment.json
@@ -152,7 +152,7 @@
       { "monster": "mon_sewer_rat", "weight": 100, "cost_multiplier": 0, "pack_size": [ 3, 6 ] },
       { "monster": "mon_albino_penguin", "weight": 5, "cost_multiplier": 5, "pack_size": [ 3, 9 ] },
       { "monster": "mon_gator", "weight": 40, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
-      { "monster": "mon_frog", "weight": 10, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
+      { "group": "GROUP_FROGS_SEWER", "weight": 250 },
       { "monster": "mon_zombullfrog", "weight": 10, "cost_multiplier": 2 },
       { "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3 }
     ]