Merge pull request #73059 from Karol1223/when-the-zombies-are-unbalan…

…ced!

Minor generic zombie balance edits 6

data/json/monsters/zed-winged.json

@@ -37,7 +37,7 @@
  }
  ],
  "harvest": "zombie_humanoid",
- "grab_strength": 20,
+ "grab_strength": 15,
  "special_attacks": [
  { "id": "bite_humanoid", "cooldown": 5 },
  { "id": "grab", "cooldown": 12 },
@@ -90,7 +90,7 @@
  "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
  "bleed_rate": 0,
  "vision_night": 7,
- "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ],
+ "weakpoint_sets": [ "wps_humanoid_body" ],
  "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_flying" ],
  "weakpoints": [
  {
@@ -104,15 +104,15 @@
  }
  ],
  "harvest": "zombie_humanoid",
- "grab_strength": 30,
+ "grab_strength": 15,
  "special_attacks": [
  { "id": "bite_humanoid", "damage_max_instance": [ { "damage_type": "stab", "amount": 12, "armor_multiplier": 0.7 } ] },
  { "id": "grab", "cooldown": 12 },
  { "id": "scratch_humanoid" },
  { "type": "leap", "cooldown": 2, "max_range": 8 }
  ],
  "death_drops": "default_zombie_death_drops",
- "burn_into": "mon_zombie_fiend",
+ "burn_into": "mon_zombie_scorched",
  "flags": [
  "SEES",
  "HEARS",

data/json/monsters/zed_skeletal.json

@@ -30,6 +30,7 @@
  "special_attacks": [ { "id": "grab", "cooldown": 21 }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid", "cooldown": 5 } ],
  "upgrades": { "half_life": 32, "into_group": "GROUP_SKELETON_UPGRADE" },
  "death_drops": "default_zombie_clothes",
+ "burn_into": "mon_zombie_scorched",
  "fungalize_into": "mon_skeleton_fungus",
  "flags": [ "SEES", "HEARS", "GRABS", "BASHES", "GROUP_BASH", "REVIVES", "NO_BREATHE", "POISON", "FILTHY" ],
  "armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 24, "electric": 3 }
@@ -74,8 +75,9 @@
  ],
  "upgrades": { "half_life": 45, "into": "mon_skeleton_hulk" },
  "death_drops": "default_zombie_clothes",
+ "burn_into": "mon_zombie_fiend",
  "fungalize_into": "mon_skeleton_brute_fungus",
- "flags": [ "SEES", "HEARS", "GRABS", "BASHES", "GROUP_BASH", "REVIVES", "NO_BREATHE", "POISON", "FILTHY" ],
+ "flags": [ "SEES", "HEARS", "SMELLS", "GRABS", "BASHES", "GROUP_BASH", "REVIVES", "NO_BREATHE", "POISON", "FILTHY" ],
  "armor": { "bash": 12, "cut": 30, "acid": 1, "bullet": 30, "electric": 4 }
  },
  {
@@ -116,6 +118,7 @@
  [ "SHOCKSTORM", 25 ]
  ],
  "death_drops": "default_zombie_clothes",
+ "burn_into": "mon_zombie_scorched",
  "fungalize_into": "mon_skeleton_fungus",
  "flags": [ "SEES", "HEARS", "GRABS", "BASHES", "GROUP_BASH", "ELECTRIC", "REVIVES", "NO_BREATHE", "POISON", "FILTHY" ],
  "armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 30 }
@@ -167,6 +170,7 @@
  "flags": [
  "SEES",
  "HEARS",
+ "SMELLS",
  "STUMBLES",
  "WARM",
  "GRABS",

data/json/monsters/zed_soldiers.json

@@ -255,7 +255,7 @@
  ],
  "death_drops": "mon_zombie_kevlar_death_drops",
  "upgrades": { "half_life": 42, "into": "mon_zombie_kevlar_2" },
- "burn_into": "mon_zombie_scorched",
+ "burn_into": "mon_zombie_fiend",
  "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ],
  "armor": { "bash": 20, "cut": 30, "bullet": 24, "electric": 3 }
  },
@@ -268,7 +268,7 @@
  "default_faction": "zombie",
  "bodytype": "human",
  "species": [ "ZOMBIE", "HUMAN" ],
- "volume": "625000 ml",
+ "volume": "875 L",
  "weight": "200 kg",
  "hp": 300,
  "speed": 75,
@@ -282,7 +282,7 @@
  "melee_dice": 3,
  "melee_dice_sides": 8,
  "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
- "weakpoint_sets": [ "wps_humanoid_body", "wps_natural_armor", "wps_humanoid_open_helmet" ],
+ "weakpoint_sets": [ "wps_humanoid_body", "wps_natural_armor", "wps_humanoid_open_helmet", "wps_humanoid_head_small" ],
  "families": [
  "prof_intro_biology",
  "prof_physiology",
@@ -302,7 +302,7 @@
  { "id": "smash", "throw_strength": 72 }
  ],
  "death_drops": "mon_zombie_kevlar_death_drops",
- "burn_into": "mon_zombie_scorched",
+ "burn_into": "mon_zombie_fiend",
  "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ],
  "armor": { "bash": 30, "cut": 50, "bullet": 40, "electric": 6 }
  },
@@ -331,7 +331,7 @@
  "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_full_helmet" ],
  "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
  "vision_day": 30,
- "vision_night": 5,
+ "vision_night": 3,
  "harvest": "zombie_humanoid",
  "grab_strength": 20,
  "special_attacks": [ { "id": "grab", "cooldown": 7 }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid", "cooldown": 5 } ],
@@ -450,7 +450,7 @@
  "volume": "62500 ml",
  "weight": "81500 g",
  "hp": 120,
- "speed": 70,
+ "speed": 50,
  "material": [ "flesh" ],
  "symbol": "Z",
  "color": "white_red",

data/json/monsters/zed_survivor.json

@@ -10,37 +10,47 @@
  "volume": "62500 ml",
  "weight": "81500 g",
  "hp": 120,
- "speed": 90,
+ "speed": 85,
  "material": [ "flesh" ],
  "symbol": "Z",
  "color": "light_red_green",
- "aggression": 75,
+ "aggression": 100,
  "morale": 100,
  "melee_skill": 6,
  "melee_dice": 3,
  "melee_dice_sides": 3,
- "dodge": 3,
  "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_light_armor", "wps_humanoid_open_helmet" ],
  "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored" ],
- "vision_day": 50,
+ "vision_day": 30,
  "vision_night": 3,
  "harvest": "zombie_humanoid",
  "grab_strength": 20,
- "special_attacks": [ [ "SHRIEK", 20 ], { "id": "bite_humanoid", "cooldown": 5, "min_mul": 1 }, { "id": "grab", "cooldown": 7 } ],
+ "special_attacks": [ { "id": "grab" }, { "id": "bite_humanoid", "cooldown": 5 }, { "id": "scratch_humanoid" } ],
  "death_drops": "mon_zombie_survivor_death_drops",
  "burn_into": "mon_zombie_scorched",
  "fungalize_into": "mon_zombie_fungus",
  "flags": [ "SEES", "HEARS", "WARM", "GRABS", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ],
  "armor": { "bash": 7, "cut": 7, "stab": 5, "acid": 4, "bullet": 6, "electric": 2 }
  },
+ {
+ "id": "mon_zombie_survivor_no_weakpoints",
+ "type": "MONSTER",
+ "name": { "str_sp": "zombie survivor test only" },
+ "description": "This zombie survivor is for testing purposes only.",
+ "copy-from": "mon_zombie_survivor",
+ "speed": 90,
+ "dodge": 3,
+ "special_attacks": [ [ "SHRIEK", 20 ], { "id": "bite_humanoid", "cooldown": 5, "min_mul": 1 }, { "id": "grab", "cooldown": 7 } ],
+ "delete": { "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_light_armor", "wps_humanoid_open_helmet" ] }
+ },
  {
  "id": "mon_zombie_paramilitary",
  "type": "MONSTER",
  "name": { "str": "paramilitary zombie" },
  "description": "Wearing military surplus gear including an armored vest with patches of local militias, cartoon women, obscene statements, or local political groups. This person definitely thought they were ready for the apocalypse.",
  "copy-from": "mon_zombie_survivor",
  "looks_like": "mon_zombie_survivor",
- "armor": { "bash": 12, "cut": 25, "bullet": 20, "electric": 3 },
+ "armor": { "bash": 10, "cut": 22, "bullet": 15, "electric": 2 },
  "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ],
  "death_drops": "mon_zombie_paramilitary_death_drops"
  },
@@ -52,12 +62,11 @@
  "copy-from": "mon_zombie_survivor",
  "looks_like": "mon_zombie_survivor",
  "color": "light_red_green",
- "speed": 110,
+ "speed": 90,
  "melee_skill": 9,
  "melee_dice_sides": 4,
  "melee_damage": [ { "damage_type": "cut", "amount": 5 } ],
  "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_full_helmet" ],
- "vision_night": 6,
  "death_drops": "mon_zombie_survivor_elite_death_drops",
  "armor": { "acid": 4, "bash": 15, "cut": 25, "stab": 18, "bullet": 20, "electric": 4 }
  }

data/json/monsters/zed_tentacle.json

@@ -14,7 +14,6 @@
  "material": [ "flesh" ],
  "symbol": "Z",
  "color": "white_cyan",
- "scents_tracked": [ "sc_human", "sc_fetid" ],
  "aggression": 100,
  "morale": 100,
  "melee_skill": 6,
@@ -70,7 +69,6 @@
  "material": [ "flesh" ],
  "symbol": "Z",
  "color": "light_gray_cyan",
- "scents_tracked": [ "sc_human", "sc_fetid" ],
  "aggression": 100,
  "morale": 100,
  "melee_skill": 6,
@@ -81,7 +79,7 @@
  "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
  "vision_night": 3,
  "harvest": "zombie_humanoid",
- "grab_strength": 12,
+ "grab_strength": 15,
  "special_attacks": [
  { "id": "grab", "cooldown": 5, "move_cost": 50 },
  { "id": "grab_2", "cooldown": 5, "move_cost": 50 },
@@ -128,19 +126,18 @@
  "material": [ "flesh" ],
  "symbol": "Z",
  "color": "dark_gray_cyan",
- "scents_tracked": [ "sc_human", "sc_fetid" ],
  "aggression": 100,
  "morale": 100,
  "melee_skill": 6,
  "melee_dice": 2,
  "melee_dice_sides": 3,
  "melee_damage": [ { "damage_type": "bash", "amount": 0 } ],
  "weakpoint_sets": [ "wps_humanoid_body" ],
- "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_hulk" ],
+ "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
  "vision_day": 8,
  "vision_night": 3,
  "harvest": "zombie_humanoid",
- "grab_strength": 30,
+ "grab_strength": 50,
  "special_attacks": [
  { "id": "grab", "cooldown": 5, "move_cost": 50, "range": 2 },
  { "id": "grab_2", "cooldown": 5, "move_cost": 50, "range": 2 },

data/mods/TEST_DATA/monsters.json

@@ -399,14 +399,6 @@
  "weakpoints": [ { "id": "test_eye", "name": "inline eye (zero coverage)", "coverage": 0 } ],
  "delete": { "weakpoints": [ { "id": "test_head" } ], "weakpoint_sets": [ "test_special_head" ] }
  },
- {
- "id": "mon_zombie_survivor_no_weakpoints",
- "type": "MONSTER",
- "name": { "str": "zombie survivor test only" },
- "description": "This zombie survivor is for testing purposes only.",
- "copy-from": "mon_zombie_survivor",
- "delete": { "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_light_armor", "wps_humanoid_open_helmet" ] }
- },
  {
  "id": "mon_shoggoth_flesh_only",
  "type": "MONSTER",

src/item.cpp

@@ -194,7 +194,7 @@ static const morale_type morale_null( "morale_null" );
 static const mtype_id mon_human( "mon_human" );
 static const mtype_id mon_zombie_smoker( "mon_zombie_smoker" );
 static const mtype_id mon_zombie_soldier_no_weakpoints( "mon_zombie_soldier_no_weakpoints" );
-static const mtype_id mon_zombie_survivor( "mon_zombie_survivor" );
+static const mtype_id mon_zombie_survivor_no_weakpoints( "mon_zombie_survivor_no_weakpoints" );
 static const mtype_id pseudo_debug_mon( "pseudo_debug_mon" );
 
 static const quality_id qual_BOIL( "BOIL" );
@@ -2350,7 +2350,7 @@ static const std::vector<std::pair<translation, dps_comp_data>> dps_comp_monster
  { to_translation( "Best" ), { pseudo_debug_mon, true, false } },
  { to_translation( "Vs. Agile" ), { mon_zombie_smoker, true, true } },
  { to_translation( "Vs. Armored" ), { mon_zombie_soldier_no_weakpoints, true, true } },
- { to_translation( "Vs. Mixed" ), { mon_zombie_survivor, false, true } },
+ { to_translation( "Vs. Mixed" ), { mon_zombie_survivor_no_weakpoints, false, true } },
 };
 
 std::map<std::string, double> item::dps( const bool for_display, const bool for_calc,