diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 1d4ccffce4d8..17e8e60a5c95 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -157,7 +157,10 @@ "name": "Boxing Stance", "description": "A solid stance allows you block more damage than normal and deliver better punches.\n\n+2 Bash damage, Blocked damge reduced by 50% of Strength.", "unarmed_allowed": true, - "flat_bonuses": [ { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "bash", "scale": 2.0 } ] + "flat_bonuses": [ + { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "bash", "scale": 2.0 }, + { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "cut", "scale": 2.0 }, + { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "stab", "scale": 2.0 } ] } ], "onmove_buffs": [ @@ -180,7 +183,10 @@ "skill_requirements": [ { "name": "unarmed", "level": 5 } ], "unarmed_allowed": true, "buff_duration": 1, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.25 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.25 }, + { "stat": "damage", "type": "cut", "scale": 1.25 }, + { "stat": "damage", "type": "stab", "scale": 1.25 } ] } ], "techniques": [ "tec_boxing_rapid", "tec_boxing_cross", "tec_boxing_upper", "tec_boxing_counter" ] @@ -234,7 +240,10 @@ "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 2, "max_stacks": 3, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.15 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.15 }, + { "stat": "damage", "type": "cut", "scale": 1.15 }, + { "stat": "damage", "type": "stab", "scale": 1.15 } ] } ], "onmove_buffs": [ @@ -272,7 +281,11 @@ "unarmed_allowed": true, "flat_bonuses": [ { "stat": "damage", "type": "bash", "scaling-stat": "dex", "scale": 0.75 }, - { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 } + { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 }, + { "stat": "damage", "type": "cut", "scaling-stat": "dex", "scale": 0.75 }, + { "stat": "damage", "type": "cut", "scaling-stat": "str", "scale": -0.75 }, + { "stat": "damage", "type": "stab", "scaling-stat": "dex", "scale": 0.75 }, + { "stat": "damage", "type": "stab", "scaling-stat": "str", "scale": -0.75 } ] } ], @@ -326,7 +339,11 @@ "unarmed_allowed": true, "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 1, - "flat_bonuses": [ { "stat": "hit", "scale": 1.0 }, { "stat": "damage", "type": "bash", "scale": 2.0 } ] + "flat_bonuses": [ + { "stat": "hit", "scale": 1.0 }, + { "stat": "damage", "type": "bash", "scale": 2.0 }, + { "stat": "damage", "type": "cut", "scale": 2.0 }, + { "stat": "damage", "type": "stab", "scale": 2.0 } ] } ], "techniques": [ "tec_dragon_claw", "tec_dragon_blockcounter", "tec_dragon_dodgecounter", "tec_dragon_tail", "tec_dragon_strike" ] @@ -606,7 +623,11 @@ "unarmed_allowed": true, "flat_bonuses": [ { "stat": "damage", "type": "bash", "scaling-stat": "dex", "scale": 0.75 }, - { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 } + { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 }, + { "stat": "damage", "type": "cut", "scaling-stat": "dex", "scale": 0.75 }, + { "stat": "damage", "type": "cut", "scaling-stat": "str", "scale": -0.75 }, + { "stat": "damage", "type": "stab", "scaling-stat": "dex", "scale": 0.75 }, + { "stat": "damage", "type": "stab", "scaling-stat": "str", "scale": -0.75 } ] }, { @@ -722,6 +743,8 @@ "buff_duration": 5, "flat_bonuses": [ { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": 0.25 }, + { "stat": "damage", "type": "cut", "scaling-stat": "str", "scale": 0.25 }, + { "stat": "damage", "type": "stab", "scaling-stat": "str", "scale": 0.25 }, { "stat": "block", "scaling-stat": "str", "scale": 0.5 } ] } @@ -821,6 +844,7 @@ "flat_bonuses": [ { "stat": "arpen", "type": "cut", "scaling-stat": "per", "scale": 0.5 }, { "stat": "arpen", "type": "bash", "scaling-stat": "per", "scale": 0.5 }, + { "stat": "arpen", "type": "stab", "scaling-stat": "per", "scale": 0.5 }, { "stat": "block", "scaling-stat": "per", "scale": 1.0 } ] } @@ -846,7 +870,8 @@ "flat_bonuses": [ { "stat": "dodge", "scale": -1.0 }, { "stat": "damage", "type": "cut", "scale": -1.0 }, - { "stat": "damage", "type": "bash", "scale": -1.0 } + { "stat": "damage", "type": "bash", "scale": -1.0 }, + { "stat": "damage", "type": "stab", "scale": -1.0 } ] } ], @@ -890,7 +915,10 @@ "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "unarmed_allowed": true, "buff_duration": 1, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.1 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.1 }, + { "stat": "damage", "type": "cut", "scale": 1.1 }, + { "stat": "damage", "type": "stab", "scale": 1.1 } ] } ], "onhit_buffs": [ @@ -902,7 +930,11 @@ "unarmed_allowed": true, "req_buffs": [ "buff_pankration_ondodge" ], "buff_duration": 1, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.2 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.2 }, + { "stat": "damage", "type": "cut", "scale": 1.2 }, + { "stat": "damage", "type": "stab", "scale": 1.2 } + ] } ], "techniques": [ @@ -1054,7 +1086,11 @@ "name": "Unhindered", "description": "Your attacks are stronger if you are not holding anything in your hands.\n\n+33% bash damage when not using a weapon.", "unarmed_allowed": true, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.33 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.33 }, + { "stat": "damage", "type": "cut", "scale": 1.33 }, + { "stat": "damage", "type": "stab", "scale": 1.33 } + ] } ], "techniques": [ @@ -1094,6 +1130,8 @@ "buff_duration": 2, "flat_bonuses": [ { "stat": "arpen", "type": "bash", "scaling-stat": "per", "scale": 0.5 }, + { "stat": "arpen", "type": "cut", "scaling-stat": "per", "scale": 0.5 }, + { "stat": "arpen", "type": "stab", "scaling-stat": "per", "scale": 0.5 }, { "stat": "hit", "scaling-stat": "per", "scale": 0.2 } ] } @@ -1309,7 +1347,11 @@ "unarmed_allowed": true, "buff_duration": 2, "max_stacks": 5, - "flat_bonuses": [ { "stat": "damage", "type": "bash", "scale": 2.0 } ] + "flat_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 2.0 }, + { "stat": "damage", "type": "cut", "scale": 2.0 }, + { "stat": "damage", "type": "stab", "scale": 2.0 } + ] } ], "onkill_buffs": [