Remove unused/already jsonized hardcoded monster attacks (#73004)

* impale * bio_op_impale * bio_op_takedown * headers * tentacle * stretch_bite * stretch_attack * longswipe * smash * reversions * Revert "bio_op_takedown" This reverts commit 712d696. * Revert "bio_op_impale" This reverts commit 3ec2c1f. * Revert "smash" This reverts commit adff798. * Revert "stretch_attack" This reverts commit 92ceb09. * jsonize the chunk * clang tidy my beloved * destroy the tentacles * longswipe cleansing
CleverRaven · Apr 14, 2024 · 4a328a6 · 4a328a6
1 parent 954bacc
commit 4a328a6
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 336 deletions.
diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json
@@ -1546,7 +1546,7 @@
     "speed": 75,
     "bleed_rate": 0,
     "special_attacks": [
-      [ "TENTACLE", 2 ],
+      { "id": "tentacle", "cooldown": 2 },
       {
         "type": "spell",
         "spell_data": { "id": "create_noise", "hit_self": true },

diff --git a/data/mods/Aftershock/mobs/water_mobs.json b/data/mods/Aftershock/mobs/water_mobs.json
@@ -29,7 +29,7 @@
     "special_attacks": [
       [ "PARROT", 0 ],
       { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 19, "armor_multiplier": 0.8 } ] },
-      [ "TENTACLE", 5 ]
+      { "id": "tentacle", "cooldown": 5 }
     ],
     "flags": [
       "SEES",
@@ -78,7 +78,7 @@
     "special_attacks": [
       [ "PARROT", 0 ],
       { "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 16, "armor_multiplier": 0.8 } ] },
-      [ "TENTACLE", 5 ],
+      { "id": "tentacle", "cooldown": 5 },
       { "type": "spell", "spell_data": { "id": "mi-go_slaver_beam", "min_level": 1 }, "cooldown": 400 }
     ],
     "flags": [

diff --git a/data/mods/Aftershock/mobs/zombies.json b/data/mods/Aftershock/mobs/zombies.json
@@ -255,7 +255,7 @@
     "death_drops": "default_moxie_human_death_drops",
     "grab_strength": 20,
     "special_attacks": [
-      [ "LONGSWIPE", 20 ],
+      { "id": "longswipe", "cooldown": 20 },
       { "id": "grab", "cooldown": 20 },
       {
         "id": "scratch",
@@ -451,7 +451,7 @@
     "harvest": "alien_moxphore",
     "grab_strength": 50,
     "special_attacks": [
-      [ "LONGSWIPE", 20 ],
+      { "id": "longswipe", "cooldown": 20 },
       { "id": "grab", "cooldown": 20 },
       {
         "id": "scratch",

diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json
@@ -816,7 +816,7 @@
     "reproduction": { "baby_egg": "egg_therizinosaurus", "baby_count": 3, "baby_timer": 9 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 1 },
-    "special_attacks": [ [ "EAT_CROP", 20 ], [ "BROWSE", 50 ], [ "LONGSWIPE", 20 ] ],
+    "special_attacks": [ [ "EAT_CROP", 20 ], [ "BROWSE", 50 ], { "id": "longswipe", "cooldown": 20 } ],
     "petfood": { "food": [ "DINOFOOD_C" ] },
     "flags": [
       "SEES",
@@ -870,7 +870,7 @@
     "reproduction": { "baby_egg": "egg_nothronychus", "baby_count": 3, "baby_timer": 9 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 1 },
-    "special_attacks": [ [ "EAT_CROP", 30 ], [ "BROWSE", 50 ], [ "LONGSWIPE", 25 ] ],
+    "special_attacks": [ [ "EAT_CROP", 30 ], [ "BROWSE", 50 ], { "id": "longswipe", "cooldown": 25 } ],
     "petfood": { "food": [ "DINOFOOD_C" ] },
     "flags": [
       "SEES",
@@ -923,7 +923,7 @@
     "reproduction": { "baby_egg": "egg_anzu", "baby_count": 3, "baby_timer": 9 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 4 },
-    "special_attacks": [ [ "EAT_CROP", 30 ], [ "BROWSE", 50 ], [ "LONGSWIPE", 25 ] ],
+    "special_attacks": [ [ "EAT_CROP", 30 ], [ "BROWSE", 50 ], { "id": "longswipe", "cooldown": 25 } ],
     "flags": [
       "SEES",
       "SMELLS",

diff --git a/data/mods/DinoMod/monsters/fungus.json b/data/mods/DinoMod/monsters/fungus.json
@@ -387,7 +387,7 @@
     "bleed_rate": 0,
     "vision_day": 5,
     "vision_night": 5,
-    "special_attacks": [ [ "FUNGUS", 200 ], [ "LONGSWIPE", 20 ] ],
+    "special_attacks": [ [ "FUNGUS", 200 ], { "id": "longswipe", "cooldown": 20 } ],
     "upgrades": false,
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "NO_BREATHE", "FILTHY", "WARM", "BASHES", "DESTROYS" ]
   },
@@ -406,7 +406,7 @@
     "bleed_rate": 0,
     "vision_day": 5,
     "vision_night": 5,
-    "special_attacks": [ [ "FUNGUS", 200 ], [ "LONGSWIPE", 30 ] ],
+    "special_attacks": [ [ "FUNGUS", 200 ], { "id": "longswipe", "cooldown": 30 } ],
     "upgrades": false,
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "NO_BREATHE", "FILTHY", "WARM", "BASHES" ]
   },
@@ -425,7 +425,7 @@
     "bleed_rate": 0,
     "vision_day": 5,
     "vision_night": 5,
-    "special_attacks": [ [ "FUNGUS", 200 ], [ "LONGSWIPE", 30 ] ],
+    "special_attacks": [ [ "FUNGUS", 200 ], { "id": "longswipe", "cooldown": 30 } ],
     "upgrades": false,
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "NO_BREATHE", "FILTHY", "WARM", "BASHES" ]
   },

diff --git a/data/mods/DinoMod/monsters/zed-dinosaur.json b/data/mods/DinoMod/monsters/zed-dinosaur.json
@@ -328,7 +328,7 @@
       { "id": "teeth_zino_mid", "cooldown": 5 },
       [ "scratch", 20 ],
       [ "LUNGE", 5 ],
-      [ "LONGSWIPE", 25 ]
+      { "id": "longswipe", "cooldown": 25 }
     ],
     "description": "Massive jaws drooling black liquid, lifted over grasping claws by a huge shuffling dinosaur corpse.",
     "burn_into": "mon_zalbertosaurus_scorched",
@@ -539,7 +539,7 @@
       { "id": "grab" },
       { "id": "scratch_humanoid", "cooldown": 10 },
       { "type": "bite", "cooldown": 10 },
-      [ "LONGSWIPE", 20 ]
+      { "id": "longswipe", "cooldown": 20 }
     ],
     "description": "The shuffling corpse of a huge bipedal dinosaur covered with tattered feathers and black putrid liquid.  Long claws protrude from its hands.",
     "burn_into": "mon_zerizinosaurus_scorched",
@@ -566,7 +566,7 @@
       { "id": "grab" },
       { "id": "scratch_humanoid", "cooldown": 10 },
       { "type": "bite", "cooldown": 10 },
-      [ "LONGSWIPE", 30 ]
+      { "id": "longswipe", "cooldown": 30 }
     ],
     "description": "The shuffling corpse of a large-sized bipedal dinosaur covered with tattered feathers and black putrid liquid.  Sharp curved claws protrude from its hands.",
     "burn_into": "mon_zothronychus_scorched",
@@ -592,7 +592,7 @@
       { "id": "grab" },
       { "id": "scratch_humanoid", "cooldown": 10 },
       { "type": "bite", "cooldown": 20 },
-      [ "LONGSWIPE", 30 ]
+      { "id": "longswipe", "cooldown": 30 }
     ],
     "description": "The shuffling corpse of a large bipedal dinosaur covered with tattered feathers and black putrid liquid.  Long claws protrude from its hands.",
     "burn_into": "mon_zanzu_scorched",

diff --git a/data/mods/DinoMod/monsters/zinosaur_upgrade.json b/data/mods/DinoMod/monsters/zinosaur_upgrade.json
@@ -2014,7 +2014,7 @@
       { "id": "bite_grab", "cooldown": 7 },
       [ "scratch", 20 ],
       [ "LUNGE", 5 ],
-      [ "LONGSWIPE", 25 ]
+      { "id": "longswipe", "cooldown": 25 }
     ],
     "burn_into": "mon_zalbertosaurus_scorched",
     "fungalize_into": "mon_zalbertosaurus_fungus",
@@ -2218,7 +2218,7 @@
     "melee_dice": 3,
     "melee_dice_sides": 6,
     "hp": 320,
-    "special_attacks": [ [ "scratch", 10 ], { "id": "bite_grab" }, { "type": "bite", "cooldown": 10 }, [ "LONGSWIPE", 20 ] ],
+    "special_attacks": [ [ "scratch", 10 ], { "id": "bite_grab" }, { "type": "bite", "cooldown": 10 }, { "id": "longswipe", "cooldown": 20 } ],
     "burn_into": "mon_zerizinosaurus_scorched",
     "fungalize_into": "mon_zerizinosaurus_fungus",
     "categories": [ "DINOSAUR" ]
@@ -2238,7 +2238,7 @@
     "melee_dice": 4,
     "melee_dice_sides": 4,
     "hp": 160,
-    "special_attacks": [ [ "scratch", 10 ], { "id": "bite_grab" }, { "type": "bite", "cooldown": 5 }, [ "LONGSWIPE", 30 ] ],
+    "special_attacks": [ [ "scratch", 10 ], { "id": "bite_grab" }, { "type": "bite", "cooldown": 5 }, { "id": "longswipe", "cooldown": 30 } ],
     "burn_into": "mon_zothronychus_scorched",
     "fungalize_into": "mon_zothronychus_fungus",
     "categories": [ "DINOSAUR" ],
@@ -2258,7 +2258,7 @@
     "melee_dice": 4,
     "melee_dice_sides": 4,
     "hp": 120,
-    "special_attacks": [ [ "scratch", 10 ], { "id": "bite_grab" }, { "type": "bite", "cooldown": 5 }, [ "LONGSWIPE", 30 ] ],
+    "special_attacks": [ [ "scratch", 10 ], { "id": "bite_grab" }, { "type": "bite", "cooldown": 5 }, { "id": "longswipe", "cooldown": 30 } ],
     "burn_into": "mon_zanzu_scorched",
     "fungalize_into": "mon_zanzu_fungus",
     "categories": [ "DINOSAUR" ],
@@ -3172,7 +3172,7 @@
       { "id": "bite_grab", "cooldown": 7 },
       [ "scratch", 20 ],
       [ "LUNGE", 5 ],
-      [ "LONGSWIPE", 25 ]
+      { "id": "longswipe", "cooldown": 25 }
     ]
   },
   {