Cleaner frogs (#76680)

* Move all zed frogs to their own file * Cleanup redundant objects -remove tadpoles: pattern, strange, foul, odd, tail, palette -replace with bigtads: vocal, shift -update upgrades to use GROUP -add obsolete egg items to migration * Cleanup GROUPs -remove redundant egg groups -remove eliminated tadpoles from monster_groups -add replacement big tads to groups -add tadpole upgrade groups that allow for elimination of redundant eggs and tadpoles * Adjust rate of tadpoles upgrading into mutants * Fix bullfrog tadpole upgrades
CleverRaven · Oct 3, 2024 · a8978f8 · a8978f8
1 parent c5c0114
commit a8978f8
Show file tree

Hide file tree

Showing 8 changed files with 821 additions and 830 deletions.
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -1573,5 +1573,22 @@
     "description": "This is a spiral strand of giant frog eggs.  Its increased weight and size nearly smothers the submerged vegetation it clings to.",
     "use_action": [ "POISON" ],
     "rot_spawn": "GROUP_EGG_ODD_BIGFROG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_vocal_bigfrog",
+    "copy-from": "egg_proxy_bigfrog",
+    "name": { "str": "cluster of giant frog's eggs", "str_pl": "clusters of giant frog's eggs" },
+    "description": "A patch of giant frog's eggs resembling a very thick, clear sack of oranges.",
+    "rot_spawn": "GROUP_EGG_VOCAL_BIGFROG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_shift_bigfrog",
+    "copy-from": "egg_proxy_bigfrog",
+    "name": { "str": "cluster of giant frog's eggs", "str_pl": "clusters of giant frog's eggs" },
+    "description": "These golfball-sized frog eggs cling together by their sticky membranes.",
+    "use_action": [ "POISON" ],
+    "rot_spawn": "GROUP_EGG_SHIFT_BIGFROG"
   }
 ]
diff --git a/data/json/monstergroups/amphibian.json b/data/json/monstergroups/amphibian.json
@@ -5,43 +5,37 @@
     "default": "mon_peeper_tadpole",
     "monsters": [
       { "monster": "mon_leo_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_pattern_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       {
         "monster": "mon_bullfrog_tadpole",
         "weight": 100,
         "pack_size": [ 6, 12 ],
         "conditions": [ "SPRING", "SUMMER" ]
       },
-      { "monster": "mon_strange_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_fowler_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_foul_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       {
         "monster": "mon_freedom_tadpole",
         "weight": 100,
         "pack_size": [ 6, 12 ],
         "conditions": [ "SPRING", "SUMMER" ]
       },
-      { "monster": "mon_odd_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_peeper_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_vocal_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_gray_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_shift_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_mink_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_tail_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       {
         "monster": "mon_pickerel_tadpole",
         "weight": 100,
         "pack_size": [ 6, 12 ],
         "conditions": [ "SPRING", "SUMMER" ]
       },
-      { "monster": "mon_palette_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_green_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_wood_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_spade_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
       { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
       { "monster": "mon_foul_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
-      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" }
+      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_vocal_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_shift_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" }
     ]
   },
   {
@@ -50,17 +44,11 @@
     "default": "mon_leo_tadpole",
     "monsters": [
       { "monster": "mon_leo_tadpole", "weight": 60, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_pattern_tadpole", "weight": 40, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_bullfrog_tadpole", "weight": 60, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_strange_tadpole", "weight": 40, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_fowler_tadpole", "weight": 60, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_foul_tadpole", "weight": 40, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_freedom_tadpole", "weight": 60, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_odd_tadpole", "weight": 40, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_mink_tadpole", "weight": 60, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_tail_tadpole", "weight": 40, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_pickerel_tadpole", "weight": 60, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_palette_tadpole", "weight": 40, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_green_tadpole", "weight": 60, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
       { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
@@ -74,16 +62,13 @@
     "default": "mon_bullfrog_tadpole",
     "monsters": [
       { "monster": "mon_leo_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_pattern_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       {
         "monster": "mon_bullfrog_tadpole",
         "weight": 100,
         "pack_size": [ 6, 12 ],
         "conditions": [ "SPRING", "SUMMER" ]
       },
-      { "monster": "mon_strange_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_mink_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_tail_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_green_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
       { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" }
@@ -95,38 +80,32 @@
     "default": "mon_bullfrog_tadpole",
     "monsters": [
       { "monster": "mon_leo_tadpole", "weight": 60, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_pattern_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       {
         "monster": "mon_bullfrog_tadpole",
         "weight": 60,
         "pack_size": [ 6, 12 ],
         "conditions": [ "SPRING", "SUMMER" ]
       },
-      { "monster": "mon_strange_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_fowler_tadpole", "weight": 60, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_foul_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_freedom_tadpole", "weight": 60, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_odd_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_peeper_tadpole", "weight": 60, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_vocal_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_gray_tadpole", "weight": 60, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_shift_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_mink_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_tail_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       {
         "monster": "mon_pickerel_tadpole",
         "weight": 100,
         "pack_size": [ 6, 12 ],
         "conditions": [ "SPRING", "SUMMER" ]
       },
-      { "monster": "mon_palette_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_green_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_wood_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_spade_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
       { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
       { "monster": "mon_foul_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
-      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" }
+      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_vocal_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_shift_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" }
     ]
   },
   {
@@ -930,7 +909,47 @@
     "name": "GROUP_TADPOLE_LEO",
     "type": "monstergroup",
     "default": "mon_leo_frog",
-    "monsters": [ { "monster": "mon_leo_frog", "weight": 99 }, { "monster": "mon_leo_worm", "weight": 1 } ]
+    "monsters": [
+      { "monster": "mon_leo_frog", "weight": 90 },
+      { "monster": "mon_pattern_frog", "weight": 9 },
+      { "monster": "mon_leo_worm", "weight": 1 }
+    ]
+  },
+  {
+    "name": "GROUP_TADPOLE_BULLFROG",
+    "type": "monstergroup",
+    "default": "mon_bullfrog_frog",
+    "monsters": [ { "monster": "mon_bullfrog_frog", "weight": 90 }, { "monster": "mon_strange_frog", "weight": 10 } ]
+  },
+  {
+    "name": "GROUP_TADPOLE_FOWLER",
+    "type": "monstergroup",
+    "default": "mon_fowler_toad",
+    "monsters": [ { "monster": "mon_fowler_toad", "weight": 90 }, { "monster": "mon_foul_toad", "weight": 10 } ]
+  },
+  {
+    "name": "GROUP_TADPOLE_FREEDOM",
+    "type": "monstergroup",
+    "default": "mon_freedom_toad",
+    "monsters": [ { "monster": "mon_freedom_toad", "weight": 90 }, { "monster": "mon_odd_toad", "weight": 10 } ]
+  },
+  {
+    "name": "GROUP_TADPOLE_PEEPER",
+    "type": "monstergroup",
+    "default": "mon_peeper_frog",
+    "monsters": [ { "monster": "mon_peeper_frog", "weight": 90 }, { "monster": "mon_vocal_frog", "weight": 10 } ]
+  },
+  {
+    "name": "GROUP_TADPOLE_GRAY",
+    "type": "monstergroup",
+    "default": "mon_gray_frog",
+    "monsters": [ { "monster": "mon_gray_frog", "weight": 90 }, { "monster": "mon_shift_frog", "weight": 10 } ]
+  },
+  {
+    "name": "GROUP_TADPOLE_PICKEREL",
+    "type": "monstergroup",
+    "default": "mon_pickerel_frog",
+    "monsters": [ { "monster": "mon_pickerel_frog", "weight": 90 }, { "monster": "mon_palette_frog", "weight": 10 } ]
   },
   {
     "name": "GROUP_TADPOLE_GREEN",
@@ -944,6 +963,12 @@
     "default": "mon_wood_frog",
     "monsters": [ { "monster": "mon_wood_frog", "weight": 99 }, { "monster": "mon_wood_worm", "weight": 1 } ]
   },
+  {
+    "name": "GROUP_BIGTAD_VOCAL",
+    "type": "monstergroup",
+    "default": "mon_jumbo_bigfrog",
+    "monsters": [ { "monster": "mon_jumbo_bigfrog", "weight": 50 }, { "monster": "mon_vocal_bigfrog", "weight": 50 } ]
+  },
   {
     "name": "GROUP_FROGS_UPGRADE_PATTERN",
     "type": "monstergroup",

diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
@@ -576,61 +576,31 @@
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_leo_tadpole" } ]
   },
-  {
-    "name": "GROUP_EGG_PATTERN_FROG",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_pattern_tadpole" } ]
-  },
   {
     "name": "GROUP_EGG_BULLFROG_FROG",
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_bullfrog_tadpole" } ]
   },
-  {
-    "name": "GROUP_EGG_STRANGE_FROG",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_strange_tadpole" } ]
-  },
   {
     "name": "GROUP_EGG_FOWLER_TOAD",
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_fowler_tadpole" } ]
   },
-  {
-    "name": "GROUP_EGG_FOUL_TOAD",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_foul_tadpole" } ]
-  },
   {
     "name": "GROUP_EGG_FREEDOM_TOAD",
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_freedom_tadpole" } ]
   },
-  {
-    "name": "GROUP_EGG_ODD_TOAD",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_odd_tadpole" } ]
-  },
   {
     "name": "GROUP_EGG_PEEPER_FROG",
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_peeper_tadpole" } ]
   },
-  {
-    "name": "GROUP_EGG_VOCAL_FROG",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_vocal_tadpole" } ]
-  },
   {
     "name": "GROUP_EGG_GRAY_FROG",
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_gray_tadpole" } ]
   },
-  {
-    "name": "GROUP_EGG_SHIFT_FROG",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_shift_tadpole" } ]
-  },
   {
     "name": "GROUP_EGG_MINK_FROG",
     "type": "monstergroup",
@@ -641,11 +611,6 @@
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_pickerel_tadpole" } ]
   },
-  {
-    "name": "GROUP_EGG_PALETTE_FROG",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_palette_tadpole" } ]
-  },
   {
     "name": "GROUP_EGG_GREEN_FROG",
     "type": "monstergroup",