diff --git a/data/json/mapgen/lab/lab_floorplans_1side.json b/data/json/mapgen/lab/lab_floorplans_1side.json index 6f9c87d4a237f..5edd16fb948fa 100644 --- a/data/json/mapgen/lab/lab_floorplans_1side.json +++ b/data/json/mapgen/lab/lab_floorplans_1side.json @@ -157,13 +157,7 @@ "palettes": [ "lab_palette" ], "place_monsters": [ { "monster": "GROUP_MAYBE_MIL", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.05 } ], "place_monster": [ - { - "monster": [ "mon_zombie_bio_op", "mon_dispatch" ], - "x": [ 10, 16 ], - "y": [ 5, 12 ], - "pack_size": [ 1, 2 ], - "chance": 40 - }, + { "monster": [ "mon_dispatch" ], "x": [ 10, 16 ], "y": [ 5, 12 ], "pack_size": [ 1, 2 ], "chance": 40 }, { "monster": [ "mon_zombie_soldier" ], "x": [ 1, 21 ], "y": [ 1, 16 ], "pack_size": [ 1, 4 ], "chance": 40 } ], "furniture": { "7": "f_console" }, diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mapgen_updates.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mapgen_updates.json index 6fe38be4fde41..fde38e272bc05 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mapgen_updates.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mapgen_updates.json @@ -55,7 +55,7 @@ "method": "json", "object": { "place_loot": [ { "item": "id_science_security_magenta", "x": 21, "y": 14, "chance": 20 } ], - "place_monster": [ { "monster": [ "mon_zombie_brute", "mon_zombie_bio_op" ], "x": 21, "y": 14, "chance": 100 } ] + "place_monster": [ { "monster": [ "mon_zombie_brute" ], "x": 21, "y": 14, "chance": 100 } ] } }, { diff --git a/data/json/mapgen/map_extras/military.json b/data/json/mapgen/map_extras/military.json index 14a100518923c..80dded3c91134 100644 --- a/data/json/mapgen/map_extras/military.json +++ b/data/json/mapgen/map_extras/military.json @@ -24,11 +24,7 @@ { "name": "GROUP_MIL_EXTRA", "type": "monstergroup", - "monsters": [ - { "monster": "mon_zombie_soldier", "weight": 76 }, - { "monster": "mon_feral_soldier", "weight": 20 }, - { "monster": "mon_zombie_bio_op", "weight": 4 } - ] + "monsters": [ { "monster": "mon_zombie_soldier", "weight": 76 }, { "monster": "mon_feral_soldier", "weight": 20 } ] }, { "type": "mapgen", diff --git a/data/json/mapgen/microlab/microlab_generic.json b/data/json/mapgen/microlab/microlab_generic.json index b6d6fd261dd99..a3f9d3b137bdc 100644 --- a/data/json/mapgen/microlab/microlab_generic.json +++ b/data/json/mapgen/microlab/microlab_generic.json @@ -499,7 +499,7 @@ "terrain": { "G": "t_card_science" }, "monster": { "T": { "monster": "mon_turret_rifle", "spawn_data": { "ammo": [ { "ammo_id": "556", "qty": [ 30, 90 ] } ] } }, - "M": { "monster": "mon_zombie_bio_op" } + "M": { "monster": "mon_zombie_soldier" } } } }, diff --git a/data/json/mapgen/outpost.json b/data/json/mapgen/outpost.json index e11060350ee76..22e82b5844681 100644 --- a/data/json/mapgen/outpost.json +++ b/data/json/mapgen/outpost.json @@ -81,8 +81,7 @@ ], "monster": { ".": [ - { "monster": "mon_zombie_soldier", "chance": 1 }, - { "monster": "mon_zombie_bio_op", "chance": 1 }, + { "monster": "mon_zombie_soldier", "chance": 2 }, { "monster": "mon_dispatch", "chance": 1 }, { "monster": "mon_dispatch_military", "chance": 1 }, { "monster": "mon_secubot", "chance": 5 } @@ -213,8 +212,7 @@ ], "monster": { ".": [ - { "monster": "mon_zombie_soldier", "chance": 1 }, - { "monster": "mon_zombie_bio_op", "chance": 1 }, + { "monster": "mon_zombie_soldier", "chance": 2 }, { "monster": "mon_dispatch", "chance": 1 }, { "monster": "mon_dispatch_military", "chance": 1 }, { "monster": "mon_secubot", "chance": 5 } diff --git a/data/json/monsterdrops/zombie_soldier.json b/data/json/monsterdrops/zombie_soldier.json index f573044837b7a..4ef3e6f2d554b 100644 --- a/data/json/monsterdrops/zombie_soldier.json +++ b/data/json/monsterdrops/zombie_soldier.json @@ -146,69 +146,5 @@ { "group": "mon_zombie_soldier_death_drops", "prob": 10 }, { "group": "mon_zombie_cop_death_drops", "prob": 10 } ] - }, - { - "type": "item_group", - "subtype": "collection", - "id": "mon_zombie_bio_op_death_drops", - "magazine": 100, - "ammo": 60, - "entries": [ - { - "distribution": [ - { "group": "clothing_soldier_set", "prob": 65, "damage": [ 1, 4 ] }, - { "group": "clothing_soldier_winter_set", "prob": 35, "damage": [ 1, 4 ] } - ] - }, - { - "distribution": [ - { - "group": "military_standard_assault_rifles", - "contents-group": "sopmod", - "prob": 75, - "damage": [ 0, 4 ], - "dirt": [ 0, 6000 ] - }, - { - "group": "military_standard_lmgs", - "contents-item": "shoulder_strap", - "prob": 4, - "damage": [ 0, 4 ], - "dirt": [ 0, 6000 ] - }, - { - "group": "military_standard_lmgs", - "contents-item": [ "shoulder_strap", "acog_scope" ], - "prob": 6, - "damage": [ 0, 4 ], - "dirt": [ 0, 6000 ] - }, - { - "group": "military_standard_shotguns", - "contents-item": "shoulder_strap", - "prob": 5, - "damage": [ 0, 4 ], - "dirt": [ 0, 6000 ] - } - ], - "prob": 10 - }, - { "group": "infantry_common_gear" }, - { - "distribution": [ - { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 80 }, - { "item": "40x46mm_m433", "charges": [ 1, 3 ], "prob": 20 } - ], - "prob": 20 - }, - { "group": "military_patrol_food" }, - { - "collection": [ { "group": "infantry_officer_gear", "prob": 90 }, { "group": "infantry_medical_gear", "prob": 80 } ] - }, - { "group": "wallets", "prob": 10 }, - { "group": "pocket_cigar", "prob": 15 }, - { "group": "misc_smoking_legal", "prob": 30 }, - { "item": "dog_tag", "prob": 40 } - ] } ] diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json index adb23d402bf83..50298347862e3 100644 --- a/data/json/monstergroups/lab.json +++ b/data/json/monstergroups/lab.json @@ -15,7 +15,6 @@ { "monster": "mon_secubot", "weight": 5, "cost_multiplier": 10 }, { "monster": "mon_talon_m202a1", "weight": 3, "cost_multiplier": 10 }, { "monster": "mon_zombie_hazmat", "weight": 100, "cost_multiplier": 0 }, - { "monster": "mon_zombie_bio_op", "weight": 50, "cost_multiplier": 5 }, { "monster": "mon_zombie_armored", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_zombie_technician", "weight": 50, "cost_multiplier": 3 }, { "monster": "mon_feral_human_tool", "weight": 25, "cost_multiplier": 3 }, @@ -54,7 +53,6 @@ { "monster": "mon_skitterbot", "weight": 85, "cost_multiplier": 0, "pack_size": [ 2, 3 ] }, { "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_armored", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_zombie_electric", "weight": 50, "cost_multiplier": 3 }, { "monster": "mon_zombie_necro", "weight": 15, "cost_multiplier": 15 }, @@ -93,7 +91,6 @@ { "monster": "mon_skitterbot", "weight": 85, "pack_size": [ 2, 3 ] }, { "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_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 ] } @@ -116,7 +113,6 @@ { "monster": "mon_skitterbot", "weight": 1, "cost_multiplier": 0, "pack_size": [ 8, 12 ] }, { "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_armored", "weight": 5, "cost_multiplier": 8 }, { "monster": "mon_zombie_electric", "weight": 50, "cost_multiplier": 3 }, { "monster": "mon_zombie_necro", "weight": 15, "cost_multiplier": 15 }, @@ -183,7 +179,6 @@ { "monster": "mon_skitterbot", "weight": 10, "cost_multiplier": 0, "pack_size": [ 2, 3 ] }, { "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", "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 ] }, @@ -261,7 +256,6 @@ { "monster": "mon_feral_labsecurity_flashlight", "weight": 12, "cost_multiplier": 2 }, { "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_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 index 5e0e63ca7be67..ac6eccbd6da26 100644 --- a/data/json/monstergroups/military.json +++ b/data/json/monstergroups/military.json @@ -31,7 +31,6 @@ { "monster": "mon_zombie_soldier", "weight": 100, "cost_multiplier": 2, "pack_size": [ 1, 4 ] }, { "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_armored", "weight": 10, "cost_multiplier": 5 }, { "monster": "mon_feral_soldier", "weight": 15 } ] @@ -58,7 +57,6 @@ "monsters": [ { "monster": "mon_zombie_soldier", "weight": 245 }, { "monster": "mon_zombie_hazmat", "weight": 25 }, - { "monster": "mon_zombie_bio_op", "weight": 5 }, { "monster": "mon_zombie_soldier_blackops_1", "weight": 5 }, { "monster": "mon_zombie_armored", "weight": 1, "cost_multiplier": 5 }, { "monster": "mon_zombie_scientist", "weight": 20 }, @@ -76,7 +74,6 @@ { "monster": "mon_zombie_kevlar_1", "weight": 50, "cost_multiplier": 10 }, { "monster": "mon_zombie_military_pilot", "weight": 5 }, { "monster": "mon_zombie_milbase_personnel", "weight": 40 }, - { "monster": "mon_zombie_bio_op", "weight": 30, "cost_multiplier": 5 }, { "monster": "mon_zombie_soldier_blackops_1", "weight": 15, "cost_multiplier": 10 }, { "monster": "mon_zombie_armored", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_zombie_scorched", "weight": 25 }, diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index c57661eeec25b..9177747beaae8 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -398,7 +398,6 @@ "name": "GROUP_BUNKER", "monsters": [ { "monster": "mon_zombie_armored", "weight": 25, "cost_multiplier": 20, "pack_size": [ 2, 6 ] }, - { "monster": "mon_zombie_bio_op", "weight": 150, "cost_multiplier": 10 }, { "monster": "mon_zombie_soldier", "weight": 600, "cost_multiplier": 3 } ] }, @@ -463,7 +462,6 @@ { "monster": "mon_skeleton_hulk" }, { "monster": "mon_zombie_kevlar_2" }, { "monster": "mon_zombie_soldier_blackops_1" }, - { "monster": "mon_zombie_bio_op" }, { "monster": "mon_zombie_survivor_elite" }, { "monster": "mon_zombear" }, { "monster": "mon_zoose" }, diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index 88e9fba3faec5..a252560d2d8a0 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -1874,7 +1874,16 @@ "type": "MONSTER", "description": "A figure in a high-tech suit, their outline contorted as though you were viewing them through a prism. Their movements are strained but determined, pushing through apparent pain with feverish resolve, dead-set on reaching their target.", "name": { "str": "mercenary officer" }, - "copy-from": "mon_zombie_bio_op", + "copy-from": "mon_zombie_base", + "diff": 5, + "speed": 95, + "color": "red_cyan", + "melee_skill": 7, + "melee_dice": 3, + "melee_dice_sides": 6, + "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], + "luminance": 4, + "special_when_hit": [ "ZAPBACK", 75 ], "hp": 150, "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "WARM", "BASHES", "GROUP_BASH", "POISON", "ACIDPROOF", "NO_BREATHE" ], "death_drops": "xedra_officer_set", @@ -1887,10 +1896,15 @@ "spell_data": { "id": "spell_conjure_memories" }, "cooldown": 30, "monster_message": "The creature screams \"SOMEONE HELP ME, ANYONE!\"." - } + }, + { "id": "bio_op_takedown", "cooldown": 20 } ], "death_function": { "effect": { "id": "mon_XEDRA_officer_banish", "hit_self": true } }, - "armor": { "electric": 3, "bash": 30, "cut": 30, "bullet": 40 } + "armor": { "electric": 3, "bash": 30, "cut": 30, "bullet": 40 }, + "extend": { + "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet", "wps_humanoid_gasmask" ], + "families": [ "prof_wp_syn_armored" ] + } }, { "id": "mon_XEDRA_soldier", diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json index 0c28c82cd06e3..dae316e36c4cb 100644 --- a/data/json/monsters/zed_soldiers.json +++ b/data/json/monsters/zed_soldiers.json @@ -345,30 +345,5 @@ "burn_into": "mon_zombie_scorched", "armor": { "bash": 64, "cut": 64, "acid": 20, "heat": 20, "bullet": 51, "electric": 10 }, "extend": { "families": [ "prof_wp_syn_armored" ] } - }, - { - "id": "mon_zombie_bio_op", - "type": "MONSTER", - "name": { "str": "zombie bio-operator" }, - "description": "This armored soldier zombie appears to have been some sort of special forces agent. Its malfunctioning equipment sends out occasional showers of sparks.", - "copy-from": "mon_zombie_base", - "diff": 5, - "hp": 120, - "speed": 95, - "color": "red_cyan", - "melee_skill": 7, - "melee_dice": 3, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], - "luminance": 4, - "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], - "special_when_hit": [ "ZAPBACK", 75 ], - "death_drops": "mon_zombie_bio_op_death_drops", - "armor": { "bash": 10, "cut": 18, "bullet": 14, "electric": 3 }, - "extend": { - "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet", "wps_humanoid_gasmask" ], - "families": [ "prof_wp_syn_armored" ], - "flags": [ "ELECTRIC" ] - } } ] diff --git a/data/mods/No_Hope/monster_drops.json b/data/mods/No_Hope/monster_drops.json index 73327c4fb4afd..c092395055e16 100644 --- a/data/mods/No_Hope/monster_drops.json +++ b/data/mods/No_Hope/monster_drops.json @@ -35,5 +35,69 @@ "copy-from": "feral_scientists_death_drops_scalpel", "subtype": "collection", "extend": { "entries": [ { "group": "bionics", "prob": 10 } ] } + }, + { + "type": "item_group", + "subtype": "collection", + "id": "mon_zombie_bio_op_death_drops", + "magazine": 100, + "ammo": 60, + "entries": [ + { + "distribution": [ + { "group": "clothing_soldier_set", "prob": 65, "damage": [ 1, 4 ] }, + { "group": "clothing_soldier_winter_set", "prob": 35, "damage": [ 1, 4 ] } + ] + }, + { + "distribution": [ + { + "group": "military_standard_assault_rifles", + "contents-group": "sopmod", + "prob": 75, + "damage": [ 0, 4 ], + "dirt": [ 0, 6000 ] + }, + { + "group": "military_standard_lmgs", + "contents-item": "shoulder_strap", + "prob": 4, + "damage": [ 0, 4 ], + "dirt": [ 0, 6000 ] + }, + { + "group": "military_standard_lmgs", + "contents-item": [ "shoulder_strap", "acog_scope" ], + "prob": 6, + "damage": [ 0, 4 ], + "dirt": [ 0, 6000 ] + }, + { + "group": "military_standard_shotguns", + "contents-item": "shoulder_strap", + "prob": 5, + "damage": [ 0, 4 ], + "dirt": [ 0, 6000 ] + } + ], + "prob": 10 + }, + { "group": "infantry_common_gear" }, + { + "distribution": [ + { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 80 }, + { "item": "40x46mm_m433", "charges": [ 1, 3 ], "prob": 20 } + ], + "prob": 20 + }, + { "group": "military_patrol_food" }, + { + "collection": [ { "group": "infantry_officer_gear", "prob": 90 }, { "group": "infantry_medical_gear", "prob": 80 } ] + }, + { "group": "wallets", "prob": 10 }, + { "group": "pocket_cigar", "prob": 15 }, + { "group": "misc_smoking_legal", "prob": 30 }, + { "item": "dog_tag", "prob": 40 } + ] } ] diff --git a/data/mods/No_Hope/monster_groups.json b/data/mods/No_Hope/monster_groups.json index 8f43ea1edbf37..089d6f04be506 100644 --- a/data/mods/No_Hope/monster_groups.json +++ b/data/mods/No_Hope/monster_groups.json @@ -64,7 +64,10 @@ { "type": "monstergroup", "name": "GROUP_CENTRAL_LAB", - "monsters": [ { "monster": "mon_chickenbot", "weight": 1, "cost_multiplier": 50 } ] + "monsters": [ + { "monster": "mon_chickenbot", "weight": 1, "cost_multiplier": 50 }, + { "monster": "mon_zombie_bio_op", "weight": 20, "cost_multiplier": 50 } + ] }, { "type": "monstergroup", @@ -82,7 +85,8 @@ "monsters": [ { "monster": "mon_tripod", "weight": 5, "cost_multiplier": 0 }, { "monster": "mon_chickenbot", "weight": 5, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "weight": 5, "cost_multiplier": 0 } + { "monster": "mon_tankbot", "weight": 5, "cost_multiplier": 0 }, + { "monster": "mon_zombie_bio_op", "weight": 20, "cost_multiplier": 50 } ] }, { @@ -91,7 +95,8 @@ "monsters": [ { "monster": "mon_tripod", "weight": 5, "cost_multiplier": 0 }, { "monster": "mon_chickenbot", "weight": 5, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "weight": 5, "cost_multiplier": 0 } + { "monster": "mon_tankbot", "weight": 5, "cost_multiplier": 0 }, + { "monster": "mon_zombie_bio_op", "weight": 20, "cost_multiplier": 50 } ] }, { @@ -101,7 +106,8 @@ "monsters": [ { "monster": "mon_tripod", "weight": 5, "cost_multiplier": 0 }, { "monster": "mon_chickenbot", "weight": 5, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "weight": 5, "cost_multiplier": 0 } + { "monster": "mon_tankbot", "weight": 5, "cost_multiplier": 0 }, + { "monster": "mon_zombie_bio_op", "weight": 20, "cost_multiplier": 50 } ] }, { diff --git a/data/mods/No_Hope/monsters.json b/data/mods/No_Hope/monsters.json index 15375c5b9b040..5ef09bdcb7aac 100644 --- a/data/mods/No_Hope/monsters.json +++ b/data/mods/No_Hope/monsters.json @@ -811,5 +811,31 @@ { "id": "scratch_humanoid" }, { "id": "bite_humanoid", "cooldown": 5 } ] + }, + { + "id": "mon_zombie_bio_op", + "type": "MONSTER", + "name": { "str": "zombie bio-operator" }, + "description": "This armored soldier zombie appears to have been some sort of special forces agent. Its malfunctioning equipment sends out occasional showers of sparks.", + "copy-from": "mon_zombie_base", + "diff": 5, + "hp": 120, + "speed": 95, + "color": "red_cyan", + "melee_skill": 7, + "melee_dice": 3, + "melee_dice_sides": 6, + "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], + "luminance": 4, + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], + "special_when_hit": [ "ZAPBACK", 75 ], + "death_drops": "mon_zombie_bio_op_death_drops", + "armor": { "bash": 10, "cut": 18, "bullet": 14, "electric": 3 }, + "dissect": "dissect_mon_zomborg", + "extend": { + "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet", "wps_humanoid_gasmask" ], + "families": [ "prof_wp_syn_armored" ], + "flags": [ "ELECTRIC" ] + } } ] diff --git a/data/mods/Sky_Island/monstergroups.json b/data/mods/Sky_Island/monstergroups.json index ecc5064718340..bf4ad7ef853d6 100644 --- a/data/mods/Sky_Island/monstergroups.json +++ b/data/mods/Sky_Island/monstergroups.json @@ -135,7 +135,6 @@ { "monster": "mon_zombie_brute_shocker", "weight": 5 }, { "monster": "mon_zombie_necro_boomer", "weight": 5 }, { "monster": "mon_skeleton_electric", "weight": 50 }, - { "monster": "mon_zombie_bio_op", "weight": 50 }, { "monster": "mon_zombie_survivor_elite", "weight": 50 }, { "monster": "mon_zombie_brute_ninja", "weight": 20 }, { "monster": "mon_gastro_bufo", "weight": 10 }, diff --git a/data/mods/Xedra_Evolved/monsters/monster.json b/data/mods/Xedra_Evolved/monsters/monster.json index bbd9a9db0c267..9e935d4031da3 100644 --- a/data/mods/Xedra_Evolved/monsters/monster.json +++ b/data/mods/Xedra_Evolved/monsters/monster.json @@ -258,7 +258,7 @@ "name": { "str": "remains of a dreamforged automaton" }, "description": "A broken robot, still standing and saturated with electricity. Between the shattered dreamdross plates, the ruined armor and the electrical discharges, you can barely see the remains of the machinery that once animated it, and yet it moves on its two feet, albeit like some sort of puppet.", "default_faction": "berserk_bot", - "looks_like": "mon_zombie_bio_op", + "looks_like": "mon_broken_cyborg", "bodytype": "human", "species": [ "ROBOT" ], "diff": 100, diff --git a/tests/npc_talk_test.cpp b/tests/npc_talk_test.cpp index 6bab2716dc4c7..43bf1f9d93d23 100644 --- a/tests/npc_talk_test.cpp +++ b/tests/npc_talk_test.cpp @@ -51,7 +51,7 @@ static const itype_id itype_manual_speech( "manual_speech" ); static const morale_type morale_haircut( "morale_haircut" ); -static const mtype_id mon_zombie_bio_op( "mon_zombie_bio_op" ); +static const mtype_id mon_zombie( "mon_zombie" ); static const npc_class_id NC_TEST_CLASS( "NC_TEST_CLASS" ); @@ -1137,7 +1137,7 @@ TEST_CASE( "npc_compare_int", "[npc_talk]" ) player_character.inv->add_item( item( itype_bottle_glass ) ); player_character.inv->add_item( item( itype_bottle_glass ) ); cata::event e = cata::event::make( - get_player_character().getID(), mon_zombie_bio_op, 0 ); + get_player_character().getID(), mon_zombie, 0 ); get_event_bus().send( e ); player_character.magic->learn_spell( spell_test_spell_json, player_character, false ); player_character.set_mutation( trait_test_trait ); // Give the player the spell scool test_trait