Merge pull request #78150 from Milopetilo/corpses-everywhere

Add dormant zombies to cities and hordes
CleverRaven · Nov 27, 2024 · d67d1c4 · d67d1c4
2 parents f9a3a05 + c6e799b
commit d67d1c4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
@@ -96,6 +96,7 @@
     "name": "GROUP_ZOMBIE",
     "monsters": [
       { "group": "GROUP_CIVILIANS_STANDARD", "weight": 500, "cost_multiplier": 0 },
+      { "group": "GROUP_VANILLA_DORMANT", "weight": 250, "cost_multiplier": 0 },
       { "monster": "mon_zombie", "weight": 10, "cost_multiplier": 7, "pack_size": [ 5, 20 ] },
       { "monster": "mon_zombie", "weight": 10, "cost_multiplier": 13, "pack_size": [ 15, 40 ] },
       { "monster": "mon_zombie", "weight": 10, "cost_multiplier": 20, "pack_size": [ 25, 60 ] },
@@ -224,15 +225,32 @@
       { "monster": "mon_zombie_dog", "weight": 50, "cost_multiplier": 0 }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_VANILLA_DORMANT",
+    "default": "mon_pseudo_dormant_zombie",
+    "//": "only dormant zombies",
+    "//2": "These are generated in MonsterGenerator::generate_fake_pseudo_dormant_monster",
+    "monsters": [
+      { "monster": "mon_pseudo_dormant_zombie", "weight": 264, "cost_multiplier": 0 },
+      { "monster": "pseudo_dormant_mon_zombie_fat", "weight": 266, "cost_multiplier": 0 },
+      { "monster": "pseudo_dormant_mon_zombie_child", "weight": 100, "cost_multiplier": 0 },
+      { "monster": "pseudo_dormant_mon_zombie_tough", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "pseudo_dormant_mon_zombie_rot", "weight": 60, "cost_multiplier": 0 },
+      { "monster": "pseudo_dormant_mon_zombie_crawler", "weight": 30, "cost_multiplier": 0 },
+      { "monster": "pseudo_dormant_mon_zombie_brainless", "weight": 30, "cost_multiplier": 0 }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_VANILLA",
     "default": "mon_zombie",
-    "//": "Normalized to 1000",
+    "//": "Normalized to 1300",
     "monsters": [
-      { "group": "GROUP_VANILLA_NO_FERAL", "weight": 801, "cost_multiplier": 0 },
+      { "group": "GROUP_VANILLA_NO_FERAL", "weight": 701, "cost_multiplier": 0 },
       { "group": "GROUP_CIVILIANS_STANDARD", "weight": 500, "cost_multiplier": 0 },
-      { "group": "GROUP_FERAL", "weight": 99, "cost_multiplier": 0 }
+      { "group": "GROUP_FERAL", "weight": 99, "cost_multiplier": 0 },
+      { "group": "GROUP_VANILLA_DORMANT", "weight": 100, "cost_multiplier": 0 }
     ]
   },
   {
@@ -282,6 +300,7 @@
     "//": "+15% child",
     "monsters": [
       { "group": "GROUP_CIVILIANS_STANDARD", "weight": 200, "cost_multiplier": 0 },
+      { "group": "GROUP_VANILLA_DORMANT", "weight": 130, "cost_multiplier": 0 },
       { "monster": "mon_zombie", "weight": 483 },
       { "monster": "mon_zombie_fat", "weight": 130, "cost_multiplier": 2 },
       { "monster": "mon_zombie_tough", "weight": 50, "cost_multiplier": 3 },

diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json
@@ -111,7 +111,7 @@
     ],
     "fungalize_into": "mon_zombie_crawler_fungal",
     "upgrades": { "half_life": 30, "into_group": "GROUP_ZOMBIE_CRAWLER_UPGRADE" },
-    "extend": { "flags": [ "ATTACK_LOWER" ] },
+    "extend": { "flags": [ "ATTACK_LOWER", "GEN_DORMANT" ] },
     "delete": { "flags": [ "PUSH_MON" ] }
   },
   {
@@ -129,7 +129,7 @@
     "fungalize_into": "mon_zombie_fat_fungus",
     "upgrades": { "half_life": 32, "into_group": "GROUP_ZOMBIE_FAT" },
     "armor": { "bash": 5, "cut": 3, "bullet": 2, "electric": 2 },
-    "extend": { "weakpoint_sets": [ "wps_humanoid_head_small" ] }
+    "extend": { "weakpoint_sets": [ "wps_humanoid_head_small" ], "flags": [ "GEN_DORMANT" ] }
   },
   {
     "id": "mon_zombie_fireman",
@@ -187,7 +187,8 @@
     "melee_dice_sides": 2,
     "grab_strength": 15,
     "fungalize_into": "mon_zombie_rot_fungal",
-    "upgrades": { "half_life": 43, "into": "mon_devourer" }
+    "upgrades": { "half_life": 43, "into": "mon_devourer" },
+    "extend": { "flags": [ "GEN_DORMANT" ] }
   },
   {
     "id": "mon_zombie_swat",

diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json
@@ -53,7 +53,7 @@
     "copy-from": "mon_zombie_child_base",
     "categories": [ "CLASSIC" ],
     "death_function": { "effect": { "id": "death_guilt", "min_level": 6 } },
-    "extend": { "flags": [ "GUILT_CHILD" ] }
+    "extend": { "flags": [ "GUILT_CHILD", "GEN_DORMANT" ] }
   },
   {
     "id": "mon_zombie_creepy",

diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json
@@ -57,7 +57,7 @@
     "harvest": "zombie_humanoid_headless",
     "decay": "zombie_decay_bone",
     "upgrades": { "half_life": 24, "into_group": "GROUP_ZOMBIE_BRAINLESS_UPGRADE" },
-    "extend": { "flags": [ "NOHEAD" ] },
+    "extend": { "flags": [ "NOHEAD", "GEN_DORMANT" ] },
     "delete": { "flags": [ "SEES" ], "special_attacks": [ "bite_humanoid" ] },
     "//3": "Removed Bite attack to reflect damage to mouth.",
     "//4": "Has NOHEAD flag to reflect the head is already catastrophically damaged.  Only detects through hearing."