diff --git a/data/json/items/tool/entry_tools.json b/data/json/items/tool/entry_tools.json index 06f02a874f0e..6061bc9dfdbc 100644 --- a/data/json/items/tool/entry_tools.json +++ b/data/json/items/tool/entry_tools.json @@ -3,7 +3,7 @@ "id": "crowbar", "type": "GENERIC", "category": "tools", - "weapon_category": [ "CLUBS", "HOOKED_POLES" ], + "weapon_category": [ "CLUBS", "1H_HOOKED" ], "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", @@ -61,7 +61,7 @@ "id": "makeshift_crowbar", "type": "GENERIC", "category": "tools", - "weapon_category": [ "CLUBS", "HOOKED_POLES" ], + "weapon_category": [ "CLUBS", "1H_HOOKED" ], "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", diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json index 546b0220200d..a8b9046f1f53 100644 --- a/data/json/items/tool/landscaping.json +++ b/data/json/items/tool/landscaping.json @@ -121,7 +121,7 @@ "id": "sickle", "type": "GENERIC", "category": "tools", - "weapon_category": [ "SHORT_SWORDS", "HOOKED_POLES" ], + "weapon_category": [ "1H_HOOKED" ], "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", diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index 6ca628a1f0e1..bfd104cf31b3 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -209,7 +209,7 @@ "id": "primitive_adze", "type": "GENERIC", "category": "tools", - "weapon_category": [ "HOOKED_POLES" ], + "weapon_category": [ "1H_HOOKED" ], "name": { "str": "stone adze" }, "description": "This is a stone adze, somewhat useful for smoothing wood objects.", "weight": "1300 g", diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 2bae8eb46fbb..53eb355a4ff1 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -161,7 +161,7 @@ "id": "claw_bar", "type": "GENERIC", "category": "tools", - "weapon_category": [ "CLUBS", "HOOKED_POLES" ], + "weapon_category": [ "CLUBS", "1H_HOOKED" ], "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", diff --git a/data/json/martialarts.json b/data/json/martialarts.json index ec20f3258fab..3fbb794cc919 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -501,7 +501,7 @@ "tec_medievalpole_execute", "tec_medievalpole_break" ], - "weapon_category": [ "HOOKED_POLES", "1H_AXES", "2H_AXES", "1H_HAMMERS", "2H_HAMMERS", "GLAIVES" ] + "weapon_category": [ "1H_HOOKED", "HOOKED_POLES", "1H_AXES", "2H_AXES", "1H_HAMMERS", "2H_HAMMERS", "GLAIVES" ] }, { "type": "martial_art", @@ -995,7 +995,7 @@ ], "techniques": [ "tec_silat_hamstring", "tec_silat_precise", "tec_silat_brutal", "tec_silat_dirty" ], "weapon_category": [ "KNIVES", "BATONS", "TONFAS", "QUARTERSTAVES", "SPEARS", "GLAIVES" ], - "weapons": [ "sickle", "scythe", "hockey_stick", "golf_club" ] + "weapons": [ "machete", "makeshift_machete", "survivor_machete", "sickle", "scythe", "hockey_stick", "golf_club" ] }, { "type": "martial_art", diff --git a/data/json/weapon_categories.json b/data/json/weapon_categories.json index 27016dca10c5..7b083affa1a7 100644 --- a/data/json/weapon_categories.json +++ b/data/json/weapon_categories.json @@ -125,6 +125,12 @@ "name": "Whips", "//": "Flexible tool used to strike at range." }, + { + "type": "weapon_category", + "id": "1H_HOOKED", + "name": "One-handed Hooking", + "//": "One handed weapon with hooking capability that doesn't fall under traditional classification (ie: not a hammer or an axe)." + }, { "type": "weapon_category", "id": "HOOKED_POLES", diff --git a/doc/src/content/docs/en/mod/json/reference/json_info.md b/doc/src/content/docs/en/mod/json/reference/json_info.md index 529437df93ca..c2d5a1529768 100644 --- a/doc/src/content/docs/en/mod/json/reference/json_info.md +++ b/doc/src/content/docs/en/mod/json/reference/json_info.md @@ -1828,6 +1828,8 @@ container. It could also be written as a generic item ("type": "GENERIC") with " | --- | --- | | WHIPS | Flexible tool used to strike at range. | | --- | --- | +| 1H_HOOKED | One handed weapon with hooking capability. (and isn't an axe or hammer) | +| --- | --- | | HOOKED_POLES | Polearm with hooked end (Like a shepherd's crook) | | SPEARS | Polearm with a long shaft and a sharp tip made of hard material. | | PIKES | Very long spear that can only be wielded in two hands, very unwieldy. |