Add weapon categories to more tools

data/json/items/melee/bludgeons.json

@@ -425,7 +425,7 @@
     "id": "homewrecker",
     "type": "GENERIC",
     "category": "weapons",
-    "weapon_category": [ "1H_HAMMERS" ],
+    "weapon_category": [ "FLAILS" ],
     "name": { "str": "homewrecker" },
     "description": "A long piece of wood with several chunks of steel firmly tied to it.  The resulting weapon is unwieldy and slow but very heavy hitting.",
     "weight": "3024 g",

data/json/items/melee/swords_and_blades.json

@@ -1333,6 +1333,7 @@
     "id": "cs_lajatang_off",
     "type": "TOOL",
     "category": "weapons",
+    "weapon_category": [ "GLAIVES" ],
     "name": { "str": "chainsaw lajatang (off)", "str_pl": "chainsaw lajatangs (off)" },
     "description": "A long wooden pole with chainsaws impractically attached to both ends.  The product of either genius or insanity, but not both; the weight ensures that only someone both strong and very skilled could possibly hope to use it.",
     "weight": "14254 g",
@@ -1372,6 +1373,7 @@
     "id": "ecs_lajatang_off",
     "type": "TOOL",
     "category": "weapons",
+    "weapon_category": [ "GLAIVES" ],
     "name": { "str": "electric chainsaw lajatang (off)", "str_pl": "electric chainsaw lajatangs (off)" },
     "description": "A long wooden pole with electric chainsaws impractically attached to both ends.  The product of either genius or insanity, but not both; the weight ensures that only someone both strong and very skilled could possibly hope to use it.",
     "weight": "14254 g",
@@ -1486,6 +1488,7 @@
     "id": "lajatang",
     "symbol": "/",
     "color": "brown",
+    "weapon_category": [ "GLAIVES" ],
     "name": { "str": "lajatang" },
     "description": "An exotic weapon comprised of a long pole of wood with curved blades on each end.  It can be deadly in skilled hands.",
     "price": 12000,

data/json/items/tool/entry_tools.json

@@ -3,6 +3,7 @@
     "id": "crowbar",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "CLUBS", "HOOKED_POLES" ],
     "name": { "str": "crowbar" },
     "description": "This is a hefty prying tool.  Use it to open locked doors without destroying them or to lift manhole covers.  You could also wield it to bash some heads in.",
     "weight": "1200 g",
@@ -40,6 +41,7 @@
     "id": "iceaxe",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "HAND_AXES" ],
     "name": { "str": "ice axe" },
     "description": "This is an ice axe with hammer on its head, a multi-purpose hiking and climbing tool used by mountaineers.  It is sturdy enough to pry open closed doors or lift manhole covers.",
     "weight": "500 g",
@@ -60,6 +62,7 @@
     "id": "makeshift_crowbar",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "CLUBS", "HOOKED_POLES" ],
     "name": { "str": "makeshift crowbar" },
     "description": "This is a pipe whose ends have been bent and hammered flat to resemble a crowbar.  Use it to open locked crates without destroying them, to lift manhole covers, or even open doors and windows.  You could also wield it to fight with, in a pinch.",
     "weight": "1250 g",

data/json/items/tool/landscaping.json

@@ -3,6 +3,7 @@
     "id": "digging_stick",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "CLUBS" ],
     "name": { "str": "digging stick" },
     "description": "This is a large stick, with the end carved into a broad blade for digging.  It could be used to dig shallow pits, but not deep ones.",
     "weight": "1133 g",
@@ -60,6 +61,7 @@
     "id": "primitive_shovel",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "CLUBS" ],
     "name": { "str": "stone shovel" },
     "description": "This is a flattened stone affixed to a stick.  It works passably well as a shovel but really can't compare to a real shovel.",
     "weight": "1581 g",
@@ -77,6 +79,7 @@
     "id": "scythe",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "HOOKED_POLES" ],
     "name": { "str": "scythe" },
     "description": "This is an old-fashioned farming tool used to cut tall grass.  While it may be a giant blade on the end of a stick, it is incredibly awkward to use for anything but its intended purpose.",
     "weight": "3013 g",
@@ -97,6 +100,7 @@
     "id": "shovel",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "CLUBS" ],
     "name": { "str": "shovel" },
     "description": "This is a digging tool.  Use it to dig pits adjacent to your location.",
     "weight": "1315 g",
@@ -117,6 +121,7 @@
     "id": "sickle",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "SHORT_SWORDS", "HOOKED_POLES" ],
     "name": { "str": "sickle" },
     "description": "This is an old-fashioned farming tool used to cut tall grass.  While it may be a massive curved blade on a handle, it is incredibly awkward to use for anything but its intended purpose.",
     "weight": "1432 g",

data/json/items/tool/lighting.json

@@ -382,6 +382,7 @@
     "id": "heavy_flashlight",
     "type": "TOOL",
     "category": "tools",
+    "weapon_category": [ "BATONS" ],
     "name": { "str": "heavy duty flashlight (off)", "str_pl": "heavy duty flashlights (off)" },
     "description": "This is a heavy duty tubular aluminum LED flashlight as often used by security guards.  Makes for a passable melee weapon.  Using this flashlight will turn it on and provide light, assuming it is charged with batteries.",
     "weight": "450 g",
@@ -662,6 +663,7 @@
     "id": "torch",
     "type": "TOOL",
     "category": "tools",
+    "weapon_category": [ "CLUBS" ],
     "name": { "str": "torch", "str_pl": "torches" },
     "description": "This is a large stick, wrapped in rags that are soaked with a flammable material.  When lit, produces a fair amount of light.  You'll need a lighter or matches to light it.",
     "weight": "831 g",
@@ -690,6 +692,7 @@
     "id": "torch_lit",
     "type": "TOOL",
     "category": "tools",
+    "weapon_category": [ "CLUBS" ],
     "name": { "str": "torch", "str_pl": "torches" },
     "description": "This is a large stick, wrapped in rags that are soaked with a flammable material.  It is burning, producing plenty of light.",
     "weight": "831 g",

data/json/items/tool/med.json

@@ -83,6 +83,7 @@
     "id": "scalpel",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "KNIVES" ],
     "name": { "str": "scalpel" },
     "description": "This is a very sharp knife designed for surgical cutting.  Its small, sharp blade allows for precision strikes in the hands of the skilled.",
     "weight": "23 g",

data/json/items/tool/misc.json

@@ -242,6 +242,7 @@
     "id": "e_tool",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "CLUBS" ],
     "name": { "str": "entrenching tool" },
     "description": "This is a stout collapsible spade.  It's commonly used by military forces and favored by hikers for digging.  This was a popular weapon during WW1.",
     "weight": "628 g",

data/json/items/tool/woodworking.json

@@ -130,6 +130,7 @@
     "id": "hatchet",
     "type": "GENERIC",
     "category": "weapons",
+    "weapon_category": [ "HAND_AXES" ],
     "symbol": ";",
     "color": "light_gray",
     "name": { "str": "hatchet" },
@@ -196,6 +197,7 @@
     "id": "primitive_adze",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "HOOKED_POLES" ],
     "name": { "str": "stone adze" },
     "description": "This is a stone adze, somewhat useful for smoothing wood objects.",
     "weight": "1300 g",

data/json/items/tool/workshop.json

@@ -162,6 +162,7 @@
     "id": "claw_bar",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "CLUBS", "HOOKED_POLES" ],
     "name": { "str": "claw bar" },
     "description": "This is a small prying tool with a clawed bend at one end for pulling spikes.  Use it to open locked doors without destroying them or to lift manhole covers.  You could also wield it to bash some heads in.",
     "weight": "340 g",
@@ -753,6 +754,7 @@
     "id": "primitive_hammer",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "1H_HAMMERS" ],
     "name": { "str": "stone hammer" },
     "description": "This is a rock affixed to a stick, in the crude facsimile of a hammer.  It functions adequately as a hammer, but really can't compare to a proper one.",
     "weight": "1020 g",
@@ -772,6 +774,7 @@
     "id": "screwdriver",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "KNIVES" ],
     "name": { "str": "screwdriver" },
     "description": "This is a Philips-head screwdriver.  It is important for almost all electronics crafting, most mechanics crafting, and has many more uses.",
     "weight": "170 g",
@@ -850,6 +853,7 @@
     "id": "soldering_iron",
     "type": "TOOL",
     "category": "tools",
+    "weapon_category": [ "KNIVES" ],
     "name": { "str": "soldering iron" },
     "description": "This is a device with a metal tip that can get very hot.  It is necessary for advanced electronics crafting.  You could also use it to cauterize wounds, if you had to.",
     "weight": "181 g",
@@ -1084,6 +1088,7 @@
     "id": "wood_smoother",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "CLUBS" ],
     "name": { "str": "wooden smoother" },
     "description": "This large makeshift tool is used in smoothing concrete or mortar in construction projects.  You could also use it as an improvised head-basher.",
     "weight": "2000 g",
@@ -1117,6 +1122,7 @@
     "id": "xacto",
     "type": "GENERIC",
     "category": "tools",
+    "weapon_category": [ "KNIVES" ],
     "name": { "str": "X-Acto knife", "str_pl": "X-Acto knives" },
     "description": "This is a small, sharp knife, designed for making precise cuts for textiles or crafts.  It could cause decent damage, but is difficult to hit things with it.  Its small, sharp blade allows for precision strikes in the hands of the skilled.  It is too small to butcher corpses with.",
     "weight": "23 g",