Skip to content

Commit

Permalink
Merge pull request #52606 from Venera3/mattack_message
Browse files Browse the repository at this point in the history 
Fix some monster attack messaging weirdness
  • Loading branch information
@Rivet-the-Zombie
Rivet-the-Zombie authored Nov 5, 2021
2 parents bc0e51d + 72a90e2 commit c74af52
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions data/json/monster_special_attacks/monster_attacks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_penetration": 8, "armor_multiplier": 0.5 } ],
"body_parts": [ [ "leg_l", 4 ], [ "leg_r", 4 ], [ "head", 2 ], [ "arm_l", 4 ], [ "arm_r", 4 ], [ "torso", 6 ] ],
"effects": [ { "id": "bleed", "duration": 100, "affect_hit_bp": true } ],
"hit_dmg_u": "The %1$s impales your torso!",
"hit_dmg_npc": "The %1$s impales <npcname>'s torso!",
"miss_msg_u": "The %1$s tries to impale your torso, but you dodge, fortunately!",
"miss_msg_npc": "The %1$s tries to impale <npcname>'s torso, but they dodge!",
"no_dmg_msg_u": "The %1$s tries to impale your torso, but fails to penetrate your armor!",
"no_dmg_msg_npc": "The %1$s tries to impale <npcname>'s torso, but fails to penetrate their armor!",
"hit_dmg_u": "The %1$s impales your %2$s!",
"hit_dmg_npc": "The %1$s impales <npcname>!",
"miss_msg_u": "The %1$s tries to impale your %2$s, but you dodge!",
"miss_msg_npc": "The %1$s tries to impale <npcname>, but they dodge!",
"no_dmg_msg_u": "The %1$s tries to impale your %2$s, but fails to penetrate your armor!",
"no_dmg_msg_npc": "The %1$s tries to impale <npcname>, but fails to penetrate their armor!",
"dodgeable": true,
"blockable": true
},
Expand All @@ -27,11 +27,11 @@
"body_parts": [ [ "head", 1 ], [ "torso", 2 ], [ "leg_r", 1 ], [ "leg_l", 1 ], [ "arm_r", 1 ], [ "arm_l", 1 ] ],
"effects": [ { "id": "venom_blind", "duration": 120 } ],
"hit_dmg_u": "The %1$s buries its beak in your %2$s!",
"hit_dmg_npc": "The %1$s buries its beak in <npcname>'s %2$s!",
"hit_dmg_npc": "The %1$s buries its beak in <npcname>!",
"miss_msg_u": "The %1$s tries to peck you, but you dodge!",
"miss_msg_npc": "The %1$s tries to peck <npcname>, but they dodge!",
"no_dmg_msg_u": "The %1$s tries to peck your %2$s, but fails to penetrate your armor!",
"no_dmg_msg_npc": "The %1$s tries to peck <npcname>'s %2$s, but fails to penetrate their armor!"
"no_dmg_msg_npc": "The %1$s tries to peck <npcname>, but fails to penetrate their armor!"
},
{
"type": "monster_attack",
Expand All @@ -42,7 +42,7 @@
"range": 3,
"damage_max_instance": [ { "damage_type": "bash", "amount": 20 } ],
"hit_dmg_u": "The %1$s snaps its tentacle at your %2$s!",
"hit_dmg_npc": "The %1$s snaps its tentacle at <npcname>'s %2$s!",
"hit_dmg_npc": "The %1$s snaps its tentacle at <npcname>!",
"no_dmg_msg_u": "The %1$s's tentacle lashes out at you without doing any damage.",
"no_dmg_msg_npc": "The %1$s's tentacle lashes out at <npcname> without doing any damage.",
"miss_msg_u": "The %s's tentacle snaps at you, but you dodge!",
Expand All @@ -59,9 +59,9 @@
"damage_max_instance": [ { "damage_type": "stab", "amount": 15 } ],
"min_mul": 0.3,
"hit_dmg_u": "The %1$s's head shoots out, and its teeth sink into your %2$s!",
"hit_dmg_npc": "The %1$s's head shoots out, and its teeth sink into <npcname>'s %2$s!",
"hit_dmg_npc": "The %1$s's head shoots out, and its teeth sink into <npcname>!",
"no_dmg_msg_u": "The %1$s's head hits your %2$s, but glances off your armor!",
"no_dmg_msg_npc": "The %1$s's head hits <npcname>'s %2$s, but glances off their armor!",
"no_dmg_msg_npc": "The %1$s's head hits <npcname>, but glances off their armor!",
"miss_msg_u": "The %s's head extends to bite you, but you dodge and the head sails past!",
"miss_msg_npc": "The %s's head extends to bite <npcname>, but they dodge and the head sails past!"
},
Expand All @@ -74,9 +74,9 @@
"range": 3,
"damage_max_instance": [ { "damage_type": "stab", "amount": 10 } ],
"hit_dmg_u": "The %1$s thrusts its arms at you, and its claws pierce your %2$s!",
"hit_dmg_npc": "The %1$s thrusts its arms at <npcname>, and its claws pierce their %2$s!",
"hit_dmg_npc": "The %1$s thrusts its arms at <npcname>!",
"no_dmg_msg_u": "The %1$s's arms hit your %2$s, but they glance off your armor!",
"no_dmg_msg_npc": "The %1$s's arms hit <npcname>'s %2$s, but they glance off their armor!",
"no_dmg_msg_npc": "The %1$s's arms hit <npcname>, but they glance off their armor!",
"miss_msg_u": "The %s thrusts its arms at you, but you evade the stretched arm!",
"miss_msg_npc": "The %s's thrusts its arms at <npcname>, but they dodge!"
},
Expand All @@ -91,9 +91,9 @@
"no_adjacent": true,
"damage_max_instance": [ { "damage_type": "cut", "amount": 7 } ],
"hit_dmg_u": "The %1$s thrusts a claw at your %2$s, slashing it!",
"hit_dmg_npc": "The %1$s thrusts a claw at <npcname>'s %2$s, slashing it!",
"hit_dmg_npc": "The %1$s thrusts a claw at <npcname>!",
"no_dmg_msg_u": "The %1$s thrusts a claw at your %2$s, but glances off your armor!",
"no_dmg_msg_npc": "The %1$s thrusts a claw at <npcname>'s %2$s, but glances off armor!",
"no_dmg_msg_npc": "The %1$s thrusts a claw at <npcname>, but glances off their armor!",
"miss_msg_u": "The %s thrusts a claw at you, but you evade it!",
"miss_msg_npc": "The %s thrusts a claw at <npcname>, but they evade it!"
},
Expand All @@ -106,11 +106,11 @@
"body_parts": [ [ "head", 1 ] ],
"damage_max_instance": [ { "damage_type": "cut", "amount": 11 } ],
"hit_dmg_u": "The %1$s slashes at your neck, cutting your throat!",
"hit_dmg_npc": "The %1$s slashes at <npcname>'s neck, cutting their throat!",
"hit_dmg_npc": "The %1$s slashes at <npcname>!",
"no_dmg_msg_u": "The %1$s slashes at your neck, but glances off your armor!",
"no_dmg_msg_npc": "The %1$s slashes at <npcname>'s neck, but glances off armor!",
"no_dmg_msg_npc": "The %1$s slashes at <npcname>, but glances off armor!",
"miss_msg_u": "The %s slashes at your neck! You duck!",
"miss_msg_npc": "The %s slashes at <npcname>'s neck! They duck!",
"miss_msg_npc": "The %s slashes at <npcname>, but they duck!",
"effects": [ { "id": "bleed", "duration": 900, "bp": "head" } ]
},
{
Expand All @@ -123,7 +123,7 @@
"body_parts": [ [ "torso", 3 ], [ "leg_r", 1 ], [ "leg_l", 1 ], [ "arm_r", 1 ], [ "arm_l", 1 ] ],
"throw_strength": 100,
"hit_dmg_u": "The %1$s takes a powerful swing at your %2$s, pulverizing it!",
"hit_dmg_npc": "The %1$s takes a powerful swing at <npcname>'s %2$s!",
"hit_dmg_npc": "The %1$s takes a powerful swing at <npcname>!",
"no_dmg_msg_u": "The %s takes a swing at you, but it's blunted by your armor.",
"no_dmg_msg_npc": "The %s takes a swing at <npcname>, but they appear unharmed.",
"miss_msg_u": "The %s takes a powerful swing at you, but you dodge it!",
Expand Down Expand Up @@ -217,11 +217,11 @@
"body_parts": [ [ "leg_l", 2 ], [ "leg_r", 2 ], [ "head", 1 ], [ "arm_l", 2 ], [ "arm_r", 2 ], [ "torso", 3 ] ],
"effects": [ { "id": "venom_weaken", "duration": 400, "chance": 50 } ],
"hit_dmg_u": "The %1$s stings your %2$s!",
"hit_dmg_npc": "The %1$s stings <npcname>'s %2$s!",
"hit_dmg_npc": "The %1$s stings <npcname>!",
"miss_msg_u": "The %1$s tries to sting you, but you dodge!",
"miss_msg_npc": "The %1$s tries to sting <npcname>, but they dodge!",
"no_dmg_msg_u": "The %1$s tries to sting your %2$s, but it fails to penetrate your armor.",
"no_dmg_msg_npc": "The %1$s tries to sting <npcname>'s %2$s, but it fails to penetrate their armor.",
"no_dmg_msg_npc": "The %1$s tries to sting <npcname>, but it fails to penetrate their armor.",
"dodgeable": true,
"blockable": true
},
Expand All @@ -248,11 +248,11 @@
"range": 2,
"effects": [ { "id": "venom_dmg", "duration": 250, "affect_hit_bp": true } ],
"hit_dmg_u": "The %1$s's stinger tail whips out and hits your %2$s!",
"hit_dmg_npc": "The %1$s'tail stings <npcname>'s %2$s!",
"hit_dmg_npc": "The %1$s'tail stings <npcname>!",
"miss_msg_u": "The %1$s tries to sting you, but you dodge!",
"miss_msg_npc": "The %1$s tries to sting <npcname>, but they dodge!",
"no_dmg_msg_u": "The %1$s's stinger bounces off your %2$s.",
"no_dmg_msg_npc": "The %1$s tries to sting <npcname>'s %2$s, but it fails to penetrate their armor."
"no_dmg_msg_npc": "The %1$s tries to sting <npcname>, but it fails to penetrate their armor."
},
{
"type": "monster_attack",
Expand All @@ -264,11 +264,11 @@
"min_mul": 0.7,
"body_parts": [ [ "leg_l", 4 ], [ "leg_r", 4 ], [ "head", 2 ], [ "arm_l", 4 ], [ "arm_r", 4 ], [ "torso", 6 ] ],
"hit_dmg_u": "The %1$s gores your %2$s with its antlers!",
"hit_dmg_npc": "The %1$s gores <npcname>'s %2$s with its antlers!",
"hit_dmg_npc": "The %1$s gores <npcname> with its antlers!",
"miss_msg_u": "The %1$s tries to gore you, but you dodge!",
"miss_msg_npc": "The %1$s tries to gore <npcname>, but they dodge!",
"no_dmg_msg_u": "The %1$s rams its antlers into your %2$s, but it bounces off your armor.",
"no_dmg_msg_npc": "The %1$s tries to gore <npcname>'s %2$s, but it fails to penetrate their armor."
"no_dmg_msg_npc": "The %1$s tries to gore <npcname>, but it fails to penetrate their armor."
},
{
"type": "monster_attack",
Expand All @@ -280,11 +280,11 @@
"body_parts": [ [ "leg_l", 4 ], [ "leg_r", 4 ], [ "head", 2 ], [ "arm_l", 4 ], [ "arm_r", 4 ], [ "torso", 6 ] ],
"throw_strength": 20,
"hit_dmg_u": "The %1$s kicks your %2$s!",
"hit_dmg_npc": "The %1$s kicks <npcname>'s %2$s!",
"hit_dmg_npc": "The %1$s kicks <npcname>!",
"miss_msg_u": "The %1$s tries to kick you, but you dodge!",
"miss_msg_npc": "The %1$s tries to kick <npcname>, but they dodge!",
"no_dmg_msg_u": "The %1$s kicks your %2$s, but it's dampened by your armor.",
"no_dmg_msg_npc": "The %1$s kicks <npcname>'s %2$s, but fails to penetrate their armor."
"no_dmg_msg_npc": "The %1$s kicks <npcname>, but fails to penetrate their armor."
},
{
"type": "monster_attack",
Expand Down

0 comments on commit c74af52

Please sign in to comment.