Remove hack's phantom melee (#64027)

Removes explosive hacks phantom melee attacks by giving the base_drone the PACIFIST flag while making drones with melee attacks remove the flag. Includes the bloodhound drone from aftershock.
CleverRaven · Mar 7, 2023 · 9f7a0c8 · 9f7a0c8
1 parent a15868c
commit 9f7a0c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/data/json/monsters/drones.json b/data/json/monsters/drones.json
@@ -14,7 +14,7 @@
     "morale": 100,
     "luminance": 5,
     "death_function": { "message": "The %s's interior compartment sizzles with destructive energy.", "corpse_type": "BROKEN" },
-    "flags": [ "SEES", "FLIES", "NOHEAD", "ELECTRONIC", "NO_BREATHE", "INTERIOR_AMMO", "STUN_IMMUNE" ]
+    "flags": [ "SEES", "FLIES", "NOHEAD", "ELECTRONIC", "NO_BREATHE", "INTERIOR_AMMO", "STUN_IMMUNE", "PACIFIST" ]
   },
   {
     "id": "mon_EMP_hack",
@@ -109,7 +109,8 @@
     "armor_bullet": 6,
     "revert_to_itype": "bot_manhack",
     "death_function": { "corpse_type": "BROKEN" },
-    "extend": { "flags": [ "HIT_AND_RUN" ] }
+    "extend": { "flags": [ "HIT_AND_RUN" ] },
+    "delete": { "flags": [ "PACIFIST" ] }
   },
   {
     "id": "mon_mininuke_hack",

diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json
@@ -249,7 +249,8 @@
     "revert_to_itype": "bot_bloodhound_drone",
     "death_drops": { "groups": [ [ "robots", 4 ], [ "manhack", 1 ], [ "turret_searchlight", 1 ] ] },
     "death_function": { "corpse_type": "BROKEN" },
-    "extend": { "flags": [ "HIT_AND_RUN", "SMELLS" ] }
+    "extend": { "flags": [ "HIT_AND_RUN", "SMELLS" ] },
+    "delete": { "flags": [ "PACIFIST" ] }
   },
   {
     "id": "mon_utilibot",