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.

Sign up for GitHub

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

add stone pouch #35577

Merged
merged 3 commits into from
Nov 21, 2019
Merged

add stone pouch #35577

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
387ffd5
commit 1
TJKing293 Nov 18, 2019
7e06daf
Update data/json/items/armor/bandolier.json
TJKing293 Nov 19, 2019
7539cb3
Merge branch 'master' into add-stone-pouch
TJKing293 Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 93 additions & 6 deletions data/json/items/armor/bandolier.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"price_postapoc": 2900,
"material": "leather",
"symbol": "[",
"looks_like": "belt",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 10,
Expand All @@ -18,7 +19,27 @@
"use_action": {
"type": "bandolier",
"capacity": 18,
"ammo": [ "32", "762x25", "38", "357mag", "38super", "40", "10mm", "44", "45", "45colt", "9x18", "9mm", "454", "500" ],
"ammo": [
"32",
"762x25",
"38",
"357mag",
"357sig",
"380",
"38super",
"40",
"10mm",
"44",
"45",
"45colt",
"46",
"57",
"9x18",
"9mm",
"454",
"460",
"500"
],
"draw_cost": 20
},
"flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE", "FANCY" ]
Expand All @@ -34,6 +55,7 @@
"price_postapoc": 2900,
"material": "leather",
"symbol": "[",
"looks_like": "belt",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 10,
Expand All @@ -42,7 +64,23 @@
"use_action": {
"type": "bandolier",
"capacity": 16,
"ammo": [ "22", "223", "5x50", "545x39", "3006", "308", "300", "762", "762R", "8x40mm" ],
"ammo": [
"22",
"223",
"270win",
"300blk",
"5x50",
"545x39",
"3006",
"308",
"300",
"762",
"762R",
"8x40mm",
"4570",
"50",
"700nx"
],
"draw_cost": 20
},
"flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
Expand All @@ -58,12 +96,13 @@
"price_postapoc": 2900,
"material": "leather",
"symbol": "[",
"looks_like": "belt",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 10,
"encumbrance": 2,
"material_thickness": 1,
"use_action": { "type": "bandolier", "capacity": 25, "ammo": [ "410shot", "shot", "20x66mm", "shotcanister" ], "draw_cost": 25 },
"use_action": { "type": "bandolier", "capacity": 25, "ammo": [ "410shot", "shot", "20x66mm", "signal_flare" ], "draw_cost": 25 },
"flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
},
{
Expand All @@ -77,12 +116,13 @@
"price_postapoc": 6900,
"material": "leather",
"symbol": "[",
"looks_like": "belt",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 12,
"encumbrance": 3,
"material_thickness": 1,
"use_action": { "type": "bandolier", "capacity": 50, "ammo": [ "410shot", "shot", "20x66mm", "shotcanister" ], "draw_cost": 35 },
"use_action": { "type": "bandolier", "capacity": 50, "ammo": [ "410shot", "shot", "20x66mm", "signal_flare" ], "draw_cost": 35 },
"flags": [ "WATER_FRIENDLY", "OVERSIZE", "BELTED" ]
},
{
Expand All @@ -97,12 +137,18 @@
"price_postapoc": 8900,
"material": "leather",
"symbol": "[",
"looks_like": "ammo_pouch",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 10,
"encumbrance": 2,
"material_thickness": 1,
"use_action": { "type": "bandolier", "capacity": 14, "ammo": [ "flintlock", "36paper", "44paper", "blunderbuss" ], "draw_cost": 20 },
"use_action": {
"type": "bandolier",
"capacity": 14,
"ammo": [ "flintlock", "36paper", "44paper", "blunderbuss", "shotcanister", "shotpaper" ],
"draw_cost": 20
},
"flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
},
{
Expand All @@ -116,6 +162,7 @@
"price_postapoc": 5900,
"material": "cotton",
"symbol": "[",
"looks_like": "belt",
"color": "dark_gray",
"covers": [ "HAND_EITHER" ],
"coverage": 5,
Expand All @@ -124,7 +171,23 @@
"use_action": {
"type": "bandolier",
"capacity": 4,
"ammo": [ "22", "223", "5x50", "545x39", "3006", "308", "300", "762", "762R", "8x40mm" ],
"ammo": [
"22",
"223",
"270win",
"300blk",
"5x50",
"545x39",
"3006",
"308",
"300",
"762",
"762R",
"8x40mm",
"4570",
"50",
"700nx"
],
"draw_cost": 20
},
"flags": [ "WATER_FRIENDLY", "BELTED", "ALLOWS_NATURAL_ATTACKS" ]
Expand All @@ -141,6 +204,7 @@
"price_postapoc": 9900,
"material": [ "cotton", "plastic" ],
"symbol": "[",
"looks_like": "ammo_satchel",
"color": "dark_gray",
"covers": [ "LEG_EITHER" ],
"coverage": 10,
Expand All @@ -149,6 +213,28 @@
"use_action": { "type": "bandolier", "capacity": 4, "ammo": [ "40mm" ], "draw_cost": 20 },
"flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE" ]
},
{
"id": "stone_pouch",
"type": "ARMOR",
"name": "stone pouch",
"name_plural": "stone pouches",
"description": "A medium sized pouch for storing rocks with straps for attaching it to your belt or other webbing.",
TJKing293 marked this conversation as resolved.
Show resolved Hide resolved
"weight": "90 g",
"volume": "250 ml",
"price": 5900,
"price_postapoc": 9900,
"rigid": false,
"material": [ "cotton", "leather" ],
"symbol": "[",
"looks_like": "ammo_satchel",
"color": "dark_gray",
"covers": [ "LEG_EITHER" ],
"coverage": 10,
"encumbrance": 4,
"material_thickness": 1,
"use_action": { "type": "bandolier", "capacity": 10, "ammo": [ "rock" ], "draw_cost": 20 },
"flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE" ]
},
{
"id": "grenadebandolier",
"type": "ARMOR",
Expand All @@ -162,6 +248,7 @@
"rigid": false,
"material": "cotton",
"symbol": "[",
"looks_like": "belt",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 15,
Expand Down
13 changes: 13 additions & 0 deletions data/json/recipes/armor/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 8 ], [ "rag", 8 ] ], [ [ "filament", 300, "LIST" ], [ "cordage", 1, "LIST" ] ] ]
},
{
"result": "stone_pouch",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_STORAGE",
"skill_used": "tailor",
"difficulty": 3,
"skills_required": [ [ "throw", 1 ] ],
"time": "1 h 20 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"components": [ [ [ "rag", 8 ] ], [ [ "leather", 4 ] ], [ [ "filament", 600, "LIST" ], [ "cordage", 2, "LIST" ] ] ]
},
{
"result": "chestrig",
"type": "recipe",
Expand Down