Restore mutant bug spawns + Normalize their evolution timers (#74904)

* spiders * moth and butterfly and worm and magic oh god * oops wrong numbers * fly, mosquito, grasshopper, locut * slug, snail, mantis, strider * aphid and ladybug * stag beetle, crayfish, centipede
CleverRaven · Jul 5, 2024 · f45ceda · f45ceda
1 parent 250198c
commit f45ceda
Show file tree

Hide file tree

Showing 12 changed files with 241 additions and 110 deletions.
diff --git a/data/json/mapgen/retirement_community.json b/data/json/mapgen/retirement_community.json
@@ -212,7 +212,7 @@
         { "group": "GROUP_RETIREMENT_COMMUNITY", "x": [ 48, 56 ], "y": [ 9, 13 ], "repeat": [ 2, 3 ] },
         { "group": "GROUP_RETIREMENT_COMMUNITY", "x": [ 73, 81 ], "y": [ 9, 13 ], "repeat": [ 2, 3 ] },
         { "monster": "mon_large_cockroach", "x": [ 85, 91 ], "y": [ 10 ], "chance": 50, "repeat": [ 2, 5 ] },
-        { "monster": "mon_spider_cellar_giant", "x": [ 26, 30 ], "y": [ 9, 17 ], "chance": 100, "repeat": [ 3, 4 ] },
+        { "group": "GROUP_SPIDER_BASEMENT", "x": [ 26, 30 ], "y": [ 9, 17 ], "chance": 100, "repeat": [ 3, 4 ] },
         { "monster": "mon_zombie_child", "x": [ 125 ], "y": [ 17 ], "chance": 100, "repeat": [ 1, 2 ] },
         { "monster": "mon_zombie_child", "x": [ 125 ], "y": [ 11 ], "chance": 100, "repeat": [ 1, 2 ] },
         { "monster": "mon_zombie_child", "x": [ 132 ], "y": [ 11 ], "chance": 100, "repeat": [ 1, 2 ] }

diff --git a/data/json/mapgen/zoo.json b/data/json/mapgen/zoo.json
@@ -505,10 +505,10 @@
     "name": "GROUP_SPIDERS_ZOO",
     "type": "monstergroup",
     "monsters": [
-      { "monster": "mon_spider_web_small", "weight": 10 },
-      { "monster": "mon_spider_trapdoor_small", "weight": 10 },
-      { "monster": "mon_spider_widow_small", "weight": 10 },
-      { "monster": "mon_spider_wolf_small", "weight": 10 }
+      { "group": "GROUP_SPIDER" },
+      { "group": "GROUP_SPIDER_TRAPDOOR" },
+      { "group": "GROUP_SPIDER_WIDOW" },
+      { "group": "GROUP_SPIDER_WOLF" }
     ]
   },
   {

diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json
@@ -526,10 +526,18 @@
     "valid_targets": [ "self", "ground" ],
     "min_damage": 3,
     "max_damage": 8,
-    "flags": [ "RANDOM_DAMAGE", "HOSTILE_SUMMON", "PERMANENT", "SPAWN_WITH_DEATH_DROPS", "SILENT", "NO_EXPLOSION_SFX" ],
+    "flags": [
+      "RANDOM_DAMAGE",
+      "HOSTILE_SUMMON",
+      "PERMANENT",
+      "SPAWN_WITH_DEATH_DROPS",
+      "SILENT",
+      "NO_EXPLOSION_SFX",
+      "SPAWN_GROUP"
+    ],
     "shape": "blast",
     "effect": "summon",
-    "effect_str": "mon_spider_cellar_giant_s",
+    "effect_str": "GROUP_SPIDER_MOM_SUMMON",
     "min_aoe": 2,
     "max_aoe": 2
   },

diff --git a/data/json/monstergroups/bugs.json b/data/json/monstergroups/bugs.json
@@ -16,9 +16,8 @@
     "is_animal": true,
     "monsters": [
       { "monster": "mon_ant_soldier", "weight": 90, "cost_multiplier": 5 },
-      { "monster": "mon_aphid", "weight": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 },
-      { "monster": "mon_lady_bug", "weight": 10, "pack_size": [ 1, 3 ], "cost_multiplier": 10 },
-      { "monster": "mon_lady_bug_giant", "weight": 5, "cost_multiplier": 10, "starts": "15 days" },
+      { "group": "GROUP_APHID", "weight": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 },
+      { "group": "GROUP_LADY_BUG", "weight": 15, "pack_size": [ 1, 3 ], "cost_multiplier": 10 },
       { "monster": "mon_antlion_larva", "weight": 5, "cost_multiplier": 10 },
       { "monster": "mon_antlion_giant", "weight": 3, "cost_multiplier": 10 },
       { "monster": "mon_ant_small", "weight": 852, "cost_multiplier": 0 }
@@ -41,9 +40,8 @@
     "is_animal": true,
     "monsters": [
       { "monster": "mon_ant_acid_soldier", "weight": 90, "cost_multiplier": 5 },
-      { "monster": "mon_aphid", "weight": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 },
-      { "monster": "mon_lady_bug", "weight": 10, "pack_size": [ 1, 3 ], "cost_multiplier": 10 },
-      { "monster": "mon_lady_bug_giant", "weight": 5, "cost_multiplier": 10, "starts": "15 days" },
+      { "group": "GROUP_APHID", "weight": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 },
+      { "group": "GROUP_LADY_BUG", "weight": 15, "pack_size": [ 1, 3 ], "cost_multiplier": 10 },
       { "monster": "mon_antlion_larva", "weight": 5, "cost_multiplier": 10 },
       { "monster": "mon_antlion_giant", "weight": 3, "cost_multiplier": 10 },
       { "monster": "mon_ant_acid_small", "weight": 852, "cost_multiplier": 0 }
@@ -97,27 +95,25 @@
   {
     "type": "monstergroup",
     "name": "GROUP_SPIDER",
-    "monsters": [ { "monster": "mon_spider_web_small", "cost_multiplier": 0 } ]
+    "monsters": [
+      { "monster": "mon_spider_web_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_spider_web", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_spider_web_mega", "weight": 2, "starts": "72 days" }
+    ]
   },
   {
     "type": "monstergroup",
     "name": "GROUP_SPIDER_BASEMENT",
     "default": "mon_spider_cellar_small",
     "//": "`monster` ignores group-level pack size, so numbers are set in mapgen",
     "monsters": [
-      { "monster": "mon_spider_cellar_small", "weight": 300, "ends": "14 days" },
-      { "monster": "mon_spider_cellar_giant", "weight": 220, "starts": "7 days", "ends": "28 days" },
-      { "monster": "mon_spider_cellar_mom", "weight": 80, "starts": "7 days" },
-      { "monster": "mon_spider_cellar_giant", "weight": 200, "starts": "28 days" },
-      { "monster": "mon_spider_cellar_mega", "weight": 100, "cost_multiplier": 0, "starts": "28 days" }
+      { "monster": "mon_spider_cellar_small", "weight": 30, "ends": "45 days" },
+      { "monster": "mon_spider_cellar_giant", "weight": 22, "starts": "30 days", "ends": "72 days" },
+      { "monster": "mon_spider_cellar_mom", "weight": 8, "starts": "30 days" },
+      { "monster": "mon_spider_cellar_giant", "weight": 20, "starts": "72 days" },
+      { "monster": "mon_spider_cellar_mega", "weight": 10, "starts": "72 days" }
     ]
   },
-  {
-    "type": "monstergroup",
-    "name": "GROUP_SPIDER_CELLAR",
-    "default": "mon_spider_cellar_giant",
-    "monsters": [ { "monster": "mon_spider_cellar_giant", "weight": 5 } ]
-  },
   {
     "type": "monstergroup",
     "name": "GROUP_SPIDER_CELLAR_GIANT",
@@ -127,6 +123,42 @@
       { "monster": "mon_spider_cellar_mega", "weight": 3 }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_SPIDER_TRAPDOOR",
+    "monsters": [
+      { "monster": "mon_spider_trapdoor_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_spider_trapdoor_giant", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_spider_trapdoor_mega", "weight": 2, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_SPIDER_WIDOW",
+    "monsters": [
+      { "monster": "mon_spider_widow_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_spider_widow_giant", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_spider_widow_mega", "weight": 2, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_SPIDER_WOLF",
+    "monsters": [
+      { "monster": "mon_spider_wolf_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_spider_wolf_giant", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_spider_wolf_mega", "weight": 2, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_SPIDER_JUMPING",
+    "monsters": [
+      { "monster": "mon_spider_jumping_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_spider_jumping_giant", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_spider_jumping_mega", "weight": 2, "starts": "72 days" }
+    ]
+  },
   {
     "name": "GROUP_WASP_NEST",
     "type": "monstergroup",
@@ -268,33 +300,135 @@
   {
     "type": "monstergroup",
     "name": "GROUP_WORM",
-    "is_animal": true,
     "monsters": [
-      { "monster": "mon_graboid", "weight": 30, "cost_multiplier": 20, "starts": "13 days" },
-      { "monster": "mon_halfworm", "weight": 0, "cost_multiplier": 0 },
-      { "monster": "mon_worm_small", "weight": 970, "cost_multiplier": 0 }
+      { "monster": "mon_worm_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_worm", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_graboid", "weight": 2, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_FLY",
+    "monsters": [
+      { "monster": "mon_fly_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_fly", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_fly_mega", "weight": 2, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_MOSQUITO",
+    "monsters": [
+      { "monster": "mon_mosquito_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_mosquito_giant", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_mosquito_mega", "weight": 2, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_GRASSHOPPER",
+    "monsters": [
+      { "monster": "mon_grasshopper_small", "ends": "45 days" },
+      { "monster": "mon_grasshopper_giant", "starts": "30 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_LOCUST",
+    "monsters": [
+      { "monster": "mon_locust_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_locust", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_locust_mega", "weight": 2, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_WATER_STRIDER",
+    "monsters": [ { "monster": "mon_strider_small", "ends": "45 days" }, { "monster": "mon_strider_giant", "starts": "30 days" } ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_PRAYING_MANTIS",
+    "monsters": [
+      { "monster": "mon_mantis_small", "weight": 5, "ends": "63 days" },
+      { "monster": "mon_mantis_giant", "weight": 5, "starts": "42 days" },
+      { "monster": "mon_mantis_mega", "weight": 5, "starts": "84 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_APHID",
+    "monsters": [ { "monster": "mon_aphid_small", "ends": "45 days" }, { "monster": "mon_aphid", "starts": "30 days" } ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_LADY_BUG",
+    "monsters": [ { "monster": "mon_lady_bug", "ends": "63 days" }, { "monster": "mon_lady_bug_giant", "starts": "42 days" } ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_CENTIPEDE",
+    "monsters": [
+      { "monster": "mon_centipede_small", "weight": 30, "ends": "45 days" },
+      { "monster": "mon_centipede_giant", "weight": 22, "starts": "30 days", "ends": "72 days" },
+      { "monster": "mon_centipede_mom", "weight": 8, "starts": "30 days" },
+      { "monster": "mon_centipede_giant", "weight": 20, "starts": "72 days" },
+      { "monster": "mon_centipede_mega", "weight": 10, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_STAG_BEETLE",
+    "monsters": [
+      { "monster": "mon_stag_beetle_small", "weight": 5, "ends": "90 days" },
+      { "monster": "mon_stag_beetle_giant", "weight": 5, "starts": "60 days" },
+      { "monster": "mon_stag_beetle_mega", "weight": 2, "starts": "120 days" }
     ]
   },
   {
     "type": "monstergroup",
     "name": "GROUP_BUTTERFLY",
-    "default": "mon_butterfly",
-    "monsters": [ { "monster": "mon_butterfly", "weight": 50 }, { "monster": "mon_moth", "weight": 50 } ]
+    "monsters": [
+      { "monster": "mon_butterfly", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_butterfly_giant", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_butterfly_titan", "weight": 2, "starts": "72 days" }
+    ]
   },
   {
     "type": "monstergroup",
-    "name": "GROUP_BUTTERFLY_GIANT",
-    "default": "mon_butterfly_giant",
+    "name": "GROUP_MOTH",
     "monsters": [
-      { "monster": "mon_butterfly_giant", "weight": 45 },
-      { "monster": "mon_butterfly_titan", "weight": 5, "cost_multiplier": 2 },
-      { "monster": "mon_moth_giant", "weight": 45 },
-      { "monster": "mon_moth_titan", "weight": 5, "cost_multiplier": 2 }
+      { "monster": "mon_moth", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_moth_giant", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_moth_titan", "weight": 2, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_SNAIL",
+    "monsters": [
+      { "monster": "mon_snail_forest", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_snail_small", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_snail_giant", "weight": 2, "starts": "72 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_SLUG",
+    "monsters": [
+      { "monster": "mon_slug_forest", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_slug_small", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_slug_giant", "weight": 2, "starts": "72 days" }
     ]
   },
   {
     "type": "monstergroup",
     "name": "GROUP_CENTIPEDE_MOM_SUMMON",
     "monsters": [ { "monster": "mon_centipede_small", "weight": 67 }, { "monster": "mon_centipede_larva", "weight": 33 } ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_SPIDER_MOM_SUMMON",
+    "monsters": [ { "monster": "mon_spider_cellar_small", "weight": 67 }, { "monster": "mon_spider_cellar_giant_s", "weight": 33 } ]
   }
 ]
diff --git a/data/json/monstergroups/fish.json b/data/json/monstergroups/fish.json
@@ -268,7 +268,7 @@
         "conditions": [ "SPRING", "SUMMER" ],
         "pack_size": [ 1, 3 ]
       },
-      { "monster": "mon_strider_small", "weight": 35, "cost_multiplier": 3, "pack_size": [ 3, 6 ] }
+      { "group": "GROUP_WATER_STRIDER", "weight": 35, "cost_multiplier": 3, "pack_size": [ 3, 6 ] }
     ]
   },
   {
@@ -318,5 +318,14 @@
       { "monster": "mon_razorclaw", "weight": 667, "cost_multiplier": 0 },
       { "monster": "mon_razorclaw", "weight": 333, "cost_multiplier": 0, "pack_size": [ 1, 2 ] }
     ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_CRAYFISH",
+    "monsters": [
+      { "monster": "mon_crayfish_small", "weight": 5, "ends": "45 days" },
+      { "monster": "mon_giant_crayfish", "weight": 5, "starts": "30 days" },
+      { "monster": "mon_crayfish_mega", "weight": 2, "starts": "72 days" }
+    ]
   }
 ]
diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
@@ -100,17 +100,8 @@
     "monsters": [
       { "group": "GROUP_NETHER_UNVIABLE", "weight": 300, "cost_multiplier": 0 },
       { "monster": "mon_woodlouse", "weight": 300, "pack_size": [ 1, 3 ] },
-      { "monster": "mon_slug_small", "weight": 180, "ends": "180 hours" },
-      { "monster": "mon_slug_giant", "weight": 180, "starts": "180 hours" },
-      { "monster": "mon_spider_cellar_small", "weight": 300, "pack_size": [ 1, 3 ], "ends": "14 days" },
-      { "group": "GROUP_SPIDER_CELLAR", "weight": 300, "pack_size": [ 2, 5 ], "starts": "14 days", "ends": "28 days" },
-      {
-        "group": "GROUP_SPIDER_CELLAR_GIANT",
-        "weight": 300,
-        "cost_multiplier": 0,
-        "pack_size": [ 2, 4 ],
-        "starts": "28 days"
-      },
+      { "group": "GROUP_SLUG", "weight": 180 },
+      { "group": "GROUP_SPIDER_BASEMENT", "weight": 300, "pack_size": [ 2, 5 ] },
       {
         "monster": "mon_mutant_experimental",
         "weight": 50,
@@ -311,7 +302,7 @@
     "name": "DUMP_ANIMALS",
     "monsters": [
       { "monster": "mon_null", "weight": 378 },
-      { "monster": "mon_fly", "weight": 100 },
+      { "group": "GROUP_FLY", "weight": 100 },
       { "monster": "mon_crow", "weight": 75 },
       { "monster": "mon_raven", "weight": 75 },
       {
@@ -328,7 +319,7 @@
       { "monster": "mon_raccoon", "weight": 15 },
       { "monster": "mon_rattlesnake", "weight": 10 },
       { "monster": "mon_rattlesnake_giant", "weight": 5, "cost_multiplier": 2 },
-      { "monster": "mon_worm", "weight": 20 },
+      { "group": "GROUP_WORM", "weight": 20 },
       { "monster": "mon_wasp_small", "weight": 10 }
     ]
   },
@@ -345,7 +336,7 @@
         "pack_size": [ 6, 12 ],
         "conditions": [ "DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN" ]
       },
-      { "monster": "mon_spider_widow_giant", "weight": 30, "pack_size": [ 2, 4 ] },
+      { "group": "GROUP_SPIDER_WIDOW", "weight": 30, "pack_size": [ 2, 4 ] },
       { "monster": "mon_giant_cockroach", "weight": 50, "pack_size": [ 1, 3 ] },
       { "monster": "mon_black_rat", "weight": 30, "pack_size": [ 4, 8 ] },
       { "monster": "mon_wasp_small", "weight": 50, "pack_size": [ 2, 4 ] },
@@ -363,7 +354,7 @@
       { "monster": "mon_null", "weight": 370, "cost_multiplier": 0 },
       { "monster": "mon_zombie_crawler", "weight": 75, "cost_multiplier": 0 },
       { "monster": "mon_raccoon", "weight": 100, "cost_multiplier": 0 },
-      { "monster": "mon_fly", "weight": 100 },
+      { "group": "GROUP_FLY", "weight": 100 },
       { "monster": "mon_blob_sewer", "weight": 100 },
       { "monster": "mon_sewer_rat", "weight": 100, "cost_multiplier": 0, "pack_size": [ 3, 12 ] },
       { "group": "GROUP_ROACH", "weight": 75 },
@@ -483,10 +474,10 @@
       { "monster": "mon_mole_cricket", "weight": 60, "cost_multiplier": 3 },
       { "monster": "mon_woodlouse", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] },
       { "monster": "mon_stag_beetle_larva", "weight": 40, "cost_multiplier": 5 },
-      { "monster": "mon_centipede_giant", "weight": 200 },
+      { "group": "GROUP_CENTIPEDE", "weight": 200 },
       { "monster": "mon_sewer_snake", "weight": 100, "cost_multiplier": 0 },
       { "monster": "mon_sewer_rat", "weight": 50, "cost_multiplier": 0, "pack_size": [ 3, 12 ] },
-      { "monster": "mon_slug_small", "weight": 50, "ends": "180 hours" },
+      { "group": "GROUP_SLUG", "weight": 50 },
       { "monster": "mon_sludge_crawler", "weight": 25 },
       { "monster": "mon_zombie_mancroc", "weight": 100, "starts": "180 hours" },
       { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" },