Remove the shooting lightning ability from monsters (#74521)

* remove ranged flags and skeletal shocker * restore and update skeletal shocker
CleverRaven · Jun 18, 2024 · 2efe44b · 2efe44b
1 parent 08a9ab4
commit 2efe44b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/data/json/monsters/zed-winged.json b/data/json/monsters/zed-winged.json
@@ -168,10 +168,7 @@
     "melee_damage": [ { "damage_type": "electric", "amount": 8 } ],
     "luminance": 8,
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_electromagnetics" ],
-    "special_attacks": [
-      [ "SHOCKSTORM", 25 ],
-      { "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] }
-    ],
+    "special_attacks": [ { "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] } ],
     "special_when_hit": [ "ZAPBACK", 100 ],
     "upgrades": false,
     "extend": { "flags": [ "ELECTRIC" ] }

diff --git a/data/json/monsters/zed_electric.json b/data/json/monsters/zed_electric.json
@@ -16,10 +16,10 @@
     "vision_night": 3,
     "luminance": 16,
     "harvest": "zombie_humanoid_electric",
-    "special_attacks": [ [ "PARROT", 8 ], [ "SHOCKSTORM", 15 ], { "id": "smash", "throw_strength": 36, "cooldown": 30 } ],
+    "special_attacks": [ [ "PARROT", 8 ], { "id": "smash", "throw_strength": 36, "cooldown": 30 } ],
     "special_when_hit": [ "ZAPBACK", 75 ],
     "upgrades": false,
-    "extend": { "families": [ "prof_electromagnetics" ], "flags": [ "ELECTRIC", "RANGED_ATTACKER" ] }
+    "extend": { "families": [ "prof_electromagnetics" ], "flags": [ "ELECTRIC" ] }
   },
   {
     "id": "mon_zombie_electric",
@@ -37,10 +37,10 @@
     "bleed_rate": 50,
     "luminance": 8,
     "harvest": "zombie_humanoid_electric",
-    "special_attacks": [ [ "PARROT", 8 ], [ "SHOCKSTORM", 25 ] ],
+    "special_attacks": [ [ "PARROT", 8 ] ],
     "special_when_hit": [ "ZAPBACK", 100 ],
     "upgrades": { "half_life": 42, "into_group": "GROUP_ZOMBIE_ELECTRIC_UPGRADE" },
-    "extend": { "families": [ "prof_electromagnetics" ], "flags": [ "ELECTRIC", "RANGED_ATTACKER" ] }
+    "extend": { "families": [ "prof_electromagnetics" ], "flags": [ "ELECTRIC" ] }
   },
   {
     "id": "mon_zombie_nullfield",

diff --git a/data/json/monsters/zed_skeletal.json b/data/json/monsters/zed_skeletal.json
@@ -63,7 +63,7 @@
     "speed": 60,
     "material": [ "bone" ],
     "color": "blue_white",
-    "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
+    "melee_damage": [ { "damage_type": "electric", "amount": 12 }, { "damage_type": "cut", "amount": 3 } ],
     "luminance": 8,
     "bleed_rate": 0,
     "harvest": "mr_bones",
@@ -74,6 +74,7 @@
       [ "PARROT", 8 ],
       [ "SHOCKSTORM", 25 ]
     ],
+    "special_when_hit": [ "ZAPBACK", 100 ],
     "fungalize_into": "mon_skeleton_fungus",
     "armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 30 },
     "extend": {