diff --git a/data/json/martialarts.json b/data/json/martialarts.json
index 1d4ccffce4d8..18f143ac9769 100644
--- a/data/json/martialarts.json
+++ b/data/json/martialarts.json
@@ -155,9 +155,14 @@
       {
         "id": "buff_boxing_static",
         "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.",
+        "description": "A solid stance allows you block more damage than normal and deliver better punches.\n\n+2 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": "damage", "type": "cut", "scale": 2.0 },
+          { "stat": "damage", "type": "stab", "scale": 2.0 }
+        ]
       }
     ],
     "onmove_buffs": [
@@ -176,11 +181,15 @@
       {
         "id": "buff_boxing_ondodge",
         "name": "Counter Chance",
-        "description": "You've seen your chance. Now strike back!\n\n+25% Bash damage.\nLasts for 1 turn.",
+        "description": "You've seen your chance. Now strike back!\n\n+25% Damage.\nLasts for 1 turn.",
         "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" ]
@@ -229,12 +238,16 @@
       {
         "id": "buff_capoeira_onmiss",
         "name": "Capoeira Tempo",
-        "description": "You didn't miss, it's just part of the dance and the best part is about to start!\n\n+15% Bash damage.\nLasts 2 turns.  Stacks 3 times.",
+        "description": "You didn't miss, it's just part of the dance and the best part is about to start!\n\n+15% Damage.\nLasts 2 turns.  Stacks 3 times.",
         "unarmed_allowed": true,
         "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": [
@@ -268,11 +281,15 @@
       {
         "id": "buff_crane_static",
         "name": "Crane's Precision",
-        "description": "Your attacks strike at your opponents weakness with speed and precision instead of brute force.\nDexterity increases melee damage instead of Strength.\n\nBash damage increased by 75% of Dexterity but decreased by 75% of Strength.",
+        "description": "Your attacks strike at your opponents weakness with speed and precision instead of brute force.\nDexterity increases melee damage instead of Strength.\n\nDamage increased by 75% of Dexterity but decreased by 75% of Strength.",
         "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 }
         ]
       }
     ],
@@ -322,11 +339,16 @@
       {
         "id": "buff_dragon_onhit",
         "name": "Dragon's Flight",
-        "description": "Life and combat are a circle.  An attack leads to a counter and to an attack once again.  Seek to complete this loop.\n\n+1 Accuracy, +2 bash Damage.\nEnables \"Dragon Vortex Block\" and \"Dragon Wing Dodge\"\nLasts 1 turn.",
+        "description": "Life and combat are a circle.  An attack leads to a counter and to an attack once again.  Seek to complete this loop.\n\n+1 Accuracy, +2 Damage.\nEnables \"Dragon Vortex Block\" and \"Dragon Wing Dodge\"\nLasts 1 turn.",
         "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" ]
@@ -602,11 +624,15 @@
       {
         "id": "buff_leopard_static1",
         "name": "Leopard's Strategy",
-        "description": "You fight by overwhelming your opponents with speedy strikes that are much harder to defend against.\nDexterity increases melee damage instead of Strength.\n\nBash damage increased by 75% of Dexterity but decreased by 75% of Strength.",
+        "description": "You fight by overwhelming your opponents with speedy strikes that are much harder to defend against.\nDexterity increases melee damage instead of Strength.\n\nDamage increased by 75% of Dexterity but decreased by 75% of Strength.",
         "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 }
         ]
       },
       {
@@ -716,12 +742,14 @@
       {
         "id": "buff_muay_thai_ongethit",
         "name": "Determination",
-        "description": "Taking a hit will not slow you down.  You will outlast your opponent and win this fight.\n\n+Bash damage increased by 25% of Strength, blocked damage decreased by 50% of Strength.\nLasts 5 turns.",
+        "description": "Taking a hit will not slow you down.  You will outlast your opponent and win this fight.\n\n+Damage increased by 25% of Strength, blocked damage decreased by 50% of Strength.\nLasts 5 turns.",
         "skill_requirements": [ { "name": "unarmed", "level": 3 } ],
         "unarmed_allowed": true,
         "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 }
         ]
       }
@@ -816,11 +844,12 @@
       {
         "id": "buff_niten_static",
         "name": "Niten Ichi-Ryu Stance",
-        "description": "Cautious watchful eyes\nmeasure and display your skill.\nPractice makes perfect.\n\nBash and Cut armor penetration increased by 50% of Perception, blocked damage reduced by 100% of Perception.",
+        "description": "Cautious watchful eyes\nmeasure and display your skill.\nPractice makes perfect.\n\nArmor penetration increased by 50% of Perception, blocked damage reduced by 100% of Perception.",
         "melee_allowed": true,
         "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 }
         ]
       }
@@ -839,14 +868,15 @@
       {
         "id": "buff_niten_onattack",
         "name": "Falling Leaf",
-        "description": "A sharp sword cuts true.\nAlthough, all things fade with time.\nRestraint hones your skills.\n\n-1.0 Dodge skill, -1 bash damage, -1 cut damage.\nLasts 1 turn. Stacks 5 times.",
+        "description": "A sharp sword cuts true.\nAlthough, all things fade with time.\nRestraint hones your skills.\n\n-1.0 Dodge skill, -1 damage, -1 damage.\nLasts 1 turn. Stacks 5 times.",
         "melee_allowed": true,
         "buff_duration": 1,
         "max_stacks": 5,
         "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 }
         ]
       }
     ],
@@ -886,23 +916,31 @@
       {
         "id": "buff_pankration_ondodge",
         "name": "Counter Chance",
-        "description": "The enemy has presented an opening in their defense.\n+10% bash damage.  Enables \"Close Combat\" buff.\nLasts 1 turn.",
+        "description": "The enemy has presented an opening in their defense.\n+10% damage.  Enables \"Close Combat\" buff.\nLasts 1 turn.",
         "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": [
       {
         "id": "buff_pankration_oncrit",
         "name": "Close Combat",
-        "description": "You got your opponent right where you want them!\n\n+20% bash damage.\nLasts 1 turn.",
+        "description": "You got your opponent right where you want them!\n\n+20% damage.\nLasts 1 turn.",
         "skill_requirements": [ { "name": "unarmed", "level": 4 } ],
         "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": [
@@ -1052,9 +1090,13 @@
       {
         "id": "buff_taekwondo_static2",
         "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.",
+        "description": "Your attacks are stronger if you are not holding anything in your hands.\n\n+33% 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": [
@@ -1088,12 +1130,14 @@
       {
         "id": "buff_tai_chi_ondodge",
         "name": "Repulse the Monkey",
-        "description": "By perfectly positioning yourself and your opponent, you have become more accurate and can bypass your opponent's defenses.\n\nAccuracy increased by 20% of Perception, gain bash Armor Penetration equal to 50% of Perception.\nLasts 2 turns.",
+        "description": "By perfectly positioning yourself and your opponent, you have become more accurate and can bypass your opponent's defenses.\n\nAccuracy increased by 20% of Perception, gain Armor Penetration equal to 50% of Perception.\nLasts 2 turns.",
         "unarmed_allowed": true,
         "skill_requirements": [ { "name": "unarmed", "level": 3 } ],
         "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 }
         ]
       }
@@ -1280,7 +1324,7 @@
       {
         "id": "debug_elem_resist",
         "name": "Elemental resistance",
-        "description": "+Strength bash armor, +Dexterity acid armor, +Intelligence electricity armor, +Perception fire armor.",
+        "description": "+Strength physical armor, +Dexterity acid armor, +Intelligence electricity armor, +Perception fire armor.",
         "unarmed_allowed": true,
         "flat_bonuses": [
           { "stat": "armor", "type": "bash", "scaling-stat": "str", "scale": 1.0 },
@@ -1305,11 +1349,15 @@
       {
         "id": "debug_miss_buff",
         "name": "Getting Angry",
-        "description": "When I get my hands on you…  +2 bash damage for 2 turns.  Stacks 5 times.",
+        "description": "When I get my hands on you…  +2 damage for 2 turns.  Stacks 5 times.",
         "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": [