Remove the one-handed medieval and japanese sword categories.

3 files changed, 9 insertions, 78 deletions

diff --git a/martialarts.json b/martialarts.json
index 6b4403d..11695df 100644
--- a/martialarts.json
+++ b/martialarts.json
@@ -88,14 +88,15 @@
     ],
     "weapon_category": [
       "DUELING_SWORDS",
-      "1H_MEDIEVAL_SWORDS",
-      "1H_JAPANESE_SWORDS",
+      "MEDIEVAL_SWORDS",
+      "JAPANESE_SWORDS",
+      "WHIPS",
       "JAPANESE_GLAIVES",
       "CLAWS",
-      "WHIPS",
       "UMBRELLAS",
       "KITCHEN_IMPLEMENTS",
       "CLEANING_IMPLEMENTS"
-    ]
+    ],
+    "//": "In addition to vanilla categories: Allow naginatas, claws, umbrellas, kitchen tools, and cleaning tools."
   }
 ]
diff --git a/melee.json b/melee.json
index a60e88a..c72e0e3 100644
--- a/melee.json
+++ b/melee.json
@@ -51,7 +51,7 @@
     "looks_like": "broom",
     "type": "GENERIC",
     "category": "weapons",
-    "weapon_category": [ "JAPANESE_GLAIVES", "CLEANING_IMPLEMENTS" ],
+    "weapon_category": [ "GLAIVES", "JAPANESE_GLAIVES", "CLEANING_IMPLEMENTS" ],
     "name": { "str": "maid's broom" },
     "description": "It is a broom suitable for combat. Inside the handle is a blade, hidden yet unyielding, just like the passion you have for your Mistress.",
     "weight": "1200 g",
@@ -119,7 +119,7 @@
     "looks_like": "wakizashi",
     "type": "GENERIC",
     "category": "weapons",
-    "weapon_category": [ "1H_SWORDS", "SHORT_SWORDS", "JAPANESE_SWORDS", "1H_JAPANESE_SWORDS" ],
+    "weapon_category": [ "1H_SWORDS", "SHORT_SWORDS", "JAPANESE_SWORDS" ],
     "name": { "str": "maid's umbrella (unsheathed)", "str_pl": "maid's umbrellas (unsheathed)" },
     "description": "The kind of fancy umbrella you imagine sharing with your Mistress on rainy days. The hidden blade is currently drawn.",
     "weight": "1000 g",
@@ -144,7 +144,7 @@
     "looks_like": "bokken",
     "type": "GENERIC",
     "category": "weapons",
-    "weapon_category": [ "1H_SWORDS", "JAPANESE_SWORDS", "1H_JAPANESE_SWORDS" ],
+    "weapon_category": [ "1H_SWORDS", "JAPANESE_SWORDS" ],
     "name": { "str": "maid's shirasaya" },
     "description": "A matching wooden handle and scabbard, consealing full length katana blade. It appears as a solid wooden stick to those unfamiliar with it, due to how well the handle and scabbard fit together. It reminds you of how well you and your Mistress fit together.", 
     "weight": "1350 g",
@@ -169,7 +169,7 @@
     "looks_like": "katana",
     "type": "GENERIC",
     "category": "weapons",
-    "weapon_category": [ "1H_SWORDS", "JAPANESE_SWORDS", "1H_JAPANESE_SWORDS" ],
+    "weapon_category": [ "1H_SWORDS", "JAPANESE_SWORDS" ],
     "name": { "str": "maid's shirasaya (unsheathed)", "str_pl": "maid's shirasayas (unsheathed)" },
     "description": "A matching wooden handle and scabbard, consealing full length katana blade. It appears as a solid wooden stick to those unfamiliar with it, due to how well the handle and scabbard fit together. It reminds you of how well you and your Mistress fit together.",
     "weight": "1350 g",
diff --git a/weapon_categories.json b/weapon_categories.json
index d2480b4..788a0aa 100644
--- a/weapon_categories.json
+++ b/weapon_categories.json
@@ -25,12 +25,6 @@
   },
   {
     "type": "weapon_category",
-    "id": "1H_JAPANESE_SWORDS",
-    "name": "1H Japanese Swords",
-    "//": "Swords associated with Japanese culture, meant to be wielded with one hand."
-  },
-  {
-    "type": "weapon_category",
     "id": "JAPANESE_GLAIVES",
     "name": "Japanese Glaives",
     "//": "More or less just naginatas."
@@ -116,75 +110,11 @@
     "extend": { "weapon_category": [ "CLAWS" ] }
   },
   {
-    "id": "bokken",
-    "copy-from": "bokken",
-    "type": "GENERIC",
-    "category": "weapons",
-    "name": { "str": "bokken" },
-    "extend": { "weapon_category": [ "1H_JAPANESE_SWORDS" ] }
-  },
-  {
-    "id": "wakizashi",
-    "copy-from": "wakizashi",
-    "type": "GENERIC",
-    "category": "weapons",
-    "name": { "str": "wakizashi" },
-    "extend": { "weapon_category": [ "1H_JAPANESE_SWORDS" ] }
-  },
-  {
-    "id": "katana",
-    "copy-from": "katana",
-    "type": "GENERIC",
-    "category": "weapons",
-    "name": { "str": "katana" },
-    "extend": { "weapon_category": [ "1H_JAPANESE_SWORDS" ] }
-  },
-  {
     "id": "naginata",
     "copy-from": "naginata",
     "type": "GENERIC",
     "category": "weapons",
     "name": { "str_sp": "naginata" },
     "extend": { "weapon_category": [ "JAPANESE_GLAIVES" ] }
-  },
-  {
-    "id": "cavalry_sabre",
-    "copy-from": "cavalry_sabre",
-    "type": "GENERIC",
-    "category": "weapons",
-    "name": { "str": "cavalry saber" },
-    "extend": { "weapon_category": [ "1H_MEDIEVAL_SWORDS" ] }
-  },
-  {
-    "id": "estoc",
-    "copy-from": "estoc",
-    "type": "GENERIC",
-    "category": "weapons",
-    "name": { "str": "estoc" },
-    "extend": { "weapon_category": [ "1H_MEDIEVAL_SWORDS" ] }
-  },
-  {
-    "id": "longsword",
-    "copy-from": "longsword",
-    "type": "GENERIC",
-    "category": "weapons",
-    "name": { "str": "longsword" },
-    "extend": { "weapon_category": [ "1H_MEDIEVAL_SWORDS" ] }
-  },
-  {
-    "id": "arming_sword",
-    "copy-from": "arming_sword",
-    "type": "GENERIC",
-    "category": "weapons",
-    "name": { "str": "arming sword" },
-    "extend": { "weapon_category": [ "1H_MEDIEVAL_SWORDS" ] }
-  },
-  {
-    "id": "broadsword",
-    "copy-from": "broadsword",
-    "type": "GENERIC",
-    "category": "weapons",
-    "name": { "str": "broadsword" },
-    "extend": { "weapon_category": [ "1H_MEDIEVAL_SWORDS" ] }
   }
 ]