Martial Arts Improvements, Disarming ++ (#69052)

* Martial Arts Improvements * Conditionals accepted for gun_actor ( special_attacks of type "gun" can now accept conditionals like the rest of special attacks * Update mattack_actors.cpp * Update mattack_actors.cpp * It works! Flag for weapon wielding enemies and c++ * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update monster.cpp * Martial little update --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Nov 3, 2023 · 059181b · 059181b
1 parent 3a14bf1
commit 059181b
Show file tree

Hide file tree

Showing 29 changed files with 298 additions and 126 deletions.
diff --git a/data/json/effects.json b/data/json/effects.json
@@ -376,11 +376,18 @@
     "//": "Exposes certain weakpoints",
     "desc": [ "You feel exposed -and pretty buggy- without your shell." ]
   },
+  {
+    "type": "effect_type",
+    "id": "disarmed",
+    "name": [ "Disarmed" ],
+    "//": "Disables monster weapon attacks",
+    "desc": [ "You have been forced to drop any wielded weapon.  You can wield them again if you manage to survive." ]
+  },
   {
     "type": "effect_type",
     "id": "maimed_arm",
     "name": [ "Broken Arm" ],
-    "//": "Disables base grabs and scratches",
+    "//": "Disables base grabs, scratches and monster weapon attacks",
     "desc": [ "Your arms are broken.  Your imaginary monster arms, so this is probably a bug." ]
   },
   {

diff --git a/data/json/martialarts.json b/data/json/martialarts.json
@@ -800,12 +800,19 @@
         "description": "Like a fool, your opponent has left themselves wide open.\n\n+5% critical hit chance.\nLasts 1 turn.",
         "melee_allowed": true,
         "unarmed_allowed": true,
-        "skill_requirements": [ { "name": "unarmed", "level": 4 } ],
+        "skill_requirements": [ { "name": "melee", "level": 4 } ],
         "buff_duration": 1,
         "flat_bonuses": [ { "stat": "crit_chance", "scale": 5.0 } ]
       }
     ],
-    "techniques": [ "tec_krav_maga_rapid", "tec_krav_maga_crit", "tec_krav_maga_takedown", "tec_krav_maga_disarm", "tec_krav_maga_break" ],
+    "techniques": [
+      "tec_krav_maga_rapid",
+      "tec_krav_maga_disarm_simple",
+      "tec_krav_maga_crit",
+      "tec_krav_maga_takedown",
+      "tec_krav_maga_disarm",
+      "tec_krav_maga_break"
+    ],
     "weapon_category": [ "AUTOMATIC_RIFLES", "AUTOMATIC_PISTOLS", "KNIVES", "BATONS", "SHIVS" ]
   },
   {
@@ -1018,7 +1025,14 @@
         "flat_bonuses": [ { "stat": "speed", "scale": 10.0 } ]
       }
     ],
-    "techniques": [ "tec_ninjutsu_swift", "tec_ninjutsu_swift_crit", "tec_ninjutsu_takedown", "tec_ninjutsu_precise" ],
+    "techniques": [
+      "tec_ninjutsu_swift",
+      "tec_ninjutsu_swift_crit",
+      "tec_ninjutsu_takedown",
+      "tec_ninjutsu_precise",
+      "tec_ninjutsu_staffdown",
+      "tec_ninjutsu_downkill"
+    ],
     "weapon_category": [ "MEDIUM_SWORDS", "LONG_SWORDS", "SHORT_SWORDS", "KNIVES", "QUARTERSTAVES", "CLAWS" ]
   },
   {

diff --git a/data/json/martialarts_fictional.json b/data/json/martialarts_fictional.json
@@ -368,6 +368,7 @@
     "unarmed_allowed": true,
     "weighting": 2,
     "disarms": true,
+    "tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
     "stun_dur": 1,
     "attack_vectors": [ "HAND" ]
   },
@@ -668,6 +669,7 @@
     "skill_requirements": [ { "name": "unarmed", "level": 4 } ],
     "unarmed_allowed": true,
     "disarms": true,
+    "tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
     "attack_vectors": [ "HAND" ]
   }
 ]
diff --git a/data/json/monster_special_attacks/feral_weapon_attacks.json b/data/json/monster_special_attacks/feral_weapon_attacks.json
@@ -8,6 +8,7 @@
     "accuracy": 3,
     "//": "Feral melee skill + weapon's to hit, so 3+0=3",
     "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 pipe!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a pipe!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -24,6 +25,7 @@
     "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 } ],
+    "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 <npcname>'s %2$s with a crowbar!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -40,6 +42,7 @@
     "accuracy": 9,
     "//": "Feral melee skill + weapon's to hit, so 6+3=9",
     "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 baton!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a baton!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -56,6 +59,7 @@
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 3-1=2",
     "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 stick!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a stick!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -72,6 +76,7 @@
     "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 } ],
+    "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 <npcname>'s %2$s with an axe!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -88,6 +93,7 @@
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 3-1=2",
     "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 shotgun!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a shotgun!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -104,6 +110,7 @@
     "accuracy": 3,
     "//": "Feral melee skill + weapon's to hit, so 2+1=3",
     "damage_max_instance": [ { "damage_type": "bash", "amount": 4 } ],
+    "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a broom!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a broom!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -120,6 +127,7 @@
     "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 } ],
+    "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 <npcname>'s %2$s with a knife!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -136,6 +144,7 @@
     "accuracy": 1,
     "//": "Feral melee skill + weapon's to hit, so 2-1=1",
     "damage_max_instance": [ { "damage_type": "bash", "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 candlestick!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a candlestick!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -152,6 +161,7 @@
     "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 } ],
+    "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 <npcname>'s %2$s with a rapier!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -168,6 +178,7 @@
     "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 <npcname>'s %2$s with a crossbow!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -184,6 +195,7 @@
     "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 } ],
+    "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 <npcname>'s %2$s with a battle axe!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -200,6 +212,7 @@
     "accuracy": 4,
     "//": "Feral melee skill + weapon's to hit, so 3+1=4",
     "damage_max_instance": [ { "damage_type": "bash", "amount": 40 } ],
+    "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 <npcname>'s %2$s with a mace!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -216,6 +229,7 @@
     "accuracy": 4,
     "//": "Feral melee skill + weapon's to hit, so 4+0=4",
     "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 wrench!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a wrench!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -232,6 +246,7 @@
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 4-2=2",
     "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 lug wrench!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a lug wrench!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -248,6 +263,7 @@
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 4-2=2",
     "damage_max_instance": [ { "damage_type": "bash", "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 mop!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a mop!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -264,6 +280,7 @@
     "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 } ],
+    "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 <npcname>'s %2$s with an axe!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -280,6 +297,7 @@
     "accuracy": 5,
     "//": "Feral melee skill + weapon's to hit, so 6-1=5",
     "damage_max_instance": [ { "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 knife!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -297,6 +315,7 @@
     "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 } ],
+    "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 <npcname>'s %2$s, slashing it!",
     "no_dmg_msg_u": "%1$s thrusts a spear at your %2$s, but glances off your armor!",
@@ -313,6 +332,7 @@
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 3-1=2",
     "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 hammer!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a hammer!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -329,6 +349,7 @@
     "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 } ],
+    "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 <npcname>'s %2$s with a shovel!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -345,6 +366,7 @@
     "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 } ],
+    "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 <npcname>'s %2$s with a machete!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -361,6 +383,7 @@
     "accuracy": 1,
     "//": "Feral melee skill + weapon's to hit, so 4-3=1",
     "damage_max_instance": [ { "damage_type": "cut", "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 scalpel!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a scalpel!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -377,6 +400,7 @@
     "accuracy": 4,
     "//": "Feral melee skill + weapon's to hit, so 6-2=4",
     "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 gun!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a gun!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -393,6 +417,7 @@
     "accuracy": 6,
     "//": "Feral melee skill + weapon's to hit, so 6+0=6",
     "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 flashlight!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a flashlight!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -409,6 +434,7 @@
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 4-2=2",
     "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 gun!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a gun!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
@@ -425,6 +451,7 @@
     "accuracy": 5,
     "//1": "Feral melee skill + weapon's to hit, so 6-1=5",
     "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ],
+    "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!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a rifle!",
@@ -443,6 +470,7 @@
     "range": 2,
     "//1": "Feral melee skill + weapon's to hit, so 4-1=3",
     "damage_max_instance": [ { "damage_type": "bash", "amount": 12 }, { "damage_type": "stab", "amount": 26 } ],
+    "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!",
     "hit_dmg_npc": "%1$s lunges their bayonet at <npcname>'s %2$s, stabbing it!",

diff --git a/data/json/monster_special_attacks/monster_attacks.json b/data/json/monster_special_attacks/monster_attacks.json
@@ -29,6 +29,7 @@
       "and": [
         { "not": { "u_has_effect": "maimed_acid_gland" } },
         { "not": { "u_has_effect": "maimed_claws" } },
+        { "not": { "u_has_effect": "maimed_arm" } },
         { "u_has_effect": "acid_charged" }
       ]
     },
@@ -116,7 +117,7 @@
     "//": "Drag moves will consume full move costs anyway, don't penalize the attack itself.",
     "move_cost": 0,
     "hitsize_min": 4,
-    "condition": { "not": { "u_has_flag": "GRAB_FILTER" } },
+    "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_arm" } } ] },
     "damage_max_instance": [ { "damage_type": "bash", "amount": 0 } ],
     "grab": true,
     "grab_data": {
@@ -305,6 +306,7 @@
     "move_cost": 200,
     "range": 3,
     "damage_max_instance": [ { "damage_type": "stab", "amount": 10 } ],
+    "condition": { "not": { "u_has_effect": "maimed_arm" } },
     "hit_dmg_u": "%1$s thrusts its arms at you, and its claws pierce your %2$s!",
     "hit_dmg_npc": "%1$s thrusts its arms at <npcname>!",
     "no_dmg_msg_u": "%1$s's arms hit your %2$s, but they glance off your armor.",
@@ -353,6 +355,7 @@
     "hitsize_min": 4,
     "hitsize_max": 4,
     "damage_max_instance": [ { "damage_type": "cut", "amount": 23 } ],
+    "condition": { "not": { "u_has_effect": "maimed_arm" } },
     "hit_dmg_u": "%1$s slashes at your neck, cutting your throat!",
     "hit_dmg_npc": "%1$s slashes at <npcname>!",
     "no_dmg_msg_u": "%1$s slashes at your neck, but glances off your armor.",
@@ -367,6 +370,7 @@
     "move_cost": 400,
     "cooldown": 20,
     "damage_max_instance": [ { "damage_type": "bash", "amount": 30 } ],
+    "condition": { "not": { "u_has_effect": "maimed_arm" } },
     "hitsize_min": 12,
     "throw_strength": 100,
     "hit_dmg_u": "%1$s takes a powerful swing at your %2$s, pulverizing it!",

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
@@ -72,7 +72,7 @@
       "items": [ { "group": "mon_zombie_cop_death_drops", "prob": 100 }, { "item": "glock_22", "prob": 100, "charges": [ 0, 6 ] } ]
     },
     "zombify_into": "mon_zombie_cop",
-    "extend": { "flags": [ "DROPS_AMMO" ] },
+    "extend": { "flags": [ "DROPS_AMMO", "WIELDED_WEAPON" ] },
     "starting_ammo": { "40fmj": 10 },
     "special_attacks": [
       {
@@ -85,6 +85,7 @@
         "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 officer fires their Glock 22!"
       }