Merge pull request #76716 from LyleSY/dino_tails_long

[DinoMod] longer tail attacks
CleverRaven · Oct 1, 2024 · 5ab4eaf · 5ab4eaf
2 parents d8ae523 + 51aa94e
commit 5ab4eaf
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 14 deletions.
diff --git a/data/mods/DinoMod/monster_attacks.json b/data/mods/DinoMod/monster_attacks.json
@@ -166,6 +166,28 @@
     "hit_dmg_npc": "%1$s swings its massive tail at <npcname>'s %2$s!",
     "no_dmg_msg_u": "%s swings its tail at you, but it's blunted by your armor.",
     "no_dmg_msg_npc": "%s swings its tail at <npcname>, but they appear unharmed.",
+    "throw_msg_u": "The force of the blow sends you flying into the air!",
+    "throw_msg_npc": "The force of the blow sends <npcname> flying into the air!",
+    "miss_msg_u": "%s swings its tail at you, but you dodge it!",
+    "miss_msg_npc": "%s swings its tail at <npcname>, who dodges it!"
+  },
+  {
+    "type": "monster_attack",
+    "attack_type": "melee",
+    "id": "tailsmash_long_DinoMod",
+    "move_cost": 400,
+    "range": 6,
+    "no_adjacent": true,
+    "cooldown": 20,
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 30 } ],
+    "body_parts": [ [ "torso", 3 ], [ "leg_r", 1 ], [ "leg_l", 1 ], [ "arm_r", 1 ], [ "arm_l", 1 ] ],
+    "throw_strength": 100,
+    "hit_dmg_u": "%1$s swings its massive tail at your %2$s, pulverizing it!",
+    "hit_dmg_npc": "%1$s swings its massive tail at <npcname>'s %2$s!",
+    "no_dmg_msg_u": "%s swings its tail at you, but it's blunted by your armor.",
+    "no_dmg_msg_npc": "%s swings its tail at <npcname>, but they appear unharmed.",
+    "throw_msg_u": "The force of the blow sends you flying into the air!",
+    "throw_msg_npc": "The force of the blow sends <npcname> flying into the air!",
     "miss_msg_u": "%s swings its tail at you, but you dodge it!",
     "miss_msg_npc": "%s swings its tail at <npcname>, who dodges it!"
   },

diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json
@@ -1460,13 +1460,20 @@
     "hp": 250,
     "zombify_into": "mon_zaplocanthosaurus",
     "description": "Massive, long-necked, four-legged dinosaur with a whip-like tail and tall shoulders.",
+    "special_attacks": [
+      { "id": "stomp_DinoMod", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] },
+      [ "tailsmash_DinoMod", 30 ],
+      [ "EAT_CROP", 40 ],
+      [ "BROWSE", 60 ],
+      [ "GRAZE", 60 ]
+    ],
     "reproduction": { "baby_type": { "baby_egg": "egg_haplocanthosaurus" }, "baby_count": 3, "baby_timer": 24 }
   },
   {
     "type": "MONSTER",
     "id": "mon_amargasaurus",
     "name": { "str_sp": "amargasaurus" },
-    "copy-from": "mon_apatosaurus",
+    "copy-from": "mon_haplocanthosaurus",
     "//": "When large weights and volumes are fixed this should be 2500 L and 2500 kg",
     "stomach_size": 50000,
     "speed": 100,
@@ -1505,7 +1512,7 @@
     "zombify_into": "mon_zapatosaurus",
     "special_attacks": [
       { "id": "stomp_DinoMod", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] },
-      [ "tailsmash_DinoMod", 30 ],
+      [ "tailsmash_long_DinoMod", 30 ],
       [ "EAT_CROP", 40 ],
       [ "BROWSE", 60 ],
       [ "GRAZE", 60 ]
@@ -1618,7 +1625,6 @@
     "name": { "str": "astrodon" },
     "copy-from": "mon_apatosaurus",
     "//": "When large weights and volumes are fixed this should be 20000 L and 20000 kg",
-    "stomach_size": 400000,
     "speed": 50,
     "attack_cost": 50,
     "melee_dice": 6,

diff --git a/data/mods/DinoMod/monsters/juvenile.json b/data/mods/DinoMod/monsters/juvenile.json
@@ -476,13 +476,18 @@
     "id": "mon_camarasaurus_juvenile",
     "type": "MONSTER",
     "copy-from": "mon_amargasaurus_juvenile",
+    "special_attacks": [
+      { "id": "stomp_DinoMod", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ] },
+      [ "tailsmash_long_DinoMod", 30 ],
+      [ "EAT_CROP", 5 ]
+    ],
     "zombify_into": "mon_zamarasaurus_juvenile",
     "upgrades": { "age_grow": 365, "into": "mon_camarasaurus" }
   },
   {
     "id": "mon_brachiosaurus_juvenile",
     "type": "MONSTER",
-    "copy-from": "mon_amargasaurus_juvenile",
+    "copy-from": "mon_camarasaurus_juvenile",
     "zombify_into": "mon_zrachiosaurus_juvenile",
     "upgrades": { "age_grow": 365, "into": "mon_brachiosaurus" }
   },
@@ -496,7 +501,7 @@
   {
     "id": "mon_alamosaurus_juvenile",
     "type": "MONSTER",
-    "copy-from": "mon_amargasaurus_juvenile",
+    "copy-from": "mon_camarasaurus_juvenile",
     "zombify_into": "mon_zalamosaurus_juvenile",
     "upgrades": { "age_grow": 365, "into": "mon_alamosaurus" },
     "armor": { "bash": 7, "cut": 9 }

diff --git a/data/mods/DinoMod/monsters/zed-dinosaur.json b/data/mods/DinoMod/monsters/zed-dinosaur.json
@@ -748,6 +748,10 @@
     "melee_dice_sides": 7,
     "melee_damage": [ { "damage_type": "bash", "amount": 4 } ],
     "hp": 400,
+    "special_attacks": [
+      { "id": "slam", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] },
+      [ "tailsmash_DinoMod", 30 ]
+    ],
     "description": "Huge, long-necked, four-legged dinosaur corpse with a long tail.",
     "burn_into": "mon_zaplocanthosaurus_scorched",
     "fungalize_into": "mon_zaplocanthosaurus_fungus",
@@ -757,20 +761,14 @@
     "type": "MONSTER",
     "id": "mon_zamargasaurus",
     "name": { "str_sp": "amargasaurus zombie" },
-    "copy-from": "mon_zapatosaurus",
+    "copy-from": "mon_zaplocanthosaurus",
     "looks_like": "mon_zapatosaurus",
     "//": "When large weights and volumes are fixed this should be 2500 L and 2500 kg",
-    "speed": 55,
-    "attack_cost": 55,
-    "melee_dice": 4,
-    "melee_dice_sides": 7,
-    "melee_damage": [ { "damage_type": "bash", "amount": 4 } ],
     "hp": 250,
     "description": "Huge, long-necked, four-legged dinosaur corpse with two parallel rows of tall spines down its neck and back and a whip-like tail.",
     "burn_into": "mon_zamargasaurus_scorched",
     "fungalize_into": "mon_zamargasaurus_fungus",
     "upgrades": { "half_life": 30, "into_group": "GROUP_zamargasaurus_UPGRADE" },
-    "flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ],
     "armor": { "bash": 8, "cut": 8, "bullet": 6 }
   },
   {
@@ -792,7 +790,7 @@
     "hp": 480,
     "special_attacks": [
       { "id": "slam", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] },
-      [ "tailsmash_DinoMod", 30 ]
+      [ "tailsmash_long_DinoMod", 30 ]
     ],
     "description": "A massive, long-necked, four-legged dinosaur corpse with a long, whip-like tail.  The head is still upright and the neck looks like it would still make a good, strong club.",
     "burn_into": "mon_zapatosaurus_scorched",
@@ -830,7 +828,7 @@
     "melee_dice_sides": 4,
     "special_attacks": [
       { "id": "stomp_DinoMod", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] },
-      [ "tailsmash_DinoMod", 30 ]
+      [ "tailsmash_long_DinoMod", 30 ]
     ],
     "description": "Huge, long-necked, four-legged dinosaur with a long, whip-like tail and a tiny head with vacant white eyes.  Sways and staggers.",
     "burn_into": "mon_ziplodocus_scorched",