Merge pull request #72979 from Karol1223/wow-look-more-zombie-fixes!!…

…!!!!! Minor generic zombie balance edits 5
CleverRaven · Apr 16, 2024 · e5cca6f · e5cca6f
2 parents c05128f + b26396a
commit e5cca6f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 51 deletions.
diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json
@@ -55,7 +55,6 @@
       { "monster": "mon_skitterbot", "weight": 1, "cost_multiplier": 0, "pack_size": [ 8, 12 ] },
       { "monster": "mon_secubot", "weight": 1, "cost_multiplier": 10 },
       { "monster": "mon_zombie_bio_op", "weight": 50, "cost_multiplier": 5 },
-      { "monster": "mon_zombie_bio_op2", "weight": 25, "cost_multiplier": 5, "starts": "60 days" },
       { "monster": "mon_zombie_armored", "weight": 5, "cost_multiplier": 5 },
       { "monster": "mon_zombie_electric", "weight": 50, "cost_multiplier": 3 },
       { "monster": "mon_zombie_necro", "weight": 15, "cost_multiplier": 15 },
@@ -95,7 +94,6 @@
       { "monster": "mon_skitterbot", "weight": 10, "pack_size": [ 8, 12 ] },
       { "monster": "mon_blob_small", "weight": 10, "pack_size": [ 1, 4 ] },
       { "monster": "mon_zombie_bio_op", "weight": 50, "cost_multiplier": 5 },
-      { "monster": "mon_zombie_bio_op2", "weight": 25, "cost_multiplier": 5, "starts": "60 days" },
       { "monster": "mon_zombie_armored", "weight": 5, "cost_multiplier": 5 },
       { "monster": "mon_zombie_brute_shocker", "weight": 5, "cost_multiplier": 5 },
       { "monster": "mon_lab_rat", "weight": 50, "cost_multiplier": 20, "pack_size": [ 4, 8 ] }
@@ -119,7 +117,6 @@
       { "monster": "mon_secubot", "weight": 1, "cost_multiplier": 10 },
       { "monster": "mon_talon_m202a1", "weight": 1, "cost_multiplier": 15 },
       { "monster": "mon_zombie_bio_op", "weight": 50, "cost_multiplier": 5 },
-      { "monster": "mon_zombie_bio_op2", "weight": 25, "cost_multiplier": 5, "starts": "60 days" },
       { "monster": "mon_zombie_armored", "weight": 5, "cost_multiplier": 8 },
       { "monster": "mon_zombie_electric", "weight": 50, "cost_multiplier": 3 },
       { "monster": "mon_zombie_necro", "weight": 15, "cost_multiplier": 15 },
@@ -187,7 +184,6 @@
       { "monster": "mon_zombie_phase_skulker", "weight": 10, "cost_multiplier": 0, "pack_size": [ 2, 3 ] },
       { "monster": "mon_secubot", "weight": 2, "cost_multiplier": 5 },
       { "monster": "mon_zombie_bio_op", "weight": 10, "cost_multiplier": 3 },
-      { "monster": "mon_zombie_bio_op2", "weight": 25, "cost_multiplier": 5, "starts": "60 days" },
       { "monster": "mon_zombie", "weight": 40, "pack_size": [ 2, 7 ] },
       { "monster": "mon_zombie_fat", "weight": 40, "pack_size": [ 2, 4 ] },
       { "monster": "mon_zombie_tough", "weight": 20, "cost_multiplier": 2, "pack_size": [ 2, 4 ] },
@@ -267,7 +263,6 @@
       { "monster": "mon_zombie_labsecurity", "weight": 5, "cost_multiplier": 0, "pack_size": [ 2, 3 ] },
       { "monster": "mon_zombie_hazmat", "weight": 5, "pack_size": [ 1, 3 ] },
       { "monster": "mon_zombie_bio_op", "weight": 15, "cost_multiplier": 5 },
-      { "monster": "mon_zombie_bio_op2", "weight": 10, "cost_multiplier": 10 },
       { "monster": "mon_zombie_armored", "weight": 3, "cost_multiplier": 15 },
       { "monster": "mon_zombie_soldier", "weight": 913, "cost_multiplier": 0 },
       { "monster": "mon_zombie_soldier", "weight": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }

diff --git a/data/json/monstergroups/military.json b/data/json/monstergroups/military.json
@@ -32,7 +32,6 @@
       { "monster": "mon_zombie_soldier", "weight": 150, "cost_multiplier": 2, "pack_size": [ 2, 6 ] },
       { "monster": "mon_zombie_military_pilot", "weight": 5 },
       { "monster": "mon_zombie_bio_op", "weight": 50, "cost_multiplier": 5 },
-      { "monster": "mon_zombie_bio_op2", "weight": 25, "cost_multiplier": 5, "starts": "60 days" },
       { "monster": "mon_zombie_armored", "weight": 10, "cost_multiplier": 5 },
       { "monster": "mon_feral_soldier", "weight": 15 }
     ]

diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
@@ -448,7 +448,6 @@
       { "monster": "mon_zombie_kevlar_2" },
       { "monster": "mon_zombie_soldier_blackops_1" },
       { "monster": "mon_zombie_bio_op" },
-      { "monster": "mon_zombie_bio_op2" },
       { "monster": "mon_zombie_survivor_elite" },
       { "monster": "mon_zombear" },
       { "monster": "mon_zoose" },

diff --git a/data/json/monsters/zed_skeletal.json b/data/json/monsters/zed_skeletal.json
@@ -9,7 +9,7 @@
     "species": [ "ZOMBIE", "HUMAN" ],
     "volume": "62500 ml",
     "weight": "81500 g",
-    "hp": 30,
+    "hp": 80,
     "speed": 60,
     "material": [ "bone" ],
     "symbol": "Z",
@@ -20,7 +20,6 @@
     "melee_dice": 3,
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
-    "dodge": 2,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_bone_armor" ],
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_skeleton" ],
     "bleed_rate": 50,
@@ -57,7 +56,6 @@
     "melee_dice": 2,
     "melee_dice_sides": 8,
     "melee_damage": [ { "damage_type": "cut", "amount": 10 } ],
-    "dodge": 1,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_bone_armor", "wps_humanoid_head_small" ],
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_skeleton" ],
     "bleed_rate": 0,
@@ -92,7 +90,7 @@
     "volume": "62500 ml",
     "weight": "81500 g",
     "hp": 105,
-    "speed": 90,
+    "speed": 60,
     "material": [ "bone" ],
     "symbol": "Z",
     "color": "blue_white",
@@ -102,7 +100,6 @@
     "melee_dice": 2,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
-    "dodge": 2,
     "luminance": 8,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_bone_armor" ],
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_skeleton", "prof_electromagnetics" ],

diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json
@@ -125,6 +125,7 @@
     "looks_like": "mon_zombie_soldier",
     "diff": 20,
     "bleed_rate": 50,
+    "harvest": "zombie_humanoid_acid",
     "delete": { "upgrades": { "half_life": 42, "into_group": "GROUP_SOLDIER_UPGRADE" }, "categories": [ "CLASSIC" ] },
     "relative": { "hp": 20, "speed": 10, "melee_skill": 1, "vision_day": 10, "vision_night": 10 },
     "extend": {
@@ -144,11 +145,6 @@
           "ranges": [ [ 2, 20, "DEFAULT" ] ]
         }
       ],
-      "death_function": {
-        "message": "The %s's body dissolves into acid.",
-        "effect": { "id": "death_acid", "hit_self": true },
-        "corpse_type": "NO_CORPSE"
-      },
       "flags": [ "ACIDPROOF", "ACID_BLOOD" ]
     }
   },
@@ -161,6 +157,7 @@
     "looks_like": "mon_zombie_soldier",
     "diff": 20,
     "bleed_rate": 50,
+    "harvest": "zombie_humanoid_acid",
     "delete": { "upgrades": { "half_life": 42, "into_group": "GROUP_SOLDIER_UPGRADE" }, "categories": [ "CLASSIC" ] },
     "relative": { "hp": 40, "speed": -10, "melee_skill": 2, "armor": { "bash": 5 } },
     "extend": {
@@ -181,11 +178,6 @@
           "ranges": [ [ 2, 8, "DEFAULT" ] ]
         }
       ],
-      "death_function": {
-        "message": "The %s's body dissolves into acid.",
-        "effect": { "id": "death_acid", "hit_self": true },
-        "corpse_type": "NO_CORPSE"
-      },
       "flags": [ "ACIDPROOF", "ACID_BLOOD" ]
     }
   },
@@ -205,24 +197,27 @@
     "material": [ "flesh" ],
     "symbol": "Z",
     "color": "light_green_white",
-    "scents_tracked": [ "sc_human", "sc_fetid" ],
     "aggression": 100,
     "morale": 100,
     "melee_skill": 5,
     "melee_dice": 2,
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 1,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ],
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored", "prof_wp_nat_armored" ],
     "vision_day": 30,
     "vision_night": 3,
     "harvest": "zombie_kevlar",
-    "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.8 } ],
+    "grab_strength": 30,
+    "special_attacks": [
+      { "id": "grab", "cooldown": 7 },
+      { "id": "bite_humanoid", "cooldown": 5, "min_mul": 0.7 },
+      { "id": "scratch_humanoid" }
+    ],
     "death_drops": "mon_zombie_kevlar_death_drops",
     "upgrades": { "half_life": 42, "into": "mon_zombie_kevlar_1" },
     "burn_into": "mon_zombie_scorched",
-    "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ],
+    "flags": [ "SEES", "HEARS", "WARM", "GRABS", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ],
     "armor": { "bash": 18, "cut": 28, "bullet": 22, "electric": 3 }
   },
   {
@@ -248,7 +243,6 @@
     "melee_dice": 2,
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 1,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_natural_armor", "wps_humanoid_open_helmet" ],
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored", "prof_wp_nat_armored" ],
     "bleed_rate": 50,
@@ -288,7 +282,6 @@
     "melee_dice": 3,
     "melee_dice_sides": 8,
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 1,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_natural_armor", "wps_humanoid_open_helmet" ],
     "families": [
       "prof_intro_biology",
@@ -325,7 +318,7 @@
     "volume": "62500 ml",
     "weight": "81500 g",
     "hp": 90,
-    "speed": 85,
+    "speed": 75,
     "material": [ "flesh" ],
     "symbol": "Z",
     "color": "light_green_green",
@@ -335,10 +328,9 @@
     "melee_dice": 2,
     "melee_dice_sides": 4,
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 1,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_full_helmet" ],
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
-    "vision_day": 35,
+    "vision_day": 30,
     "vision_night": 5,
     "harvest": "zombie_humanoid",
     "grab_strength": 20,
@@ -504,14 +496,12 @@
     "material": [ "flesh" ],
     "symbol": "Z",
     "color": "red_cyan",
-    "scents_tracked": [ "sc_human", "sc_fetid" ],
     "aggression": 100,
     "morale": 100,
     "melee_skill": 7,
     "melee_dice": 3,
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "electric", "amount": 4 } ],
-    "dodge": 3,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet", "wps_humanoid_gasmask" ],
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored" ],
     "vision_night": 3,
@@ -521,22 +511,7 @@
     "special_when_hit": [ "ZAPBACK", 75 ],
     "death_drops": "mon_zombie_bio_op_death_drops",
     "fungalize_into": "mon_zombie_fungus",
-    "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "ELECTRIC", "NO_BREATHE", "REVIVES", "FILTHY" ],
+    "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "POISON", "ELECTRIC", "NO_BREATHE", "REVIVES", "FILTHY" ],
     "armor": { "bash": 10, "cut": 18, "bullet": 14, "electric": 3 }
-  },
-  {
-    "id": "mon_zombie_bio_op2",
-    "type": "MONSTER",
-    "name": { "str": "elite zombie bio-operator" },
-    "description": "Once a highly-trained soldier, this zombie is still equipped with heavy military gear and dangerous physical abilities.  Its malfunctioning equipment sends out occasional showers of sparks.",
-    "copy-from": "mon_zombie_bio_op",
-    "looks_like": "mon_zombie_bio_op",
-    "diff": 10,
-    "hp": 180,
-    "melee_skill": 8,
-    "dodge": 4,
-    "harvest": "zombie_humanoid",
-    "special_attacks": [ [ "BIO_OP_BIOJUTSU", 15 ] ],
-    "armor": { "bullet": 14, "electric": 3, "bash": 15, "cut": 27 }
   }
 ]
diff --git a/data/mods/Sky_Island/monstergroups.json b/data/mods/Sky_Island/monstergroups.json
@@ -155,7 +155,6 @@
       { "monster": "mon_zombie_hulk", "weight": 100 },
       { "monster": "mon_skeleton_hulk", "weight": 75 },
       { "monster": "mon_zombie_kevlar_2", "weight": 50 },
-      { "monster": "mon_zombie_bio_op2", "weight": 15 },
       { "monster": "mon_jabberwock", "weight": 25 },
       { "monster": "mon_zombie_brute_shocker", "weight": 10 },
       { "monster": "mon_zoose_brute", "weight": 20 },
@@ -168,7 +167,6 @@
     "//": "Boss tier encounters for enemies that show up in bunches.  Extreme danger level.",
     "monsters": [
       { "monster": "mon_zombie_hulk", "weight": 10 },
-      { "monster": "mon_zombie_bio_op2", "weight": 50 },
       { "monster": "mon_dog_zombie_hulk", "weight": 100 },
       { "monster": "mon_feral_militia", "weight": 100 },
       { "monster": "mon_skeleton_electric", "weight": 100 },