Merge pull request #74041 from Procyonae/Backport70705And72574

Backport #70705 and #72574
CleverRaven · May 26, 2024 · 7b67074 · 7b67074
2 parents f0f41ba + 9332797
commit 7b67074
Show file tree

Hide file tree

Showing 6 changed files with 148 additions and 197 deletions.
diff --git a/data/json/monster_special_attacks/feral_weapon_attacks.json b/data/json/monster_special_attacks/feral_weapon_attacks.json
@@ -7,7 +7,8 @@
     "move_cost": 80,
     "accuracy": 3,
     "//": "Feral melee skill + weapon's to hit, so 3+0=3",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 10 } ],
+    "//2": "all melee damage is decreased by 10% with assumption it is at least `|/` broken",
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 9 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a pipe!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a pipe!",
@@ -24,7 +25,7 @@
     "move_cost": 97,
     "accuracy": 3,
     "//": "Feral melee skill + weapon's to hit, so 3+0=3",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 19 }, { "damage_type": "cut", "amount": 1 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 17 }, { "damage_type": "cut", "amount": 1 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a crowbar!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a crowbar!",
@@ -41,7 +42,7 @@
     "move_cost": 108,
     "accuracy": 9,
     "//": "Feral melee skill + weapon's to hit, so 6+3=9",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 14 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 13 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a baton!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a baton!",
@@ -58,7 +59,7 @@
     "move_cost": 130,
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 3-1=2",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 14 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 13 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a stick!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a stick!",
@@ -75,7 +76,7 @@
     "move_cost": 134,
     "accuracy": 3,
     "//": "Feral melee skill + weapon's to hit, so 3+0=3",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 14 }, { "damage_type": "cut", "amount": 28 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 13 }, { "damage_type": "cut", "amount": 25 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with an axe!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with an axe!",
@@ -92,7 +93,7 @@
     "move_cost": 160,
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 3-1=2",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 13 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a shotgun!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a shotgun!",
@@ -126,7 +127,7 @@
     "move_cost": 72,
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 3-1=2",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 16 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 14 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a knife!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
@@ -160,7 +161,7 @@
     "move_cost": 107,
     "accuracy": 6,
     "//": "Feral melee skill + weapon's to hit, so 4+2=6",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 3 }, { "damage_type": "stab", "amount": 29 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 3 }, { "damage_type": "stab", "amount": 26 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a rapier!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a rapier!",
@@ -172,15 +173,15 @@
   {
     "type": "monster_attack",
     "attack_type": "melee",
-    "id": "feral_weapon_crossbow_melee",
+    "id": "feral_weapon_rapier_fake",
     "cooldown": 1,
-    "move_cost": 165,
-    "accuracy": 1,
-    "//": "Feral melee skill + weapon's to hit, so 2-1=1",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 13 } ],
+    "move_cost": 95,
+    "accuracy": 6,
+    "//": "Feral melee skill + weapon's to hit, so 4+2=6",
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 8 }, { "damage_type": "stab", "amount": 3 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
-    "hit_dmg_u": "%1$s hits your %2$s with a crossbow!",
-    "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a crossbow!",
+    "hit_dmg_u": "%1$s hits your %2$s with a rapier!",
+    "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a rapier!",
     "miss_msg_u": "%1$s tries to hit you, but you dodge!",
     "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
     "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
@@ -194,7 +195,7 @@
     "move_cost": 139,
     "accuracy": 4,
     "//": "Feral melee skill + weapon's to hit, so 3+1=4",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 19 }, { "damage_type": "cut", "amount": 39 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 17 }, { "damage_type": "cut", "amount": 3 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a battle axe!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a battle axe!",
@@ -211,7 +212,7 @@
     "move_cost": 97,
     "accuracy": 4,
     "//": "Feral melee skill + weapon's to hit, so 3+1=4",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 40 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 14 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a mace!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a mace!",
@@ -228,7 +229,7 @@
     "move_cost": 100,
     "accuracy": 4,
     "//": "Feral melee skill + weapon's to hit, so 4+0=4",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 11 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a wrench!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a wrench!",
@@ -245,7 +246,7 @@
     "move_cost": 98,
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 4-2=2",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 11 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 10 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a lug wrench!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a lug wrench!",
@@ -279,7 +280,7 @@
     "move_cost": 96,
     "accuracy": 4,
     "//": "Feral melee skill + weapon's to hit, so 4+0=4",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 10 }, { "damage_type": "cut", "amount": 20 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 9 }, { "damage_type": "cut", "amount": 18 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with an axe!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with an axe!",
@@ -296,7 +297,24 @@
     "move_cost": 82,
     "accuracy": 5,
     "//": "Feral melee skill + weapon's to hit, so 6-1=5",
-    "damage_max_instance": [ { "damage_type": "stab", "amount": 22 } ],
+    "damage_max_instance": [ { "damage_type": "stab", "amount": 20 } ],
+    "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
+    "hit_dmg_u": "%1$s hits your %2$s with a knife!",
+    "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
+    "miss_msg_u": "%1$s tries to hit you, but you dodge!",
+    "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
+    "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
+    "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
+  },
+  {
+    "type": "monster_attack",
+    "attack_type": "melee",
+    "id": "feral_weapon_knife_combat_low_skill",
+    "cooldown": 1,
+    "move_cost": 82,
+    "accuracy": 2,
+    "//": "Feral melee skill + weapon's to hit, so 3-1=2",
+    "damage_max_instance": [ { "damage_type": "stab", "amount": 20 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a knife!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
@@ -314,7 +332,7 @@
     "accuracy": 2,
     "range": 2,
     "//": "Feral melee skill + weapon's to hit, so 3-1=2",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 4 }, { "damage_type": "stab", "amount": 26 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 4 }, { "damage_type": "stab", "amount": 23 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s thrusts a spear at your %2$s, slashing it!",
     "hit_dmg_npc": "%1$s thrusts a spear at <npcname>'s %2$s, slashing it!",
@@ -331,7 +349,7 @@
     "move_cost": 79,
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 3-1=2",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 9 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a hammer!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a hammer!",
@@ -348,7 +366,7 @@
     "move_cost": 154,
     "accuracy": 6,
     "//": "Feral melee skill + weapon's to hit, so 3+3=6",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 14 }, { "damage_type": "cut", "amount": 3 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 13 }, { "damage_type": "cut", "amount": 3 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a shovel!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a shovel!",
@@ -365,7 +383,7 @@
     "move_cost": 106,
     "accuracy": 5,
     "//": "Feral melee skill + weapon's to hit, so 6-1=5",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "cut", "amount": 16 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "cut", "amount": 14 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a machete!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a machete!",
@@ -382,7 +400,7 @@
     "move_cost": 65,
     "accuracy": 1,
     "//": "Feral melee skill + weapon's to hit, so 4-3=1",
-    "damage_max_instance": [ { "damage_type": "cut", "amount": 7 } ],
+    "damage_max_instance": [ { "damage_type": "cut", "amount": 6 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a scalpel!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a scalpel!",
@@ -399,7 +417,7 @@
     "move_cost": 90,
     "accuracy": 4,
     "//": "Feral melee skill + weapon's to hit, so 6-2=4",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 7 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a gun!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a gun!",
@@ -416,7 +434,7 @@
     "move_cost": 79,
     "accuracy": 6,
     "//": "Feral melee skill + weapon's to hit, so 6+0=6",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 7 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a flashlight!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a flashlight!",
@@ -433,7 +451,7 @@
     "move_cost": 84,
     "accuracy": 2,
     "//": "Feral melee skill + weapon's to hit, so 4-2=2",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 7 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "hit_dmg_u": "%1$s hits your %2$s with a gun!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a gun!",
@@ -450,7 +468,7 @@
     "move_cost": 179,
     "accuracy": 5,
     "//1": "Feral melee skill + weapon's to hit, so 6-1=5",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 11 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "//2": "Stats based on AR-15/M4 Carbine (they are identical in melee), since that's what mad militia drops. Move cost was tested on a 10 in all stats character ingame, since HHG doesn't account for the default attachments",
     "hit_dmg_u": "%1$s hits your %2$s with a rifle!",
@@ -468,7 +486,7 @@
     "move_cost": 196,
     "accuracy": 3,
     "//1": "Feral melee skill + weapon's to hit, so 4-1=3",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 12 }, { "damage_type": "stab", "amount": 22 } ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 11 }, { "damage_type": "stab", "amount": 20 } ],
     "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
     "//2": "Stats based on M4 Carbine with an attached combat knife, since that's the most common gun feral marines drop. Move cost was tested on a 10 in all stats character ingame, since HHG doesn't account for the default attachments",
     "hit_dmg_u": "%1$s lunges their bayonet at your %2$s, stabbing it!",
@@ -477,5 +495,39 @@
     "no_dmg_msg_npc": "%1$s thrusts their bayonet at <npcname>'s %2$s, but glances off armor!",
     "miss_msg_u": "%s thrusts their bayonet at you, but you evade!",
     "miss_msg_npc": "%s thrusts their bayonet at <npcname>, but they evade!"
+  },
+  {
+    "type": "monster_attack",
+    "attack_type": "melee",
+    "id": "feral_weapon_baton-extended",
+    "cooldown": 1,
+    "move_cost": 79,
+    "accuracy": 8,
+    "//": "Feral melee skill + weapon's to hit, so 6+2=8",
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 9 } ],
+    "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
+    "hit_dmg_u": "%1$s hits your %2$s with a baton!",
+    "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a baton!",
+    "miss_msg_u": "%1$s tries to hit you, but you dodge!",
+    "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
+    "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
+    "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
+  },
+  {
+    "type": "monster_attack",
+    "attack_type": "melee",
+    "id": "feral_weapon_mace_pipe",
+    "cooldown": 1,
+    "move_cost": 103,
+    "accuracy": 3,
+    "//": "Feral melee skill + weapon's to hit, so 3+0=3",
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 18 } ],
+    "condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
+    "hit_dmg_u": "%1$s hits your %2$s with a pipe!",
+    "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a pipe!",
+    "miss_msg_u": "%1$s tries to hit you, but you dodge!",
+    "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
+    "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
+    "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
   }
 ]