From 56c9ec25e210a4a865d473ac90478e3518709376 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Fri, 24 May 2024 12:45:26 +0100 Subject: [PATCH 1/2] Merge pull request #70705 from GuardianDll/feral_rapier feral with fake rapier uses fake rapier damage --- .../feral_weapon_attacks.json | 21 +++++++++++++++++-- data/json/monsters/feral_humans.json | 1 + 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/data/json/monster_special_attacks/feral_weapon_attacks.json b/data/json/monster_special_attacks/feral_weapon_attacks.json index 5643d7c4cb473..f2fb367a35a00 100644 --- a/data/json/monster_special_attacks/feral_weapon_attacks.json +++ b/data/json/monster_special_attacks/feral_weapon_attacks.json @@ -169,6 +169,23 @@ "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.", "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." }, + { + "type": "monster_attack", + "attack_type": "melee", + "id": "feral_weapon_rapier_fake", + "cooldown": 1, + "move_cost": 95, + "accuracy": 6, + "//": "Feral melee skill + weapon's to hit, so 4+2=6", + "damage_max_instance": [ { "damage_type": "bash", "amount": 9 }, { "damage_type": "stab", "amount": 3 } ], + "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, + "hit_dmg_u": "%1$s hits your %2$s with a rapier!", + "hit_dmg_npc": "%1$s hits 's %2$s with a rapier!", + "miss_msg_u": "%1$s tries to hit you, but you dodge!", + "miss_msg_npc": "%1$s tries to hit , but they dodge!", + "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.", + "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." + }, { "type": "monster_attack", "attack_type": "melee", @@ -194,7 +211,7 @@ "move_cost": 139, "accuracy": 4, "//": "Feral melee skill + weapon's to hit, so 3+1=4", - "damage_max_instance": [ { "damage_type": "bash", "amount": 19 }, { "damage_type": "cut", "amount": 39 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 19 }, { "damage_type": "cut", "amount": 3 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a battle axe!", "hit_dmg_npc": "%1$s hits 's %2$s with a battle axe!", @@ -211,7 +228,7 @@ "move_cost": 97, "accuracy": 4, "//": "Feral melee skill + weapon's to hit, so 3+1=4", - "damage_max_instance": [ { "damage_type": "bash", "amount": 40 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 15 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a mace!", "hit_dmg_npc": "%1$s hits 's %2$s with a mace!", diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json index 216265c28b31d..7b91df3598956 100644 --- a/data/json/monsters/feral_humans.json +++ b/data/json/monsters/feral_humans.json @@ -325,6 +325,7 @@ "copy-from": "mon_feral_fancy_rapier", "name": { "str": "well dressed feral" }, "description": "Wearing fancy clothes and with a rapier in hand, this maniac was once a socialite. They smile with madness and seem like they want to invite you to dinner.", + "special_attacks": [ { "id": "feral_weapon_rapier_fake" } ], "death_drops": "feral_fancy_death_drops_rapier_fake" }, { From 9332797500d5a159af6e7968183eb4bddfb04300 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Fri, 24 May 2024 12:45:31 +0100 Subject: [PATCH 2/2] Merge pull request #72574 from GuardianDll/strip_ferals_from_guns Strip ferals from guns --- .../feral_weapon_attacks.json | 119 +++++++++----- data/json/monsterdrops/feral_humans.json | 64 ++++---- data/json/monstergroups/misc.json | 2 - data/json/monstergroups/zombies.json | 18 +-- data/json/monsters/feral_humans.json | 145 +++--------------- .../monstergroups/mythos.json | 1 - 6 files changed, 141 insertions(+), 208 deletions(-) diff --git a/data/json/monster_special_attacks/feral_weapon_attacks.json b/data/json/monster_special_attacks/feral_weapon_attacks.json index f2fb367a35a00..626f23a3e35b6 100644 --- a/data/json/monster_special_attacks/feral_weapon_attacks.json +++ b/data/json/monster_special_attacks/feral_weapon_attacks.json @@ -7,7 +7,8 @@ "move_cost": 80, "accuracy": 3, "//": "Feral melee skill + weapon's to hit, so 3+0=3", - "damage_max_instance": [ { "damage_type": "bash", "amount": 10 } ], + "//2": "all melee damage is decreased by 10% with assumption it is at least `|/` broken", + "damage_max_instance": [ { "damage_type": "bash", "amount": 9 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a pipe!", "hit_dmg_npc": "%1$s hits 's %2$s with a pipe!", @@ -24,7 +25,7 @@ "move_cost": 97, "accuracy": 3, "//": "Feral melee skill + weapon's to hit, so 3+0=3", - "damage_max_instance": [ { "damage_type": "bash", "amount": 19 }, { "damage_type": "cut", "amount": 1 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 17 }, { "damage_type": "cut", "amount": 1 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a crowbar!", "hit_dmg_npc": "%1$s hits 's %2$s with a crowbar!", @@ -41,7 +42,7 @@ "move_cost": 108, "accuracy": 9, "//": "Feral melee skill + weapon's to hit, so 6+3=9", - "damage_max_instance": [ { "damage_type": "bash", "amount": 14 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 13 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a baton!", "hit_dmg_npc": "%1$s hits 's %2$s with a baton!", @@ -58,7 +59,7 @@ "move_cost": 130, "accuracy": 2, "//": "Feral melee skill + weapon's to hit, so 3-1=2", - "damage_max_instance": [ { "damage_type": "bash", "amount": 14 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 13 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a stick!", "hit_dmg_npc": "%1$s hits 's %2$s with a stick!", @@ -75,7 +76,7 @@ "move_cost": 134, "accuracy": 3, "//": "Feral melee skill + weapon's to hit, so 3+0=3", - "damage_max_instance": [ { "damage_type": "bash", "amount": 14 }, { "damage_type": "cut", "amount": 28 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 13 }, { "damage_type": "cut", "amount": 25 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with an axe!", "hit_dmg_npc": "%1$s hits 's %2$s with an axe!", @@ -92,7 +93,7 @@ "move_cost": 160, "accuracy": 2, "//": "Feral melee skill + weapon's to hit, so 3-1=2", - "damage_max_instance": [ { "damage_type": "bash", "amount": 13 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a shotgun!", "hit_dmg_npc": "%1$s hits 's %2$s with a shotgun!", @@ -126,7 +127,7 @@ "move_cost": 72, "accuracy": 2, "//": "Feral melee skill + weapon's to hit, so 3-1=2", - "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 16 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 14 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a knife!", "hit_dmg_npc": "%1$s hits 's %2$s with a knife!", @@ -160,7 +161,7 @@ "move_cost": 107, "accuracy": 6, "//": "Feral melee skill + weapon's to hit, so 4+2=6", - "damage_max_instance": [ { "damage_type": "bash", "amount": 3 }, { "damage_type": "stab", "amount": 29 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 3 }, { "damage_type": "stab", "amount": 26 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a rapier!", "hit_dmg_npc": "%1$s hits 's %2$s with a rapier!", @@ -177,7 +178,7 @@ "move_cost": 95, "accuracy": 6, "//": "Feral melee skill + weapon's to hit, so 4+2=6", - "damage_max_instance": [ { "damage_type": "bash", "amount": 9 }, { "damage_type": "stab", "amount": 3 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 8 }, { "damage_type": "stab", "amount": 3 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a rapier!", "hit_dmg_npc": "%1$s hits 's %2$s with a rapier!", @@ -186,23 +187,6 @@ "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.", "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." }, - { - "type": "monster_attack", - "attack_type": "melee", - "id": "feral_weapon_crossbow_melee", - "cooldown": 1, - "move_cost": 165, - "accuracy": 1, - "//": "Feral melee skill + weapon's to hit, so 2-1=1", - "damage_max_instance": [ { "damage_type": "bash", "amount": 13 } ], - "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, - "hit_dmg_u": "%1$s hits your %2$s with a crossbow!", - "hit_dmg_npc": "%1$s hits 's %2$s with a crossbow!", - "miss_msg_u": "%1$s tries to hit you, but you dodge!", - "miss_msg_npc": "%1$s tries to hit , but they dodge!", - "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.", - "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." - }, { "type": "monster_attack", "attack_type": "melee", @@ -211,7 +195,7 @@ "move_cost": 139, "accuracy": 4, "//": "Feral melee skill + weapon's to hit, so 3+1=4", - "damage_max_instance": [ { "damage_type": "bash", "amount": 19 }, { "damage_type": "cut", "amount": 3 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 17 }, { "damage_type": "cut", "amount": 3 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a battle axe!", "hit_dmg_npc": "%1$s hits 's %2$s with a battle axe!", @@ -228,7 +212,7 @@ "move_cost": 97, "accuracy": 4, "//": "Feral melee skill + weapon's to hit, so 3+1=4", - "damage_max_instance": [ { "damage_type": "bash", "amount": 15 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 14 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a mace!", "hit_dmg_npc": "%1$s hits 's %2$s with a mace!", @@ -245,7 +229,7 @@ "move_cost": 100, "accuracy": 4, "//": "Feral melee skill + weapon's to hit, so 4+0=4", - "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 11 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a wrench!", "hit_dmg_npc": "%1$s hits 's %2$s with a wrench!", @@ -262,7 +246,7 @@ "move_cost": 98, "accuracy": 2, "//": "Feral melee skill + weapon's to hit, so 4-2=2", - "damage_max_instance": [ { "damage_type": "bash", "amount": 11 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 10 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a lug wrench!", "hit_dmg_npc": "%1$s hits 's %2$s with a lug wrench!", @@ -296,7 +280,7 @@ "move_cost": 96, "accuracy": 4, "//": "Feral melee skill + weapon's to hit, so 4+0=4", - "damage_max_instance": [ { "damage_type": "bash", "amount": 10 }, { "damage_type": "cut", "amount": 20 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 9 }, { "damage_type": "cut", "amount": 18 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with an axe!", "hit_dmg_npc": "%1$s hits 's %2$s with an axe!", @@ -313,7 +297,24 @@ "move_cost": 82, "accuracy": 5, "//": "Feral melee skill + weapon's to hit, so 6-1=5", - "damage_max_instance": [ { "damage_type": "stab", "amount": 22 } ], + "damage_max_instance": [ { "damage_type": "stab", "amount": 20 } ], + "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, + "hit_dmg_u": "%1$s hits your %2$s with a knife!", + "hit_dmg_npc": "%1$s hits 's %2$s with a knife!", + "miss_msg_u": "%1$s tries to hit you, but you dodge!", + "miss_msg_npc": "%1$s tries to hit , but they dodge!", + "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.", + "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." + }, + { + "type": "monster_attack", + "attack_type": "melee", + "id": "feral_weapon_knife_combat_low_skill", + "cooldown": 1, + "move_cost": 82, + "accuracy": 2, + "//": "Feral melee skill + weapon's to hit, so 3-1=2", + "damage_max_instance": [ { "damage_type": "stab", "amount": 20 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a knife!", "hit_dmg_npc": "%1$s hits 's %2$s with a knife!", @@ -331,7 +332,7 @@ "accuracy": 2, "range": 2, "//": "Feral melee skill + weapon's to hit, so 3-1=2", - "damage_max_instance": [ { "damage_type": "bash", "amount": 4 }, { "damage_type": "stab", "amount": 26 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 4 }, { "damage_type": "stab", "amount": 23 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s thrusts a spear at your %2$s, slashing it!", "hit_dmg_npc": "%1$s thrusts a spear at 's %2$s, slashing it!", @@ -348,7 +349,7 @@ "move_cost": 79, "accuracy": 2, "//": "Feral melee skill + weapon's to hit, so 3-1=2", - "damage_max_instance": [ { "damage_type": "bash", "amount": 9 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a hammer!", "hit_dmg_npc": "%1$s hits 's %2$s with a hammer!", @@ -365,7 +366,7 @@ "move_cost": 154, "accuracy": 6, "//": "Feral melee skill + weapon's to hit, so 3+3=6", - "damage_max_instance": [ { "damage_type": "bash", "amount": 14 }, { "damage_type": "cut", "amount": 3 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 13 }, { "damage_type": "cut", "amount": 3 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a shovel!", "hit_dmg_npc": "%1$s hits 's %2$s with a shovel!", @@ -382,7 +383,7 @@ "move_cost": 106, "accuracy": 5, "//": "Feral melee skill + weapon's to hit, so 6-1=5", - "damage_max_instance": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "cut", "amount": 16 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "cut", "amount": 14 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a machete!", "hit_dmg_npc": "%1$s hits 's %2$s with a machete!", @@ -399,7 +400,7 @@ "move_cost": 65, "accuracy": 1, "//": "Feral melee skill + weapon's to hit, so 4-3=1", - "damage_max_instance": [ { "damage_type": "cut", "amount": 7 } ], + "damage_max_instance": [ { "damage_type": "cut", "amount": 6 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a scalpel!", "hit_dmg_npc": "%1$s hits 's %2$s with a scalpel!", @@ -416,7 +417,7 @@ "move_cost": 90, "accuracy": 4, "//": "Feral melee skill + weapon's to hit, so 6-2=4", - "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 7 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a gun!", "hit_dmg_npc": "%1$s hits 's %2$s with a gun!", @@ -433,7 +434,7 @@ "move_cost": 79, "accuracy": 6, "//": "Feral melee skill + weapon's to hit, so 6+0=6", - "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 7 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a flashlight!", "hit_dmg_npc": "%1$s hits 's %2$s with a flashlight!", @@ -450,7 +451,7 @@ "move_cost": 84, "accuracy": 2, "//": "Feral melee skill + weapon's to hit, so 4-2=2", - "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 7 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "hit_dmg_u": "%1$s hits your %2$s with a gun!", "hit_dmg_npc": "%1$s hits 's %2$s with a gun!", @@ -467,7 +468,7 @@ "move_cost": 179, "accuracy": 5, "//1": "Feral melee skill + weapon's to hit, so 6-1=5", - "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 11 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "//2": "Stats based on AR-15/M4 Carbine (they are identical in melee), since that's what mad militia drops. Move cost was tested on a 10 in all stats character ingame, since HHG doesn't account for the default attachments", "hit_dmg_u": "%1$s hits your %2$s with a rifle!", @@ -485,7 +486,7 @@ "move_cost": 196, "accuracy": 3, "//1": "Feral melee skill + weapon's to hit, so 4-1=3", - "damage_max_instance": [ { "damage_type": "bash", "amount": 12 }, { "damage_type": "stab", "amount": 22 } ], + "damage_max_instance": [ { "damage_type": "bash", "amount": 11 }, { "damage_type": "stab", "amount": 20 } ], "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, "//2": "Stats based on M4 Carbine with an attached combat knife, since that's the most common gun feral marines drop. Move cost was tested on a 10 in all stats character ingame, since HHG doesn't account for the default attachments", "hit_dmg_u": "%1$s lunges their bayonet at your %2$s, stabbing it!", @@ -494,5 +495,39 @@ "no_dmg_msg_npc": "%1$s thrusts their bayonet at 's %2$s, but glances off armor!", "miss_msg_u": "%s thrusts their bayonet at you, but you evade!", "miss_msg_npc": "%s thrusts their bayonet at , but they evade!" + }, + { + "type": "monster_attack", + "attack_type": "melee", + "id": "feral_weapon_baton-extended", + "cooldown": 1, + "move_cost": 79, + "accuracy": 8, + "//": "Feral melee skill + weapon's to hit, so 6+2=8", + "damage_max_instance": [ { "damage_type": "bash", "amount": 9 } ], + "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, + "hit_dmg_u": "%1$s hits your %2$s with a baton!", + "hit_dmg_npc": "%1$s hits 's %2$s with a baton!", + "miss_msg_u": "%1$s tries to hit you, but you dodge!", + "miss_msg_npc": "%1$s tries to hit , but they dodge!", + "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.", + "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." + }, + { + "type": "monster_attack", + "attack_type": "melee", + "id": "feral_weapon_mace_pipe", + "cooldown": 1, + "move_cost": 103, + "accuracy": 3, + "//": "Feral melee skill + weapon's to hit, so 3+0=3", + "damage_max_instance": [ { "damage_type": "bash", "amount": 18 } ], + "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, + "hit_dmg_u": "%1$s hits your %2$s with a pipe!", + "hit_dmg_npc": "%1$s hits 's %2$s with a pipe!", + "miss_msg_u": "%1$s tries to hit you, but you dodge!", + "miss_msg_npc": "%1$s tries to hit , but they dodge!", + "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.", + "no_dmg_msg_npc": "%1$s hits 's %2$s without penetrating their armor." } ] diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json index eabcb8d8a2b31..8e65bc04e91e6 100644 --- a/data/json/monsterdrops/feral_humans.json +++ b/data/json/monsterdrops/feral_humans.json @@ -133,7 +133,8 @@ "magazine": 100, "ammo": 20, "entries": [ - { "item": "m9", "prob": 100, "damage": [ 2, 4 ] }, + { "item": "m9", "prob": 100, "charges-max": 0, "damage": [ 2, 4 ] }, + { "item": "baton-extended", "prob": 100, "damage": [ 2, 4 ] }, { "group": "security_armor", "prob": 30, "damage": [ 0, 2 ] }, { "group": "security_gear", "prob": 50, "damage": [ 0, 2 ] }, { "group": "cop_gloves", "prob": 30, "damage": [ 1, 4 ] }, @@ -144,8 +145,7 @@ { "group": "clothing_glasses", "prob": 5 }, { "group": "clothing_watch", "prob": 5 }, { "group": "wallets", "damage": [ 1, 4 ] }, - { "item": "m9mag", "prob": 50, "ammo-item": "9mm", "charges": [ 0, 10 ] }, - { "item": "m9mag", "prob": 50, "ammo-item": "9mm", "charges": [ 0, 15 ] } + { "item": "m9mag", "prob": 100, "charges-max": 0, "count": [ 0, 2 ] } ] }, { @@ -210,12 +210,6 @@ "id": "feral_fancy_death_drops_rapier_fake", "entries": [ { "item": "rapier_fake", "prob": 100, "damage": [ 0, 2 ] }, { "group": "default_fancy_clothes", "prob": 100 } ] }, - { - "type": "item_group", - "subtype": "collection", - "id": "feral_fancy_death_drops_crossbow", - "entries": [ { "item": "rep_crossbow", "prob": 100, "damage": [ 1, 3 ] }, { "group": "default_fancy_clothes", "prob": 100 } ] - }, { "type": "item_group", "subtype": "collection", @@ -563,10 +557,10 @@ "magazine": 100, "ammo": 20, "entries": [ - { "group": "feral_handgun", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "feral_handgun", "prob": 30, "charges-max": 0, "damage": [ 1, 4 ] }, { "group": "clothing_outdoor_set", "damage": [ 1, 4 ] }, { "group": "bags", "damage": [ 1, 4 ], "prob": 100 }, - { "group": "fired_mags_9mm", "prob": 80 }, + { "group": "fired_mags_9mm", "charges-max": 0, "prob": 80 }, { "group": "book_survival", "prob": 40 }, { "group": "survivor_knife", "damage": [ 1, 4 ] }, { "group": "gear_survival", "prob": 55, "damage": [ 1, 4 ] }, @@ -576,6 +570,21 @@ { "group": "used_survival_kit", "prob": 70, "damage": [ 1, 4 ] } ] }, + { + "id": "mon_feral_prepper_mace_death_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ { "item": "mace_pipe", "prob": 100, "damage": [ 2, 4 ] }, { "group": "mon_feral_prepper_death_drops", "prob": 100 } ] + }, + { + "id": "mon_feral_prepper_knife_death_drops", + "type": "item_group", + "subtype": "collection", + "entries": [ + { "item": "knife_combat", "prob": 100, "damage": [ 2, 4 ] }, + { "group": "mon_feral_prepper_death_drops", "prob": 100 } + ] + }, { "id": "mon_feral_survivalist_death_drops", "type": "item_group", @@ -617,7 +626,7 @@ { "item": "knife_KABAR", "prob": 40, "container-item": "sheath" }, { "item": "kevlar", "prob": 50, "damage": [ 2, 4 ] }, { "item": "wearable_light", "prob": 100, "charges": [ 0, 100 ], "damage": [ 1, 4 ] }, - { "group": "feral_autogun", "prob": 100, "damage": [ 1, 4 ] }, + { "group": "feral_autogun", "charges-max": 0, "prob": 100, "damage": [ 1, 4 ] }, { "group": "survivor_grenades", "prob": 20 }, { "group": "bags", "damage": [ 1, 4 ], "prob": 100 }, { "group": "book_survival", "prob": 70 }, @@ -627,9 +636,9 @@ { "group": "mil_food_nodrugs", "prob": 40 }, { "group": "shelter", "prob": 30 }, { "group": "used_survival_kit", "prob": 80, "damage": [ 1, 4 ] }, - { "item": "stanag30", "prob": 25, "ammo-item": "223", "charges": [ 0, 10 ] }, - { "item": "stanag30ranger", "prob": 33, "ammo-item": "556", "charges": [ 0, 30 ] }, - { "item": "stanag30", "prob": 50, "ammo-item": "556", "charges": [ 0, 30 ] }, + { "item": "stanag30", "prob": 25, "charges-max": 0 }, + { "item": "stanag30ranger", "prob": 33, "charges-max": 0 }, + { "item": "stanag30", "prob": 50, "charges-max": 0 }, { "item": "dog_tag", "prob": 20 } ] }, @@ -662,11 +671,11 @@ "id": "feral_jackboot_shotgun", "subtype": "distribution", "entries": [ - { "item": "mossberg_500", "prob": 33, "charges": [ 0, 6 ] }, - { "item": "mossberg_590", "prob": 3, "charges": [ 0, 9 ] }, - { "item": "remington_870", "prob": 35, "charges": [ 0, 5 ] }, - { "item": "remington_870_express", "prob": 18, "charges": [ 0, 6 ] }, - { "item": "mossberg_930", "prob": 15, "charges": [ 0, 6 ] } + { "item": "mossberg_500", "prob": 33, "charges": 0 }, + { "item": "mossberg_590", "prob": 3, "charges": 0 }, + { "item": "remington_870", "prob": 35, "charges": 0 }, + { "item": "remington_870_express", "prob": 18, "charges": 0 }, + { "item": "mossberg_930", "prob": 15, "charges": 0 } ] }, { @@ -687,9 +696,9 @@ { "item": "mask_gas", "prob": 5, "charges": [ 0, 100 ], "damage": [ 1, 4 ] }, { "item": "two_way_radio", "prob": 15, "charges": [ 0, 100 ], "damage": [ 1, 4 ] }, { "group": "infantry_knives", "prob": 100, "damage": [ 2, 4 ] }, - { "item": "stanag30", "prob": 50, "ammo-item": "556", "charges": [ 0, 10 ] }, - { "item": "stanag30ranger", "prob": 1, "ammo-item": "556", "charges": [ 0, 30 ] }, - { "item": "stanag30", "prob": 50, "ammo-item": "556", "charges": [ 0, 30 ] }, + { "item": "stanag30", "prob": 50, "charges-max": 0 }, + { "item": "stanag30ranger", "prob": 1, "charges-max": 0 }, + { "item": "stanag30", "prob": 50, "charges-max": 0 }, { "item": "dog_tag", "prob": 40 } ] }, @@ -801,6 +810,7 @@ "group": "military_standard_assault_rifles", "contents-item": "knife_combat_marine", "prob": 100, + "charges-max": 0, "damage": [ 0, 4 ], "dirt": [ 0, 6000 ] }, @@ -840,9 +850,9 @@ { "item": "wristwatch", "damage": [ 0, 4 ], "prob": 33 }, { "group": "pocket_cigar", "prob": 5 }, { "group": "misc_smoking_legal", "prob": 10 }, - { "item": "m18", "prob": 100, "damage": [ 0, 4 ] }, - { "item": "p320mag_17rd_9x19mm", "prob": 50, "ammo-item": "9mm", "charges": [ 0, 14 ] }, - { "item": "p320mag_17rd_9x19mm", "prob": 50, "ammo-item": "9mm", "charges": [ 0, 17 ] }, + { "item": "m18", "prob": 100, "damage": [ 0, 4 ], "charges-max": 0 }, + { "item": "p320mag_17rd_9x19mm", "prob": 50, "charges-max": 0 }, + { "item": "p320mag_17rd_9x19mm", "prob": 50, "charges-max": 0 }, { "item": "dog_tag", "prob": 20 } ] }, @@ -890,7 +900,7 @@ { "group": "clothing_glasses", "prob": 5 }, { "group": "clothing_watch", "prob": 5 }, { "group": "cop_pants_stuff" }, - { "group": "cop_armaments" }, + { "group": "cop_armaments", "charges-max": 0 }, { "collection": [ { "item": "badge_deputy", "prob": 100 }, { "item": "badge_detective", "prob": 20 } ], "prob": 10 diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index 0e3537b42960e..e1f8a1497b646 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -74,8 +74,6 @@ { "monster": "mon_feral_fancy_rapier", "weight": 40, "cost_multiplier": 4, "pack_size": [ 1, 2 ] }, { "monster": "mon_feral_fancy_rapier_fake", "weight": 80, "cost_multiplier": 2 }, { "monster": "mon_feral_fancy_rapier_fake", "weight": 50, "cost_multiplier": 2, "pack_size": [ 1, 2 ] }, - { "monster": "mon_feral_fancy_crossbow", "weight": 60, "cost_multiplier": 5 }, - { "monster": "mon_feral_fancy_crossbow", "weight": 40, "cost_multiplier": 10, "pack_size": [ 1, 2 ] }, { "group": "GROUP_MANSION_ARMORED", "weight": 20, "cost_multiplier": 15 } ] }, diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json index 1886067195f6f..33dc7687832ea 100644 --- a/data/json/monstergroups/zombies.json +++ b/data/json/monstergroups/zombies.json @@ -299,7 +299,8 @@ { "monster": "mon_dog_zombie_rot", "weight": 10, "cost_multiplier": 2 }, { "monster": "mon_zombie_swimmer_base", "weight": 20, "cost_multiplier": 2 }, { "monster": "mon_zombie_static", "weight": 30, "cost_multiplier": 5 }, - { "monster": "mon_feral_prepper", "weight": 1, "cost_multiplier": 2, "starts": "10 days" }, + { "monster": "mon_feral_prepper_knife", "weight": 1, "cost_multiplier": 2, "starts": "10 days" }, + { "monster": "mon_feral_prepper_mace", "weight": 1, "cost_multiplier": 2, "starts": "10 days" }, { "monster": "mon_feral_survivalist", "weight": 1, "cost_multiplier": 2, "starts": "29 days" }, { "monster": "mon_zombie_paramilitary", "weight": 1, "cost_multiplier": 25 }, { "monster": "mon_zombie_survivor", "weight": 1, "cost_multiplier": 25, "starts": "30 days" }, @@ -316,7 +317,8 @@ { "monster": "mon_civilian_stationary", "weight": 5, "cost_multiplier": 0, "ends": "3 days" }, { "monster": "mon_civilian_zombiefighter", "weight": 40, "cost_multiplier": 0, "ends": "3 days" }, { "monster": "mon_civilian_panic", "weight": 20, "cost_multiplier": 0, "ends": "5 days" }, - { "monster": "mon_feral_prepper", "weight": 180, "cost_multiplier": 5 }, + { "monster": "mon_feral_prepper_knife", "weight": 180, "cost_multiplier": 5 }, + { "monster": "mon_feral_prepper_mace", "weight": 180, "cost_multiplier": 5 }, { "monster": "mon_feral_survivalist", "weight": 180, "cost_multiplier": 10 }, { "monster": "mon_feral_militia", "weight": 150, "cost_multiplier": 10, "starts": "540 hours" }, { @@ -555,7 +557,6 @@ { "monster": "mon_feral_maid_knife", "weight": 10 }, { "monster": "mon_feral_fancy_rapier", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_feral_fancy_rapier_fake", "weight": 10 }, - { "monster": "mon_feral_fancy_crossbow", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_feral_armored_mace", "weight": 1, "cost_multiplier": 10 }, { "monster": "mon_feral_armored_battleaxe", "weight": 1, "cost_multiplier": 10 } ] @@ -570,7 +571,6 @@ { "monster": "mon_feral_maid_knife", "weight": 100 }, { "monster": "mon_feral_fancy_rapier", "weight": 50, "cost_multiplier": 5 }, { "monster": "mon_feral_fancy_rapier_fake", "weight": 100 }, - { "monster": "mon_feral_fancy_crossbow", "weight": 50, "cost_multiplier": 5 }, { "monster": "mon_feral_armored_mace", "weight": 3, "cost_multiplier": 10 }, { "monster": "mon_feral_armored_battleaxe", "weight": 3, "cost_multiplier": 10 } ] @@ -586,7 +586,6 @@ { "monster": "mon_feral_maid_knife", "weight": 20 }, { "monster": "mon_feral_fancy_rapier", "weight": 140, "cost_multiplier": 5 }, { "monster": "mon_feral_fancy_rapier_fake", "weight": 120, "cost_multiplier": 3 }, - { "monster": "mon_feral_fancy_crossbow", "weight": 100, "cost_multiplier": 5 }, { "monster": "mon_dog_rottweiler", "weight": 100, "cost_multiplier": 2 }, { "monster": "mon_dog_gpyrenees", "weight": 100, "cost_multiplier": 2 }, { "monster": "mon_zombie_dog", "weight": 20 } @@ -600,8 +599,7 @@ { "monster": "mon_feral_maid_candlestick", "weight": 100 }, { "monster": "mon_feral_maid_broom", "weight": 85 }, { "monster": "mon_feral_fancy_rapier", "weight": 10, "cost_multiplier": 2 }, - { "monster": "mon_feral_fancy_rapier_fake", "weight": 20, "cost_multiplier": 2 }, - { "monster": "mon_feral_fancy_crossbow", "weight": 5, "cost_multiplier": 3 } + { "monster": "mon_feral_fancy_rapier_fake", "weight": 20, "cost_multiplier": 2 } ] }, { @@ -631,8 +629,7 @@ { "monster": "mon_feral_maid_candlestick", "weight": 10 }, { "monster": "mon_feral_maid_knife", "weight": 10 }, { "monster": "mon_feral_fancy_rapier", "weight": 5, "cost_multiplier": 5 }, - { "monster": "mon_feral_fancy_rapier_fake", "weight": 10 }, - { "monster": "mon_feral_fancy_crossbow", "weight": 5, "cost_multiplier": 5 } + { "monster": "mon_feral_fancy_rapier_fake", "weight": 10 } ] }, { @@ -756,7 +753,8 @@ "name": "FERAL_HUMANS", "type": "monstergroup", "monsters": [ - { "monster": "mon_feral_prepper", "weight": 14, "cost_multiplier": 2, "starts": "29 days" }, + { "monster": "mon_feral_prepper_knife", "weight": 14, "cost_multiplier": 2, "starts": "29 days" }, + { "monster": "mon_feral_prepper_mace", "weight": 14, "cost_multiplier": 2, "starts": "29 days" }, { "monster": "mon_feral_survivalist", "weight": 14, "cost_multiplier": 2, "starts": "29 days" }, { "monster": "mon_feral_militia", "weight": 14, "cost_multiplier": 2, "starts": "60 days" }, { "monster": "mon_feral_human_pipe", "weight": 840 }, diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json index 7b91df3598956..ad60e933ff58e 100644 --- a/data/json/monsters/feral_humans.json +++ b/data/json/monsters/feral_humans.json @@ -241,31 +241,14 @@ "id": "mon_feral_labsecurity_9mm", "type": "MONSTER", "name": { "str": "feral security guard" }, - "description": "This security guard still breathes, but has been lost to some terrible madness. They move among the undead, handgun at the ready and saucer pupils scanning for threats in a mockery of their former duty.", + "description": "This security guard still breathes, but has been lost to some terrible madness. They move among the undead, with a baton in their arms and saucer pupils scanning for threats in a mockery of their former duty.", "copy-from": "mon_feral_human_pipe", "default_faction": "science", "melee_skill": 6, "vision_day": 50, "vision_night": 4, "diff": 5, - "starting_ammo": { "9mm": 5 }, - "special_attacks": [ - { - "type": "gun", - "cooldown": 10, - "move_cost": 150, - "gun_type": "feral_m9", - "ammo_type": "9mm", - "fake_skills": [ [ "gun", 1 ], [ "pistol", 2 ] ], - "fake_dex": 8, - "fake_per": 10, - "ranges": [ [ 2, 14, "DEFAULT" ] ], - "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, - "require_targeting_player": false, - "description": "The feral security guard fires their Beretta M9A1!" - }, - { "id": "feral_weapon_feral_m9" } - ], + "special_attacks": [ { "id": "feral_weapon_baton-extended" } ], "death_drops": "feral_security_death_drops_9mm", "zombify_into": "mon_zombie_labsecurity", "extend": { "flags": [ "CLIMBS" ], "weakpoint_sets": [ "wps_humanoid_body_armor" ], "families": [ "prof_wp_syn_armored" ] }, @@ -328,32 +311,6 @@ "special_attacks": [ { "id": "feral_weapon_rapier_fake" } ], "death_drops": "feral_fancy_death_drops_rapier_fake" }, - { - "id": "mon_feral_fancy_crossbow", - "type": "MONSTER", - "copy-from": "mon_feral_maid_broom", - "name": { "str": "well dressed feral" }, - "description": "Wearing fancy clothes and with a crossbow in hand, this maniac was once a socialite. Their hands caress the crossbow as if touching a loved one.", - "starting_ammo": { "bolt_cf": 6 }, - "special_attacks": [ - { - "type": "gun", - "cooldown": 15, - "move_cost": 200, - "gun_type": "rep_crossbow", - "ammo_type": "bolt_cf", - "fake_skills": [ [ "gun", 1 ], [ "smg", 1 ] ], - "fake_dex": 6, - "fake_per": 6, - "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, - "require_targeting_player": false, - "ranges": [ [ 2, 7, "DEFAULT" ] ], - "description": "The feral human shoots its crossbow!" - }, - { "id": "feral_weapon_crossbow_melee" } - ], - "death_drops": "feral_fancy_death_drops_crossbow" - }, { "id": "mon_feral_armored_mace", "type": "MONSTER", @@ -380,38 +337,29 @@ "death_drops": "feral_armored_death_drops_battleaxe" }, { - "id": "mon_feral_prepper", + "id": "mon_feral_prepper_mace", "type": "MONSTER", "name": { "str": "feral prepper" }, - "description": "A quick glance at this person would suggest that they have prepared well enough for the apocalypse. Unfortunately, their bloodshot eyes, and the excluding treatment by the undead, shows that they have turned feral. One of their hands clasps the handle of a makeshift weapon, while the other grips a handgun.", + "description": "A quick glance at this person would suggest that they have prepared well enough for the apocalypse, with their armor equipped and some makeshift mace in their hands. Unfortunately, their bloodshot eyes, and the excluding treatment by the undead, shows that they have turned feral.", "copy-from": "mon_feral_human_pipe", "aggression": 75, "dodge": 3, "vision_day": 50, - "starting_ammo": { "9mm": 3 }, - "special_attacks": [ - { - "type": "gun", - "cooldown": 10, - "move_cost": 50, - "//": "(movecost is 50 to show that the feral prepper doesn't take time to aim, and just shoots barbaric-ly)", - "gun_type": "feral_m9", - "ammo_type": "9mm", - "fake_skills": [ [ "gun", 0 ], [ "pistol", 0 ] ], - "fake_dex": 8, - "fake_per": 9, - "ranges": [ [ 2, 14, "DEFAULT" ], [ 10, 35, "DEFAULT" ] ], - "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, - "require_targeting_player": false, - "description": "The feral prepper haphazardly fires their firearm!" - }, - { "id": "feral_weapon_feral_m9" } - ], - "death_drops": "mon_feral_prepper_death_drops", + "special_attacks": [ { "id": "feral_weapon_mace_pipe" } ], + "death_drops": "mon_feral_prepper_mace_death_drops", "zombify_into": "mon_zombie_survivor", "extend": { "flags": [ "CLIMBS" ], "weakpoint_sets": [ "wps_humanoid_light_armor" ], "families": [ "prof_wp_syn_armored" ] }, "armor": { "bash": 4, "cut": 4, "acid": 4, "bullet": 4 } }, + { + "id": "mon_feral_prepper_knife", + "type": "MONSTER", + "copy-from": "mon_feral_prepper_mace", + "name": { "str": "feral prepper" }, + "description": "A quick glance at this person would suggest that they have prepared well enough for the apocalypse, with their armor equipped and some military-grade knife in their hands. Unfortunately, their bloodshot eyes, and the excluding treatment by the undead, shows that they have turned feral.", + "special_attacks": [ { "id": "feral_weapon_knife_combat_low_skill" } ], + "death_drops": "mon_feral_prepper_knife_death_drops" + }, { "id": "mon_feral_survivalist", "type": "MONSTER", @@ -453,25 +401,7 @@ "dodge": 3, "vision_day": 50, "luminance": 500, - "starting_ammo": { "223": 10 }, - "special_attacks": [ - { - "type": "gun", - "cooldown": 5, - "move_cost": 150, - "gun_type": "feral_militia_gun", - "ammo_type": "223", - "fake_skills": [ [ "gun", 2 ], [ "rifle", 2 ] ], - "fake_dex": 8, - "fake_per": 10, - "ranges": [ [ 2, 35, "DEFAULT" ] ], - "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, - "require_targeting_player": false, - "target_moving_vehicles": true, - "description": "The mad militiaman fires their rifle!" - }, - { "id": "feral_weapon_feral_militia_gun" } - ], + "special_attacks": [ { "id": "feral_weapon_feral_militia_gun" } ], "death_drops": "mon_feral_militia_death_drops", "zombify_into": "mon_zombie_milbase_personnel", "delete": { "anger_triggers": [ "HURT" ] }, @@ -504,31 +434,12 @@ "id": "mon_feral_jackboot", "type": "MONSTER", "name": { "str": "feral biker" }, - "description": "A rough-looking feral human, clad in black leather and wielding a pump-action shotgun. It seems body-armor wasn't one of their priorities however.", + "description": "A rough-looking feral human, clad in black leather and wielding a pump-action shotgun, that seems to be empty already. It seems body-armor wasn't one of their priorities however.", "copy-from": "mon_feral_human_pipe", "aggression": 75, "melee_skill": 6, "vision_day": 50, - "starting_ammo": { "shot_00": 5 }, - "special_attacks": [ - { - "type": "gun", - "cooldown": 10, - "move_cost": 150, - "gun_type": "feral_jackboot_gun", - "ammo_type": "shot_00", - "fake_skills": [ [ "gun", 2 ], [ "shotgun", 2 ] ], - "fake_dex": 8, - "fake_per": 9, - "//": "(ferals don't care about max-effective range.)", - "ranges": [ [ 2, 25, "DEFAULT" ] ], - "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, - "require_targeting_player": false, - "target_moving_vehicles": true, - "description": "The feral biker fires their shotgun!" - }, - { "id": "feral_weapon_shotgun_melee" } - ], + "special_attacks": [ { "id": "feral_weapon_shotgun_melee" } ], "death_drops": "mon_feral_jackboot_death_drops", "extend": { "flags": [ "CLIMBS" ] } }, @@ -612,25 +523,7 @@ "color": "light_blue", "dodge": 3, "diff": 4, - "starting_ammo": { "9mm": 3 }, - "special_attacks": [ - { - "type": "gun", - "cooldown": 10, - "move_cost": 150, - "gun_type": "m18", - "ammo_type": "9mm", - "fake_skills": [ [ "gun", 1 ], [ "pistol", 2 ] ], - "fake_dex": 8, - "fake_per": 10, - "ranges": [ [ 2, 14, "DEFAULT" ] ], - "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] }, - "require_targeting_player": false, - "target_moving_vehicles": true, - "description": "The feral officer fires their M18!" - }, - { "id": "feral_weapon_m18" } - ], + "special_attacks": [ { "id": "feral_weapon_m18" } ], "death_drops": "mon_feral_officer_death_drops", "zombify_into": "mon_zombie_officer", "extend": { "flags": [ "CLIMBS" ] } diff --git a/data/mods/Mythos-Creatures/monstergroups/mythos.json b/data/mods/Mythos-Creatures/monstergroups/mythos.json index 45841bb5bb79f..10bbee5e3ff23 100644 --- a/data/mods/Mythos-Creatures/monstergroups/mythos.json +++ b/data/mods/Mythos-Creatures/monstergroups/mythos.json @@ -537,7 +537,6 @@ { "monster": "mon_feral_maid_knife", "weight": 10 }, { "monster": "mon_feral_fancy_rapier", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_feral_fancy_rapier_fake", "weight": 10 }, - { "monster": "mon_feral_fancy_crossbow", "weight": 5, "cost_multiplier": 5 }, { "monster": "mon_feral_armored_mace", "weight": 1, "cost_multiplier": 10 }, { "monster": "mon_feral_armored_battleaxe", "weight": 1, "cost_multiplier": 10 }, { "monster": "mon_shoggoth", "weight": 1, "cost_multiplier": 10, "starts": "3 days" },