diff --git a/data/mods/MMA/enchantments.json b/data/mods/MMA/enchantments.json
new file mode 100644
index 0000000000000..2648d0d8a2679
--- /dev/null
+++ b/data/mods/MMA/enchantments.json
@@ -0,0 +1,30 @@
+[
+  {
+    "type": "enchantment",
+    "id": "DRUNKEN_UNARMED",
+    "condition": { "not": "u_has_weapon" },
+    "values": [
+      {
+        "value": "ITEM_DAMAGE_BASH",
+        "add": { "math": [ "rng(u_effect_intensity('drunk') * 1.8, u_effect_intensity('drunk') * 4 )" ] }
+      }
+    ]
+  },
+  {
+    "type": "enchantment",
+    "id": "DRUNKEN_ARMED",
+    "condition": "u_has_weapon",
+    "values": [
+      {
+        "value": "ITEM_DAMAGE_BASH",
+        "add": { "math": [ "rng(u_effect_intensity('drunk') * 1.2, u_effect_intensity('drunk') * 2.6 )" ] }
+      }
+    ]
+  },
+  {
+    "type": "enchantment",
+    "id": "KI_STRIKE",
+    "condition": { "not": "u_has_weapon" },
+    "values": [ { "value": "ITEM_DAMAGE_BASH", "add": { "math": [ "u_skill('unarmed') * 2" ] } } ]
+  }
+]
diff --git a/data/mods/MMA/mutations.json b/data/mods/MMA/mutations.json
index de3ef4720a9e5..74c94449f1e41 100644
--- a/data/mods/MMA/mutations.json
+++ b/data/mods/MMA/mutations.json
@@ -28,26 +28,7 @@
     "starting_trait": true,
     "valid": false,
     "cancels": [ "LIGHTWEIGHT" ],
-    "enchantments": [
-      {
-        "condition": { "not": "u_has_weapon" },
-        "values": [
-          {
-            "value": "ITEM_DAMAGE_BASH",
-            "add": { "math": [ "rng(u_effect_intensity('drunk') * 1.8, u_effect_intensity('drunk') * 4 )" ] }
-          }
-        ]
-      },
-      {
-        "condition": "u_has_weapon",
-        "values": [
-          {
-            "value": "ITEM_DAMAGE_BASH",
-            "add": { "math": [ "rng(u_effect_intensity('drunk') * 1.2, u_effect_intensity('drunk') * 2.6 )" ] }
-          }
-        ]
-      }
-    ]
+    "enchantments": [ "DRUNKEN_ARMED", "DRUNKEN_UNARMED" ]
   },
   {
     "type": "mutation",
@@ -67,12 +48,7 @@
     "description": "Who needs weapons?  You deal more melee damage while your hands are empty.  This damage improves as your unarmed skill increases.",
     "starting_trait": true,
     "valid": false,
-    "enchantments": [
-      {
-        "condition": { "not": "u_has_weapon" },
-        "values": [ { "value": "ITEM_DAMAGE_BASH", "add": { "math": [ "u_skill('unarmed') * 2" ] } } ]
-      }
-    ]
+    "enchantments": [ "KI_STRIKE" ]
   },
   {
     "type": "mutation",
diff --git a/data/mods/MindOverMatter/mutations/traits.json b/data/mods/MindOverMatter/mutations/traits.json
index e6eca45c8a625..cf4d19a3d768f 100644
--- a/data/mods/MindOverMatter/mutations/traits.json
+++ b/data/mods/MindOverMatter/mutations/traits.json
@@ -124,12 +124,7 @@
     "description": "Who needs weapons?  Thanks to your biokinesis, you deal more melee damage while fighting with your bare hands.  This damage improves as your unarmed skill increases.",
     "starting_trait": false,
     "valid": false,
-    "enchantments": [
-      {
-        "condition": { "not": "u_has_weapon" },
-        "values": [ { "value": "ITEM_DAMAGE_BASH", "add": { "math": [ "u_skill('unarmed') * 2" ] } } ]
-      }
-    ]
+    "enchantments": [ "KI_STRIKE" ]
   },
   {
     "type": "mutation",
diff --git a/data/mods/Xedra_Evolved/enchantments/mutations.json b/data/mods/Xedra_Evolved/enchantments/mutations.json
index b1cc42deee030..246c34fc3e127 100644
--- a/data/mods/Xedra_Evolved/enchantments/mutations.json
+++ b/data/mods/Xedra_Evolved/enchantments/mutations.json
@@ -31,5 +31,33 @@
     "id": "EATER_SIXTH_SENSE",
     "condition": "ALWAYS",
     "values": [ { "value": "MAX_MANA", "add": { "math": [ "u_skill('deduction')*50" ] } } ]
+  },
+  {
+    "type": "enchantment",
+    "id": "DRUNKEN_UNARMED",
+    "condition": { "not": "u_has_weapon" },
+    "values": [
+      {
+        "value": "ITEM_DAMAGE_BASH",
+        "add": { "math": [ "rng(u_effect_intensity('drunk') * 1.8, u_effect_intensity('drunk') * 4 )" ] }
+      }
+    ]
+  },
+  {
+    "type": "enchantment",
+    "id": "DRUNKEN_ARMED",
+    "condition": "u_has_weapon",
+    "values": [
+      {
+        "value": "ITEM_DAMAGE_BASH",
+        "add": { "math": [ "rng(u_effect_intensity('drunk') * 1.2, u_effect_intensity('drunk') * 2.6 )" ] }
+      }
+    ]
+  },
+  {
+    "type": "enchantment",
+    "id": "KI_STRIKE",
+    "condition": { "not": "u_has_weapon" },
+    "values": [ { "value": "ITEM_DAMAGE_BASH", "add": { "math": [ "u_skill('unarmed') * 2" ] } } ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/mutations/mutations.json b/data/mods/Xedra_Evolved/mutations/mutations.json
index c4e7bd7d598c7..5c523792c3ee6 100644
--- a/data/mods/Xedra_Evolved/mutations/mutations.json
+++ b/data/mods/Xedra_Evolved/mutations/mutations.json
@@ -80,26 +80,7 @@
     "starting_trait": true,
     "valid": false,
     "cancels": [ "LIGHTWEIGHT" ],
-    "enchantments": [
-      {
-        "condition": { "not": "u_has_weapon" },
-        "values": [
-          {
-            "value": "ITEM_DAMAGE_BASH",
-            "add": { "math": [ "rng(u_effect_intensity('drunk') * 1.8, u_effect_intensity('drunk') * 4 )" ] }
-          }
-        ]
-      },
-      {
-        "condition": "u_has_weapon",
-        "values": [
-          {
-            "value": "ITEM_DAMAGE_BASH",
-            "add": { "math": [ "rng(u_effect_intensity('drunk') * 1.2, u_effect_intensity('drunk') * 2.6 )" ] }
-          }
-        ]
-      }
-    ]
+    "enchantments": [ "DRUNKEN_ARMED", "DRUNKEN_UNARMED" ]
   },
   {
     "type": "mutation",
@@ -109,12 +90,7 @@
     "description": "Who needs weapons?  You deal more melee damage while fighting barehanded and without gloves.  This damage improves as your unarmed skill increases.",
     "starting_trait": true,
     "valid": false,
-    "enchantments": [
-      {
-        "condition": { "not": "u_has_weapon" },
-        "values": [ { "value": "ITEM_DAMAGE_BASH", "add": { "math": [ "u_skill('unarmed') * 2" ] } } ]
-      }
-    ]
+    "enchantments": [ "KI_STRIKE" ]
   },
   {
     "type": "mutation",