diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index 48f6aee2a8d3c..1f8aeba429432 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -1654,7 +1654,6 @@ "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "WARM", "BASHES", "GROUP_BASH", "POISON", "ACIDPROOF", "NO_BREATHE" ], "death_drops": "xedra_officer_set", "bleed_rate": 0, - "vision_day": 40, "vision_night": 40, "special_attacks": [ { diff --git a/data/json/monsters/zed_lab.json b/data/json/monsters/zed_lab.json index 5feac4a42376b..ce7606fb06927 100644 --- a/data/json/monsters/zed_lab.json +++ b/data/json/monsters/zed_lab.json @@ -12,28 +12,25 @@ "volume": "62500 ml", "weight": "81500 g", "hp": 80, - "speed": 75, + "speed": 70, "material": [ "flesh" ], "symbol": "Z", "color": "white_cyan", "aggression": 100, "morale": 100, - "melee_skill": 3, + "melee_skill": 4, "melee_dice": 2, - "melee_dice_sides": 4, - "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], - "dodge": 1, + "melee_dice_sides": 3, + "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], "weakpoint_sets": [ "wps_humanoid_body" ], "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], - "vision_day": 50, "vision_night": 3, "harvest": "zombie_humanoid", - "path_settings": { "max_dist": 5 }, "grab_strength": 20, - "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" } ], + "special_attacks": [ { "id": "grab" }, { "id": "bite_humanoid", "cooldown": 5 }, { "id": "scratch_humanoid" } ], "death_drops": "mon_zombie_scientist_death_drops", "burn_into": "mon_zombie_scorched", - "upgrades": { "half_life": 32, "into_group": "GROUP_ZOMBIE_UPGRADE" }, + "upgrades": { "half_life": 30, "into_group": "GROUP_ZOMBIE_UPGRADE" }, "flags": [ "SEES", "HEARS", "STUMBLES", "WARM", "GRABS", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ], "armor": { "electric": 1 } }, @@ -62,11 +59,14 @@ "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor" ], "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored" ], - "vision_day": 30, "vision_night": 3, "harvest": "zombie_humanoid", - "grab_strength": 20, - "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid", "cooldown": 10 } ], + "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_labsecurity_death_drops", "upgrades": { "half_life": 35, "into_group": "GROUP_SOLDIER_UPGRADE" }, "burn_into": "mon_zombie_scorched", diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index bcae67a311057..b6f0c58860728 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -1052,7 +1052,6 @@ "melee_dice": 4, "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], "dodge": 1, - "path_settings": { "max_dist": 4, "allow_climb_stairs": false }, "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid", "cooldown": 10 }, diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json index 6dc7e5b1aa6bc..bc807671a1648 100644 --- a/data/json/monsters/zed_soldiers.json +++ b/data/json/monsters/zed_soldiers.json @@ -21,13 +21,12 @@ "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" ], "vision_day": 30, "vision_night": 3, "harvest": "zombie_humanoid", - "grab_strength": 20, + "grab_strength": 30, "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid", "cooldown": 5, "min_mul": 0.8 } ], "death_drops": "mon_zombie_soldier_death_drops", "upgrades": { "half_life": 42, "into_group": "GROUP_SOLDIER_UPGRADE" }, @@ -36,6 +35,15 @@ "flags": [ "SEES", "HEARS", "WARM", "GRABS", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ], "armor": { "bash": 12, "cut": 25, "bullet": 20, "electric": 3 } }, + { + "id": "mon_zombie_soldier_no_weakpoints", + "type": "MONSTER", + "name": { "str_sp": "zombie soldier test only" }, + "description": "This zombie soldier is for testing purposes only.", + "copy-from": "mon_zombie_soldier", + "dodge": 1, + "delete": { "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ] } + }, { "id": "mon_zombie_soldier_blackops_1", "type": "MONSTER", @@ -394,13 +402,12 @@ "melee_dice_sides": 4, "upgrades": { "half_life": 38, "into": "mon_zombie_marine_upgrade" }, "death_drops": "mon_zombie_marine_death_drops", - "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" ], "vision_day": 30, "vision_night": 3, "harvest": "zombie_humanoid", - "grab_strength": 20, + "grab_strength": 30, "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid", "cooldown": 5, "min_mul": 0.8 } ], "burn_into": "mon_zombie_scorched", "fungalize_into": "mon_zombie_fungus", @@ -455,7 +462,6 @@ "material": [ "flesh" ], "symbol": "Z", "color": "white_red", - "scents_tracked": [ "sc_human", "sc_fetid" ], "aggression": 100, "morale": 100, "melee_skill": 5, @@ -479,7 +485,7 @@ "harvest": "zombie_humanoid", "death_drops": "mon_zombie_armored_death_drops", "burn_into": "mon_zombie_scorched", - "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], + "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "bash": 64, "cut": 64, "acid": 20, "heat": 20, "bullet": 51, "electric": 10 } }, { @@ -508,7 +514,6 @@ "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_day": 50, "vision_night": 3, "luminance": 4, "harvest": "zombie_humanoid", @@ -516,20 +521,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", - "ACIDPROOF", - "ELECTRIC", - "NO_BREATHE", - "REVIVES", - "FILTHY" - ], + "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "ELECTRIC", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "bash": 10, "cut": 18, "bullet": 14, "electric": 3 } }, { diff --git a/data/mods/TEST_DATA/monsters.json b/data/mods/TEST_DATA/monsters.json index 743c2a1bf5867..3427b65f97df3 100644 --- a/data/mods/TEST_DATA/monsters.json +++ b/data/mods/TEST_DATA/monsters.json @@ -407,14 +407,6 @@ "copy-from": "mon_zombie_survivor", "delete": { "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_light_armor", "wps_humanoid_open_helmet" ] } }, - { - "id": "mon_zombie_soldier_no_weakpoints", - "type": "MONSTER", - "name": { "str": "zombie soldier test only" }, - "description": "This zombie soldier is for testing purposes only.", - "copy-from": "mon_zombie_soldier", - "delete": { "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ] } - }, { "id": "mon_shoggoth_flesh_only", "type": "MONSTER", diff --git a/src/item.cpp b/src/item.cpp index 056188efc8baa..b2ba44040e165 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -193,7 +193,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( "mon_zombie_soldier" ); +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 pseudo_debug_mon( "pseudo_debug_mon" ); @@ -2349,7 +2349,7 @@ struct dps_comp_data { static const std::vector> dps_comp_monsters = { { to_translation( "Best" ), { pseudo_debug_mon, true, false } }, { to_translation( "Vs. Agile" ), { mon_zombie_smoker, true, true } }, - { to_translation( "Vs. Armored" ), { mon_zombie_soldier, true, true } }, + { to_translation( "Vs. Armored" ), { mon_zombie_soldier_no_weakpoints, true, true } }, { to_translation( "Vs. Mixed" ), { mon_zombie_survivor, false, true } }, };