From ef67fb944299046ec47d70c156630414b4848ae8 Mon Sep 17 00:00:00 2001 From: GuardianDll <67688115+GuardianDll@users.noreply.github.com> Date: Tue, 25 Jan 2022 19:32:43 +0100 Subject: [PATCH] Feral soliders (#54717) Co-authored-by: LyleSY --- data/json/monsterdrops/feral_humans.json | 25 +++++++++++++++++++ data/json/monstergroups/military.json | 15 ++++++++---- data/json/monstergroups/zombies.json | 4 ++- data/json/monsters/feral_humans.json | 31 ++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 6 deletions(-) diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json index d7d52834da545..92fef0847bf30 100644 --- a/data/json/monsterdrops/feral_humans.json +++ b/data/json/monsterdrops/feral_humans.json @@ -501,5 +501,30 @@ "ammo": 10, "id": "feral_autogun", "items": [ [ "scar_l", 200 ], [ "m4_carbine", 200 ], [ "ruger_mini", 200 ], [ "ar_pistol", 200 ], [ "ar15", 200 ] ] + }, + { + "id": "mon_feral_soldier_death_drops", + "type": "item_group", + "subtype": "collection", + "magazine": 100, + "ammo": 0, + "entries": [ + { + "distribution": [ + { "group": "clothing_soldier_set", "prob": 65, "damage": [ 1, 4 ] }, + { "group": "clothing_soldier_winter_set", "prob": 35, "damage": [ 1, 4 ] } + ] + }, + { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 }, + { "group": "military_patrol_food" }, + { "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 25 }, + { "group": "wallets", "prob": 10 }, + { "group": "pocket_cigar", "prob": 15 }, + { "group": "misc_smoking_legal", "prob": 30 }, + { "item": "e_tool", "prob": 15, "damage": [ 1, 4 ] }, + { "item": "mask_gas", "prob": 5, "charges": [ 0, 100 ], "damage": [ 1, 4 ] }, + { "item": "two_way_radio", "prob": 15, "charges": [ 0, 100 ], "damage": [ 1, 4 ] }, + { "item": "knife_combat", "prob": 100, "damage": [ 3, 4 ] } + ] } ] diff --git a/data/json/monstergroups/military.json b/data/json/monstergroups/military.json index b2a5b380c2988..9e4965b4fff4c 100644 --- a/data/json/monstergroups/military.json +++ b/data/json/monstergroups/military.json @@ -10,7 +10,8 @@ { "monster": "mon_dispatch_military", "weight": 5, "cost_multiplier": 80 }, { "monster": "mon_talon_m202a1", "weight": 15, "cost_multiplier": 50 }, { "monster": "mon_zombie_flamer", "weight": 10, "cost_multiplier": 50 }, - { "monster": "mon_zombie_military_pilot", "weight": 0 } + { "monster": "mon_zombie_military_pilot", "weight": 0 }, + { "monster": "mon_feral_soldier", "weight": 15 } ] }, { @@ -34,7 +35,8 @@ { "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_zombie_armored", "weight": 10, "cost_multiplier": 5 }, + { "monster": "mon_feral_soldier", "weight": 15 } ] }, { @@ -53,7 +55,8 @@ { "monster": "mon_zombie_armored", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_zombie_scorched", "weight": 25 }, { "monster": "mon_zombie_hazmat", "weight": 25 }, - { "monster": "mon_zombie", "weight": 10 } + { "monster": "mon_zombie", "weight": 10 }, + { "monster": "mon_feral_soldier", "weight": 15 } ] }, { @@ -83,7 +86,8 @@ { "monster": "mon_zombie_soldier", "weight": 200, "cost_multiplier": 2 }, { "monster": "mon_zombie_milbase_personnel", "weight": 50 }, { "monster": "mon_zombie_military_pilot", "weight": 5 }, - { "monster": "mon_zombie_flamer", "weight": 1, "cost_multiplier": 30 } + { "monster": "mon_zombie_flamer", "weight": 1, "cost_multiplier": 30 }, + { "monster": "mon_feral_soldier", "weight": 300 } ] }, { @@ -114,7 +118,8 @@ { "monster": "mon_zombie_milbase_personnel", "weight": 50 }, { "monster": "mon_zombie_military_pilot", "weight": 20 }, { "monster": "mon_zombie_flamer", "weight": 1, "cost_multiplier": 30 }, - { "monster": "mon_zombie_scientist", "weight": 100 } + { "monster": "mon_zombie_scientist", "weight": 100 }, + { "monster": "mon_feral_soldier", "weight": 300 } ] } ] diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json index e04df038e69b8..cd833c1add11b 100644 --- a/data/json/monstergroups/zombies.json +++ b/data/json/monstergroups/zombies.json @@ -114,6 +114,7 @@ { "monster": "mon_feral_human_crowbar", "weight": 4, "pack_size": [ 2, 3 ] }, { "monster": "mon_feral_human_axe", "weight": 2, "cost_multiplier": 2, "pack_size": [ 1, 2 ] }, { "monster": "mon_feral_sapien_spear", "weight": 1, "cost_multiplier": 2 }, + { "monster": "mon_feral_soldier", "weight": 1, "cost_multiplier": 5 }, { "monster": "mon_zombie_brainless", "weight": 65 } ] }, @@ -541,7 +542,8 @@ { "monster": "mon_feral_human_crowbar", "weight": 40, "pack_size": [ 2, 6 ] }, { "monster": "mon_feral_human_axe", "weight": 20, "cost_multiplier": 2, "pack_size": [ 1, 4 ] }, { "monster": "mon_feral_sapien_spear", "weight": 14, "cost_multiplier": 2 }, - { "monster": "mon_feral_human_axe", "weight": 20, "cost_multiplier": 2, "pack_size": [ 1, 4 ] } + { "monster": "mon_feral_human_axe", "weight": 20, "cost_multiplier": 2, "pack_size": [ 1, 4 ] }, + { "monster": "mon_feral_soldier", "weight": 5, "cost_multiplier": 2 } ] }, { diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json index 0405b25faeb61..7883d573b8aa8 100644 --- a/data/json/monsters/feral_humans.json +++ b/data/json/monsters/feral_humans.json @@ -645,5 +645,36 @@ ], "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_CLOSE", "STALK" ], "fear_triggers": [ "HURT" ] + }, + { + "id": "mon_feral_soldier", + "type": "MONSTER", + "name": { "str": "feral soldier" }, + "description": "Wearing a military uniform with a kevlar vest, this person seems to be a highly trained military professional, now turned feral. Tense, dirty hands grip a combat knife as their bloodshot eyes scan for threats.", + "default_faction": "zombie", + "bodytype": "human", + "species": [ "HUMAN" ], + "volume": "62500 ml", + "weight": "81500 g", + "hp": 100, + "speed": 85, + "material": [ "flesh" ], + "symbol": "@", + "color": "i_magenta", + "aggression": 40, + "morale": 100, + "melee_skill": 6, + "melee_dice": 2, + "melee_dice_sides": 2, + "melee_cut": 18, + "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], + "dodge": 4, + "harvest": "human", + "vision_night": 5, + "path_settings": { "max_dist": 40, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, + "death_drops": "mon_feral_soldier_death_drops", + "zombify_into": "mon_zombie_soldier", + "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], + "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1" ] } ]