From 387ffd5c524041794f47aa161c696694cbf41885 Mon Sep 17 00:00:00 2001 From: TJKing293 Date: Sun, 17 Nov 2019 21:42:12 -0500 Subject: [PATCH 1/2] commit 1 --- data/json/items/armor/bandolier.json | 99 ++++++++++++++++++++++++++-- data/json/recipes/armor/storage.json | 13 ++++ 2 files changed, 106 insertions(+), 6 deletions(-) diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json index 8fa00fcedc2ae..f935c887fcd3e 100644 --- a/data/json/items/armor/bandolier.json +++ b/data/json/items/armor/bandolier.json @@ -10,6 +10,7 @@ "price_postapoc": 2900, "material": "leather", "symbol": "[", + "looks_like": "belt", "color": "dark_gray", "covers": [ "TORSO" ], "coverage": 10, @@ -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" ] @@ -34,6 +55,7 @@ "price_postapoc": 2900, "material": "leather", "symbol": "[", + "looks_like": "belt", "color": "dark_gray", "covers": [ "TORSO" ], "coverage": 10, @@ -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" ] @@ -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" ] }, { @@ -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" ] }, { @@ -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" ] }, { @@ -116,6 +162,7 @@ "price_postapoc": 5900, "material": "cotton", "symbol": "[", + "looks_like": "belt", "color": "dark_gray", "covers": [ "HAND_EITHER" ], "coverage": 5, @@ -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" ] @@ -141,6 +204,7 @@ "price_postapoc": 9900, "material": [ "cotton", "plastic" ], "symbol": "[", + "looks_like": "ammo_satchel", "color": "dark_gray", "covers": [ "LEG_EITHER" ], "coverage": 10, @@ -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.", + "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", @@ -162,6 +248,7 @@ "rigid": false, "material": "cotton", "symbol": "[", + "looks_like": "belt", "color": "dark_gray", "covers": [ "TORSO" ], "coverage": 15, diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index d2ef4e593780d..c32d9a29d516f 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -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", From 7e06daf0b907dc26fd2cdb3d2afcd0a7c58aad2f Mon Sep 17 00:00:00 2001 From: TJKing293 Date: Tue, 19 Nov 2019 13:29:18 -0500 Subject: [PATCH 2/2] Update data/json/items/armor/bandolier.json Co-Authored-By: matskuman5 --- data/json/items/armor/bandolier.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json index f935c887fcd3e..0bce8b165f478 100644 --- a/data/json/items/armor/bandolier.json +++ b/data/json/items/armor/bandolier.json @@ -218,7 +218,7 @@ "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.", + "description": "A medium-sized pouch for storing rocks, with straps for attaching it to your belt or other webbing.", "weight": "90 g", "volume": "250 ml", "price": 5900,