Convert to weapon categories.

9 files changed, 12 insertions, 315 deletions

diff --git a/martialarts/aikido.json b/martialarts/aikido.json
index 555cedb..2e4329e 100644
--- a/martialarts/aikido.json
+++ b/martialarts/aikido.json
@@ -81,13 +81,6 @@
       "tec_aikido_dodgethrow",
       "tec_aikido_blockthrow"
     ],
-    "weapons": [
-      "bagh_nakha",
-      "bio_claws_weapon",
-      "cestus",
-      "knuckle_brass",
-      "knuckle_nail",
-      "knuckle_steel"
-    ]
+    "weapon_category": [ "FIST_WEAPONS" ]
   }
 ]
diff --git a/martialarts/barbaran.json b/martialarts/barbaran.json
index 2f22ce5..2a580a3 100644
--- a/martialarts/barbaran.json
+++ b/martialarts/barbaran.json
@@ -76,31 +76,6 @@
       }
     ],
     "techniques": [ "tec_barbaran_impale", "tec_barbaran_disarm" ],
-    "weapons": [
-      "2h_flail_steel",
-      "2h_flail_wood",
-      "battleaxe",
-      "battleaxe_inferior",
-      "battleaxe_fake",
-      "hammer_sledge",
-      "hammer_sledge_heavy",
-      "longsword",
-      "longsword_inferior",
-      "longsword_fake",
-      "mace",
-      "mace_inferior",
-      "mace_fake",
-      "morningstar",
-      "morningstar_inferior",
-      "morningstar_fake",
-      "sword_nail",
-      "sword_crude",
-      "sword_metal",
-      "sword_wood",
-      "warhammer",
-      "zweihander",
-      "zweihander_inferior",
-      "zweihander_fake"
-    ]
+    "weapon_category": [ "MEDIEVAL_SWORDS" ]
   }
 ]
diff --git a/martialarts/fencing.json b/martialarts/fencing.json
index 09dea1c..cf09a55 100644
--- a/martialarts/fencing.json
+++ b/martialarts/fencing.json
@@ -51,35 +51,7 @@
       }
     ],
     "techniques": [ "tec_fencing_feint", "tec_fencing_lunge", "tec_fencing_riposte", "tec_fencing_compound1", "tec_fencing_compound2" ],
-    "weapons": [
-      "baton-extended",
-      "broadsword",
-      "broadsword_inferior",
-      "broadsword_fake",
-      "cane",
-      "cavalry_sabre",
-      "cavalry_sabre_fake",
-      "cudgel",
-      "hollow_cane",
-      "fencing_foil",
-      "fencing_sabre",
-      "fencing_epee",
-      "fencing_foil_sharpened",
-      "fencing_sabre_sharpened",
-      "fencing_epee_sharpened",
-      "shock_foil",
-      "shock_sabre",
-      "shock_epee",
-      "pointy_stick",
-      "pipe",
-      "PR24-extended",
-      "rapier",
-      "rapier_fake",
-      "shillelagh",
-      "shillelagh_fake",
-      "shillelagh_weighted",
-      "sword_cane",
-      "umbrella"
-    ]
+    "weapon_category": [ "BATONS", "DUELING_SWORDS" ],
+    "weapons": [ "broadsword", "broadsword_inferior", "broadsword_fake", "cavalry_sabre", "cavalry_sabre_fake" ]
   }
 ]
diff --git a/martialarts/kravmaga.json b/martialarts/kravmaga.json
index 83ce91c..05b334a 100644
--- a/martialarts/kravmaga.json
+++ b/martialarts/kravmaga.json
@@ -36,91 +36,6 @@
       }
     ],
     "techniques": [ "tec_krav_maga_rapid", "tec_krav_maga_crit", "tec_krav_maga_takedown", "tec_krav_maga_disarm", "tec_krav_maga_break" ],
-    "weapons": [
-      "baton-extended",
-      "butterfly_swords",
-      "copper_knife",
-      "cudgel",
-      "diveknife",
-      "honey_scraper",
-      "knife_combat",
-      "knife_combat_mod",
-      "knife_folding",
-      "knife_hunting",
-      "knife_rambo",
-      "knife_rm42",
-      "knife_trench",
-      "makeshift_knife",
-      "PR24-extended",
-      "shocktonfa_off",
-      "shocktonfa_on",
-      "switchblade",
-      "tonfa",
-      "tonfa_wood",
-      "af2011a1_38super",
-      "cz75",
-      "deagle_44",
-      "fn1910",
-      "fn57",
-      "glock_17",
-      "glock_18c",
-      "glock_19",
-      "glock_22",
-      "glock_31",
-      "hi_power_9mm",
-      "hi_power_40",
-      "hptjcp",
-      "hptjhp",
-      "m17",
-      "m1911",
-      "m1911_MEU",
-      "m1911a1_38super",
-      "m9",
-      "mk23",
-      "needlepistol",
-      "sw_22",
-      "p226_357sig",
-      "p320_357sig",
-      "sig_40",
-      "sig_p230",
-      "sig_mosquito",
-      "tokarev",
-      "usp_45",
-      "usp_9mm",
-      "walther_ccp",
-      "walther_p38",
-      "walther_ppk",
-      "walther_ppq_9mm",
-      "walther_ppq_40",
-      "walther_ppq_45",
-      "acr",
-      "acr_300blk",
-      "ak47",
-      "ak74",
-      "an94",
-      "ar10",
-      "ar15",
-      "ar15_retool_300blk",
-      "fn_fal",
-      "h&k416a5",
-      "hk417_13",
-      "hk_g3",
-      "hk_g36",
-      "iwi_tavor_x95_300blk",
-      "m1a",
-      "m110a1",
-      "m14ebr",
-      "m16a4",
-      "m27iar",
-      "m4a1",
-      "rm51_assault_rifle",
-      "rm88_battle_rifle",
-      "ruger_mini",
-      "scar_l",
-      "scar_h",
-      "sig552",
-      "sks",
-      "steyr_aug"
-    ]
+    "weapon_category": [ "PISTOLS", "REVOLVERS", "RIFLES", "SHOTGUNS", "KNIVES", "BATONS", "TONFAS" ]
   }
 ]
diff --git a/martialarts/medievalpole.json b/martialarts/medievalpole.json
index e133ac3..8840adb 100644
--- a/martialarts/medievalpole.json
+++ b/martialarts/medievalpole.json
@@ -70,27 +70,6 @@
       "tec_medievalpole_execute",
       "tec_medievalpole_break"
     ],
-    "weapons": [
-      "ax",
-      "battleaxe",
-      "battleaxe_fake",
-      "battleaxe_inferior",
-      "copper_ax",
-      "fire_ax",
-      "glaive",
-      "halberd",
-      "halberd_fake",
-      "hammer_sledge",
-      "hammer_sledge_short",
-      "hockey_stick",
-      "hoe",
-      "ji",
-      "lobotomizer",
-      "lucern_hammer",
-      "lucern_hammerfake",
-      "makeshift_halberd",
-      "pickaxe",
-      "primitive_axe"
-    ]
+    "weapon_category": [ "HOOKED_POLES", "1H_AXES", "2H_AXES", "1H_HAMMERS", "2H_HAMMERS", "GLAIVES" ]
   }
 ]
diff --git a/martialarts/ninjutsu.json b/martialarts/ninjutsu.json
index cc47d33..a0aa49a 100644
--- a/martialarts/ninjutsu.json
+++ b/martialarts/ninjutsu.json
@@ -74,79 +74,7 @@
       }
     ],
     "techniques": [ "tec_ninjutsu_swift", "tec_ninjutsu_swift_crit", "tec_ninjutsu_takedown", "tec_ninjutsu_precise" ],
-    "weapons": [
-      "arming_sword",
-      "arming_sword_inferior",
-      "arming_sword_fake",
-      "bio_blade_weapon",
-      "bio_claws_weapon",
-      "bokken",
-      "bokken_inferior",
-      "bokken_fake",
-      "broadsword",
-      "broadsword_inferior",
-      "broadsword_fake",
-      "butterfly_swords",
-      "cavalry_sabre",
-      "cavalry_sabre_fake",
-      "copper_knife",
-      "cutlass_fake",
-      "cutlass_inferior",
-      "cutlass",
-      "dao",
-      "diveknife",
-      "glass_macuahuitl",
-      "i_staff",
-      "jian",
-      "jian_inferior",
-      "jian_fake",
-      "katana",
-      "katana_inferior",
-      "katana_fake",
-      "kirpan",
-      "knife_baselard",
-      "knife_combat",
-      "knife_hunting",
-      "knife_rambo",
-      "knife_rm42",
-      "knife_trench",
-      "kirpan_cheap",
-      "kris",
-      "kukri",
-      "khopesh",
-      "longsword",
-      "longsword_inferior",
-      "longsword_fake",
-      "l-stick",
-      "l-stick_on",
-      "machete",
-      "makeshift_machete",
-      "makeshift_knife",
-      "nodachi",
-      "nodachi_inferior",
-      "nodachi_fake",
-      "q_staff",
-      "scimitar",
-      "scimitar_fake",
-      "scimitar_inferior",
-      "shillelagh",
-      "shillelagh_fake",
-      "shillelagh_weighted",
-      "shock_staff",
-      "sickle",
-      "switchblade",
-      "sword_bayonet",
-      "sword_crude",
-      "sword_nail",
-      "sword_wood",
-      "sword_metal",
-      "sword_xiphos",
-      "tanto",
-      "tanto_inferior",
-      "tanto_fake",
-      "wakizashi",
-      "wakizashi_inferior",
-      "wakizashi_fake"
-    ]
+    "weapon_category": [ "1H_SWORDS", "JAPANESE_SWORDS", "BATONS", "QUARTERSTAVES", "BIONIC_WEAPONRY" ],
+    "weapons": [ "sickle" ]
   }
 ]
diff --git a/martialarts/niten.json b/martialarts/niten.json
index 62005e9..71d126c 100644
--- a/martialarts/niten.json
+++ b/martialarts/niten.json
@@ -72,24 +72,6 @@
       }
     ],
     "techniques": [ "niten_water_cut", "niten_red_leaf", "niten_stone_cut", "niten_timing_attack", "niten_feint" ],
-    "weapons": [
-      "bokken",
-      "bokken_inferior",
-      "bokken_fake",
-      "glass_macuahuitl",
-      "katana",
-      "katana_inferior",
-      "katana_fake",
-      "nodachi",
-      "nodachi_inferior",
-      "nodachi_fake",
-      "sword_nail",
-      "sword_crude",
-      "sword_wood",
-      "sword_metal",
-      "wakizashi",
-      "wakizashi_inferior",
-      "wakizashi_fake"
-    ]
+    "weapon_category": [ "JAPANESE_SWORDS", "BIONIC_WEAPONRY" ]
   }
 ]
diff --git a/martialarts/sojutsu.json b/martialarts/sojutsu.json
index 1488746..dbf3f65 100644
--- a/martialarts/sojutsu.json
+++ b/martialarts/sojutsu.json
@@ -36,33 +36,6 @@
       }
     ],
     "techniques": [ "tec_sojutsu_feint", "tec_sojutsu_shove", "tec_sojutsu_trip" ],
-    "weapons": [
-      "glaive",
-      "halberd",
-      "halberd_fake",
-      "ji",
-      "naginata",
-      "naginata_inferior",
-      "naginata_fake",
-      "long_pole",
-      "makeshift_halberd",
-      "pike",
-      "pike_inferior",
-      "pike_fake",
-      "pitchfork",
-      "qiang",
-      "spear_copper",
-      "spear_dory",
-      "spear_forked",
-      "spear_homemade_halfpike",
-      "spear_pipe",
-      "spear_knife",
-      "spear_knife_superior",
-      "spear_spike",
-      "spear_rebar",
-      "spear_steel",
-      "spear_survivor",
-      "spear_wood"
-    ]
+    "weapon_category": [ "SPEARS", "PIKES", "GLAIVES", "2H_AXES" ]
   }
 ]
diff --git a/martialarts/swordsmanship.json b/martialarts/swordsmanship.json
index ce1bae1..a77ec90 100644
--- a/martialarts/swordsmanship.json
+++ b/martialarts/swordsmanship.json
@@ -57,27 +57,7 @@
       }
     ],
     "techniques": [ "tec_swordsmanship_feint", "tec_swordsmanship_lethal", "tec_swordsmanship_ringen" ],
-    "weapons": [
-      "arming_sword",
-      "arming_sword_inferior",
-      "arming_sword_fake",
-      "broadsword",
-      "broadsword_inferior",
-      "broadsword_fake",
-      "estoc",
-      "estoc_inferior",
-      "estoc_fake",
-      "glass_macuahuitl",
-      "longsword",
-      "longsword_inferior",
-      "longsword_fake",
-      "sword_crude",
-      "sword_nail",
-      "sword_wood",
-      "sword_metal",
-      "zweihander",
-      "zweihander_inferior",
-      "zweihander_fake"
-    ]
+    "weapon_category": [ "MEDIEVAL_SWORDS" ],
+    "weapons": [ "glass_macuahuitl" ]
   }
 ]