From a51e50dcf1cca9316cd72f9c30e9bfe1bc141df9 Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <chimzor1@gmail.com>
Date: Sun, 13 Mar 2022 12:55:40 -0400
Subject: [PATCH 1/2] Remove redundant weapon entries from MMA

---
 data/mods/MMA/martialarts.json | 70 ++--------------------------------
 1 file changed, 3 insertions(+), 67 deletions(-)

diff --git a/data/mods/MMA/martialarts.json b/data/mods/MMA/martialarts.json
index eaed57a88a6de..15635f22e4236 100644
--- a/data/mods/MMA/martialarts.json
+++ b/data/mods/MMA/martialarts.json
@@ -210,27 +210,7 @@
       }
     ],
     "techniques": [ "mma_tec_hylian_spin", "mma_tec_hylian_wide" ],
-    "weapons": [
-      "broadsword",
-      "broadsword_inferior",
-      "broadsword_fake",
-      "cudgel",
-      "katana",
-      "katana_inferior",
-      "katana_fake",
-      "ladle",
-      "longsword",
-      "longsword_inferior",
-      "longsword_fake",
-      "sickle",
-      "stick",
-      "sword_wood",
-      "torch",
-      "torch_lit",
-      "zweihander",
-      "zweihander_inferior",
-      "zweihander_fake"
-    ],
+    "weapons": [ "cudgel", "ladle", "sickle", "stick", "torch", "torch_lit" ],
     "weapon_category": [ "MEDIUM_SWORDS", "GREAT_SWORDS" ]
   },
   {
@@ -424,20 +404,7 @@
       }
     ],
     "techniques": [ "mma_tec_setting_sun_stun", "mma_tec_setting_sun_throw", "mma_tec_setting_sun_throw_crit" ],
-    "weapons": [
-      "i_staff",
-      "kris",
-      "kris_fake",
-      "shock_staff",
-      "sword_crude",
-      "sword_nail",
-      "sword_wood",
-      "sword_xiphos",
-      "q_staff",
-      "wakizashi",
-      "wakizashi_inferior",
-      "wakizashi_fake"
-    ],
+    "weapons": [ "kris", "kris_fake", "sword_crude", "sword_nail", "sword_wood" ],
     "weapon_category": [ "QUARTERSTAVES", "SHORT_SWORDS" ]
   },
   {
@@ -500,25 +467,7 @@
       }
     ],
     "techniques": [ "mma_tec_shii_cho_disarm", "mma_tec_shii_cho_wide" ],
-    "weapons": [
-      "bokken",
-      "bokken_inferior",
-      "bokken_fake",
-      "katana",
-      "katana_inferior",
-      "katana_fake",
-      "longsword",
-      "longsword_inferior",
-      "longsword_fake",
-      "nodachi",
-      "nodachi_inferior",
-      "nodachi_fake",
-      "sword_wood",
-      "tanto",
-      "wakizashi",
-      "wakizashi_inferior",
-      "wakizashi_fake"
-    ],
+    "weapons": [ "nodachi", "nodachi_inferior", "nodachi_fake", "tanto" ],
     "weapon_category": [ "SHORT_SWORDS", "MEDIUM_SWORDS", "LONG_SWORDS" ]
   },
   {
@@ -612,19 +561,6 @@
       }
     ],
     "techniques": [ "mma_tec_stone_dragon_hammer", "mma_tec_stone_dragon_strike", "mma_tec_stone_dragon_colossus" ],
-    "weapons": [
-      "battleaxe",
-      "battleaxe_inferior",
-      "battleaxe_fake",
-      "mace",
-      "mace_inferior",
-      "mace_fake",
-      "mace_simple",
-      "mace_trench",
-      "zweihander",
-      "zweihander_inferior",
-      "zweihander_fake"
-    ],
     "weapon_category": [ "MACES", "GREAT_SWORDS", "GREAT_AXES" ]
   },
   {

From f41c82b19c807a67fd49c35a1941b5e8ef7a7284 Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <chimzor1@gmail.com>
Date: Sun, 13 Mar 2022 16:09:52 -0400
Subject: [PATCH 2/2] Put Shii-Cho weapons list back for later PR

---
 data/mods/MMA/martialarts.json | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/data/mods/MMA/martialarts.json b/data/mods/MMA/martialarts.json
index 15635f22e4236..974043579f7fe 100644
--- a/data/mods/MMA/martialarts.json
+++ b/data/mods/MMA/martialarts.json
@@ -467,7 +467,25 @@
       }
     ],
     "techniques": [ "mma_tec_shii_cho_disarm", "mma_tec_shii_cho_wide" ],
-    "weapons": [ "nodachi", "nodachi_inferior", "nodachi_fake", "tanto" ],
+    "weapons": [
+      "bokken",
+      "bokken_inferior",
+      "bokken_fake",
+      "katana",
+      "katana_inferior",
+      "katana_fake",
+      "longsword",
+      "longsword_inferior",
+      "longsword_fake",
+      "nodachi",
+      "nodachi_inferior",
+      "nodachi_fake",
+      "sword_wood",
+      "tanto",
+      "wakizashi",
+      "wakizashi_inferior",
+      "wakizashi_fake"
+    ],
     "weapon_category": [ "SHORT_SWORDS", "MEDIUM_SWORDS", "LONG_SWORDS" ]
   },
   {