diff --git a/data/json/flags.json b/data/json/flags.json index b95695769f0ec..d3d58bb655d66 100644 --- a/data/json/flags.json +++ b/data/json/flags.json @@ -391,6 +391,12 @@ "//": "Prevents the item from participating in the encumbrance system when worn.", "info": "It seems partially intangible, and can occupy the same space as other things when worn." }, + { + "id": "SHEATH_AXE", + "type": "json_flag", + "context": [ "GENERIC", "TOOL" ], + "//": "This item can be stored in a sheath of the appropriate size." + }, { "id": "SHEATH_KNIFE", "type": "json_flag", diff --git a/data/json/items/armor.json b/data/json/items/armor.json index 4a7fdbea46677..3600d44c8f6df 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -745,6 +745,32 @@ "material_thickness": 1, "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT" ] }, + { + "id": "axe_ring", + "type": "ARMOR", + "name": "axe ring holster", + "description": "A combination of leather and a metal ring to hold an axe on your waist.", + "weight": "130 g", + "volume": "600 ml", + "price": 3000, + "material": [ "leather", "steel" ], + "symbol": "[", + "looks_like": "sheath", + "color": "brown", + "covers": [ "TORSO" ], + "coverage": 5, + "encumbrance": 2, + "material_thickness": 1, + "use_action": { + "type": "holster", + "holster_prompt": "Sheath axe", + "holster_msg": "You sheath your %s", + "max_volume": "3250 ml", + "draw_cost": 10, + "flags": [ "SHEATH_AXE" ] + }, + "flags": [ "NONCONDUCTIVE", "WAIST", "OVERSIZE", "WATER_FRIENDLY" ] + }, { "id": "b_shorts", "type": "ARMOR", diff --git a/data/json/items/melee.json b/data/json/items/melee.json index 2eecb98fd47b4..144c9e295d29e 100644 --- a/data/json/items/melee.json +++ b/data/json/items/melee.json @@ -63,7 +63,7 @@ "volume": "1 L", "bashing": 13, "cutting": 7, - "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE" ], + "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ], "to_hit": 1, "category": "weapons", "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "BUTCHER", 16 ] ] @@ -541,7 +541,7 @@ "price": 1050, "price_postapoc": 300, "material": [ "aluminum", "wood" ], - "flags": "NONCONDUCTIVE", + "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ], "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], "weight": "2068 g", "volume": "3250 ml", @@ -563,7 +563,7 @@ "volume": "2500 ml", "bashing": 16, "cutting": 24, - "flags": [ "NONCONDUCTIVE" ], + "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ], "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], "to_hit": 1, "category": "weapons", @@ -619,7 +619,7 @@ "color": "dark_gray", "qualities": [ [ "DIG", 2 ], [ "AXE", 1 ], [ "CUT", 1 ], [ "BUTCHER", -11 ], [ "COOK", 1 ] ], "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], - "flags": [ "NEEDS_UNFOLD", "BELT_CLIP" ] + "flags": [ "NEEDS_UNFOLD", "BELT_CLIP", "SHEATH_AXE" ] }, { "id": "tazer", @@ -664,7 +664,7 @@ "color": "light_gray", "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -20 ] ], - "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ] + "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_AXE" ] }, { "id": "ax", @@ -682,6 +682,6 @@ "color": "light_gray", "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -36 ] ], "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], - "flags": [ "NONCONDUCTIVE" ] + "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ] } ] diff --git a/data/json/items/tools.json b/data/json/items/tools.json index de9a61712e348..0fbcf1c9e060a 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -1466,7 +1466,7 @@ "color": "brown", "qualities": [ [ "AXE", 1 ], [ "BUTCHER", -44 ] ], "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], - "flags": [ "NONCONDUCTIVE" ] + "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ] }, { "id": "copper_knife", @@ -1577,7 +1577,7 @@ "volume": "1 L", "bashing": 13, "cutting": 7, - "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE" ], + "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ], "to_hit": 1, "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "PRY", 2 ], [ "BUTCHER", 16 ] ] }, @@ -2270,7 +2270,7 @@ "color": "light_gray", "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], "qualities": [ [ "AXE", 2 ], [ "PRY", 3 ], [ "BUTCHER", -30 ] ], - "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "BELT_CLIP" ], + "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "BELT_CLIP", "SHEATH_AXE" ], "use_action": "CROWBAR" }, { @@ -3244,7 +3244,7 @@ "techniques": [ "WBLOCK_1" ], "qualities": [ [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "PRY", 2 ] ], "use_action": "CROWBAR", - "flags": [ "DURABLE_MELEE", "BELT_CLIP" ] + "flags": [ "DURABLE_MELEE", "BELT_CLIP", "SHEATH_AXE" ] }, { "id": "jackhammer", @@ -4526,7 +4526,7 @@ "color": "dark_gray", "use_action": "PICKAXE", "techniques": [ "WBLOCK_1" ], - "flags": [ "SPEAR", "DURABLE_MELEE", "NONCONDUCTIVE", "DIG_TOOL" ] + "flags": [ "SPEAR", "DURABLE_MELEE", "NONCONDUCTIVE", "DIG_TOOL", "SHEATH_AXE" ] }, { "id": "picklocks", @@ -4772,7 +4772,7 @@ "symbol": "/", "color": "light_gray", "qualities": [ [ "AXE", 1 ], [ "BUTCHER", -70 ] ], - "flags": [ "BELT_CLIP" ] + "flags": [ "BELT_CLIP", "SHEATH_AXE" ] }, { "id": "primitive_hammer", @@ -7277,7 +7277,8 @@ "material": "stone", "symbol": ";", "color": "light_gray", - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 6 ], [ "SAW_W", 1 ], [ "AXE", 1 ], [ "HAMMER", 1 ] ] + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 6 ], [ "SAW_W", 1 ], [ "AXE", 1 ], [ "HAMMER", 1 ] ], + "flags": [ "SHEATH_AXE" ] }, { "id": "makeshift_axe", @@ -7285,7 +7286,8 @@ "type": "TOOL", "name": "metal hand axe", "description": "This is a chunk of steel with one edge hammered down to something resembling a cutting edge. It works passably well as an axe but really can't compare to a proper axe.", - "material": "steel" + "material": "steel", + "flags": [ "SHEATH_AXE" ] }, { "id": "pin_reamer", diff --git a/data/json/professions.json b/data/json/professions.json index 63b33c143352a..5e86b8d887f85 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -1409,7 +1409,7 @@ "points": 0, "items": { "both": { - "items": [ "jeans", "socks", "boots", "hat_hunting", "jacket_flannel", "knit_scarf", "vest", "wristwatch" ], + "items": [ "jeans", "socks", "boots", "hat_hunting", "jacket_flannel", "knit_scarf", "vest", "wristwatch", "axe_ring" ], "entries": [ { "group": "charged_cell_phone" }, { "item": "ax", "custom-flags": [ "auto_wield" ] } ] }, "male": [ "boxer_shorts" ], diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 0cd1726f3eb92..a4785e43a926b 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -51,6 +51,19 @@ "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "leather", 5 ], [ "rag", 5 ] ], [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ] ], [ [ "filament", 20, "LIST" ] ] ] }, + { + "result": "axe_ring", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 4, + "time": "20 m", + "autolearn": true, + "using": [ [ "adhesive", 1 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ], + "components": [ [ [ "leather", 5 ] ], [ [ "scrap", 3 ] ], [ [ "nail", 4 ] ] ] + }, { "result": "back_holster", "type": "recipe",