Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Axe ring holster #36521

Merged
merged 13 commits into from
Dec 30, 2019
6 changes: 6 additions & 0 deletions data/json/flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,12 @@
"//": "Prevents the item from participating in the encumbrance system when worn.",
"info": "It seems <info>partially intangible</info>, 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",
Expand Down
26 changes: 26 additions & 0 deletions data/json/items/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions data/json/items/melee.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ]
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -682,6 +682,6 @@
"color": "light_gray",
"qualities": [ [ "AXE", 2 ], [ "BUTCHER", -36 ] ],
"techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
"flags": [ "NONCONDUCTIVE" ]
"flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ]
}
]
18 changes: 10 additions & 8 deletions data/json/items/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 ] ]
},
Expand Down Expand Up @@ -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"
},
{
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -4772,7 +4772,7 @@
"symbol": "/",
"color": "light_gray",
"qualities": [ [ "AXE", 1 ], [ "BUTCHER", -70 ] ],
"flags": [ "BELT_CLIP" ]
"flags": [ "BELT_CLIP", "SHEATH_AXE" ]
},
{
"id": "primitive_hammer",
Expand Down Expand Up @@ -7277,15 +7277,17 @@
"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",
"copy-from": "hand_axe",
"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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
13 changes: 13 additions & 0 deletions data/json/recipes/armor/storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down