From 5dc4e48d5a8adbf39b6d4d65823faff483bafe36 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Fri, 31 Mar 2023 15:59:47 -0700
Subject: Fix appliying custom weapon categories to existing items. -Extend is
 not supported for weapon_category.

---
 weapon_categories.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/weapon_categories.json b/weapon_categories.json
index 4bfef37..0d32f0a 100644
--- a/weapon_categories.json
+++ b/weapon_categories.json
@@ -34,14 +34,14 @@
     "copy-from": "base_utensil",
     "type": "GENERIC",
     "name": { "str": "generic utensil" },
-    "extend": { "weapon_category": [ "KITCHEN_IMPLEMENTS" ] }
+    "weapon_category": [ "KITCHEN_IMPLEMENTS" ]
   },
   {
     "id": "base_silverware",
     "copy-from": "base_silverware",
     "type": "GENERIC",
     "name": { "str": "generic silverware" },
-    "extend": { "weapon_category": [ "KITCHEN_IMPLEMENTS" ] }
+    "weapon_category": [ "KITCHEN_IMPLEMENTS" ]
   },
   {
     "id": "base_kitchen_knife",
@@ -49,49 +49,49 @@
     "type": "TOOL",
     "category": "tools",
     "name": { "str": "generic kitchen knife", "str_pl": "generic kitchen knives" },
-    "extend": { "weapon_category": [ "KITCHEN_IMPLEMENTS" ] }
+    "weapon_category": [ "KITCHEN_IMPLEMENTS" ]
   },
   {
     "id": "pan",
     "copy-from": "pan",
     "type": "GENERIC",
     "name": { "str": "cast-iron frying pan" },
-    "extend": { "weapon_category": [ "KITCHEN_IMPLEMENTS" ] }
+    "weapon_category": [ "KITCHEN_IMPLEMENTS" ]
   },
   {
     "id": "steel_pan",
     "copy-from": "steel_pan",
     "type": "GENERIC",
     "name": { "str": "steel frying pan" },
-    "extend": { "weapon_category": [ "KITCHEN_IMPLEMENTS" ] }
+    "weapon_category": [ "KITCHEN_IMPLEMENTS" ]
   },
   {
     "id": "copper_pan",
     "copy-from": "copper_pan",
     "type": "GENERIC",
     "name": { "str": "copper frying pan" },
-    "extend": { "weapon_category": [ "KITCHEN_IMPLEMENTS" ] }
+    "weapon_category": [ "KITCHEN_IMPLEMENTS" ]
   },
   {
     "id": "broom",
     "copy-from": "broom",
     "type": "GENERIC",
     "name": { "str": "broom" },
-    "extend": { "weapon_category": [ "CLEANING_IMPLEMENTS" ] }
+    "weapon_category": [ "CLEANING_IMPLEMENTS" ]
   },
   {
     "id": "mop",
     "copy-from": "mop",
     "type": "GENERIC",
     "name": { "str": "mop" },
-    "extend": { "weapon_category": [ "CLEANING_IMPLEMENTS" ] }
+    "weapon_category": [ "CLEANING_IMPLEMENTS" ]
   },
   {
     "id": "umbrella",
     "copy-from": "umbrella",
     "type": "GENERIC",
     "name": { "str": "umbrella" },
-    "extend": { "weapon_category": [ "UMBRELLAS" ] }
+    "weapon_category": [ "BATONS", "UMBRELLAS" ]
   },
   {
     "id": "bagh_nakha",
@@ -99,7 +99,7 @@
     "type": "GENERIC",
     "category": "weapons",
     "name": { "str_sp": "tiger claws" },
-    "extend": { "weapon_category": [ "CLAWS" ] }
+    "weapon_category": [ "FIST_WEAPONS", "CLAWS" ]
   },
   {
     "id": "knuckle_katar",
@@ -107,7 +107,7 @@
     "type": "GENERIC",
     "category": "weapons",
     "name": { "str": "razorbar katar" },
-    "extend": { "weapon_category": [ "CLAWS" ] }
+    "weapon_category": [ "FIST_WEAPONS", "CLAWS" ]
   },
   {
     "id": "naginata",
@@ -115,6 +115,6 @@
     "type": "GENERIC",
     "category": "weapons",
     "name": { "str_sp": "naginata" },
-    "extend": { "weapon_category": [ "JAPANESE_GLAIVES" ] }
+    "weapon_category": [ "GLAIVES", "JAPANESE_GLAIVES" ]
   }
 ]
-- 
cgit v1.2.1