From 9f46f66234d5a7e156666c135ac5e072a4e63f4f Mon Sep 17 00:00:00 2001 From: Hymore246 Date: Wed, 7 Aug 2019 04:50:34 -0500 Subject: [PATCH] Adds 5 new backpacks (#32914) * Adds 5 new backpacks * Update data/json/items/armor.json Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com> * Update data/json/items/armor.json Co-Authored-By: anothersimulacrum * Update data/json/items/armor.json Co-Authored-By: anothersimulacrum * Update data/json/items/armor.json Co-Authored-By: anothersimulacrum * Update data/json/items/armor.json Co-Authored-By: anothersimulacrum * Yellow is the new Orange * Encumbrance adjustments * Update data/json/items/armor.json Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com> * Update data/json/items/armor.json Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com> --- data/json/item_groups.json | 23 ++++++ data/json/itemgroups/clothing.json | 1 + data/json/itemgroups/locations.json | 3 + data/json/items/armor.json | 107 +++++++++++++++++++++++++++ data/json/recipes/armor/storage.json | 66 +++++++++++++++++ 5 files changed, 200 insertions(+) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index 79b7f17aa9c84..d89f22040d121 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -36,6 +36,8 @@ { "item": "colamdew", "prob": 5, "container-item": "bottle_twoliter" }, [ "backpack", 38 ], [ "slingpack", 19 ], + [ "travelpack", 10 ], + [ "petpack", 1 ], [ "pockknife", 14 ], [ "roller_shoes_off", 10 ], [ "knife_swissarmy", 10 ], @@ -272,6 +274,10 @@ [ "boots_combat", 10 ], [ "boots_winter", 60 ], [ "boots_hiking", 10 ], + [ "travelpack", 7 ], + [ "backpack_hiking", 4 ], + [ "bigback", 1 ], + [ "petpack", 1 ], [ "runner_bag", 5 ], [ "flip_flops", 35 ], [ "lowtops", 45 ], @@ -847,6 +853,9 @@ [ "inhaler", 14 ], [ "eyedrops", 25 ], [ "television", 10 ], + [ "travelpack", 4 ], + [ "backpack_tactical_large", 1 ], + [ "backpack_hiking", 3 ], [ "clock", 10 ], [ "basket_laundry", 30 ], [ "cig", 60 ], @@ -2150,6 +2159,9 @@ [ "vest", 15 ], [ "backpack", 38 ], [ "backpack_leather", 18 ], + [ "backpack_hiking", 12 ], + [ "bigback", 3 ], + [ "travelpack", 6 ], [ "cowboy_hat", 4 ], [ "10gal_hat", 4 ], [ "bb", 8 ], @@ -2371,6 +2383,9 @@ [ "vest", 15 ], [ "backpack", 38 ], [ "backpack_leather", 18 ], + [ "backpack_hiking", 4 ], + [ "bigback", 2 ], + [ "travelpack", 9 ], [ "slingpack", 18 ], [ "bb", 8 ], [ "bolt_steel", 7 ], @@ -2950,6 +2965,11 @@ "id": "bags", "items": [ [ "backpack", 38 ], + [ "backpack_hiking", 3 ], + [ "petpack", 3 ], + [ "backpack_tactical_large", 1 ], + [ "bigback", 1 ], + [ "travelpack", 5 ], [ "purse", 40 ], [ "mbag", 20 ], [ "slingpack", 8 ], @@ -3193,6 +3213,7 @@ [ "boy_shorts", 25 ], [ "sweatshirt", 75 ], [ "backpack", 38 ], + [ "travelpack", 10 ], [ "slingpack", 19 ], [ "suitcase_m", 99 ], [ "suitcase_l", 55 ], @@ -4630,6 +4651,7 @@ [ "throwing_knife", 14 ], [ "throwing_axe", 4 ], [ "duffelbag", 25 ], + [ "backpack_tactical_large", 10 ], [ "binoculars", 20 ], [ "bolt_steel", 7 ], [ "crossbow", 2 ], @@ -4781,6 +4803,7 @@ [ "hat_knit", 25 ], [ "backpack", 38 ], [ "backpack_leather", 8 ], + [ "backpack_tactical_large", 3 ], [ "slingpack", 8 ], { "group": "ammo_pocket_batteries_full", "prob": 50 }, [ "novel_scifi", 20 ], diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index 93f2d6cb3f1fc..5ef287505e78c 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -270,6 +270,7 @@ [ "backpack", 20 ], [ "camelbak", 40 ], [ "chestpouch", 40 ], + [ "backpack_tactical_large", 20 ], [ "chestrig", 160 ], [ "molle_pack", 100 ], [ "rucksack", 80 ] diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index 7de3e5cd4103f..28f89c1014aa6 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -222,6 +222,7 @@ [ "birdfood", 15 ], [ "can_tuna", 15 ], [ "can_chicken", 15 ], + [ "petpack", 10 ], [ "kevlar_harness", 5 ], [ "leather_harness_dog", 5 ], [ "rubber_harness_dog", 5 ] @@ -844,6 +845,7 @@ "items": [ [ "dog_whistle", 10 ], [ "pet_carrier", 30 ], + [ "petpack", 3 ], [ "dogfood_canned", 30 ], [ "catfood_canned", 30 ], [ "birdfood", 10 ], @@ -887,6 +889,7 @@ [ "scissors", 1 ], [ "phonebook", 2 ], [ "flashlight", 2 ], + [ "petpack", 1 ], [ "mag_comic", 5 ] ] }, diff --git a/data/json/items/armor.json b/data/json/items/armor.json index 2815c6d542bb9..d70b426a00a67 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -10229,5 +10229,112 @@ "material_thickness": 1, "environmental_protection": 1, "flags": [ "OVERSIZE", "OUTER", "WATERPROOF", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "bigback", + "type": "ARMOR", + "name": "high-volume rucksack", + "description": "Also know as a \"bigpack\", this rucksack is prized by pack rats but may lead to a bad back.", + "weight": 3539, + "volume": "21 L", + "price": 20000, + "material": [ "steel", "leather" ], + "symbol": "[", + "color": "black", + "covers": [ "TORSO" ], + "coverage": 95, + "encumbrance": 100, + "storage": 400, + "warmth": 5, + "material_thickness": 6, + "flags": [ "BELTED", "WATERPROOF", "ONLY_ONE", "OVERSIZE" ] + }, + { + "id": "backpack_hiking", + "type": "ARMOR", + "name": "hiking backpack", + "description": "A large sized hiking backpack with plenty of storage space.", + "weight": 2291, + "volume": "14 L", + "price": 10000, + "material": [ "leather" ], + "symbol": "[", + "color": "brown", + "covers": [ "TORSO" ], + "coverage": 75, + "encumbrance": 55, + "storage": 220, + "warmth": 6, + "material_thickness": 6, + "use_action": { + "type": "holster", + "holster_prompt": "Sheath blade", + "holster_msg": "You sheath your %s", + "min_volume": "250ml", + "max_volume": "2500ml", + "multi": 2, + "draw_cost": 3, + "flags": [ "SHEATH_KNIFE", "SHEATH_SWORD" ] + }, + "flags": [ "BELTED", "WATERPROOF", "ONLY_ONE", "OVERSIZE" ] + }, + { + "id": "petpack", + "type": "ARMOR", + "name": "petpack", + "description": "Before the Cataclysm this would allow your four-legged friend to see the world, now it's used to shield them from the world.", + "weight": 1316, + "volume": "10 L", + "price": 7900, + "material": [ "cotton", "plastic" ], + "symbol": "[", + "color": "blue", + "covers": [ "TORSO" ], + "coverage": 45, + "encumbrance": 14, + "storage": 15, + "warmth": 3, + "material_thickness": 3, + "properties": [ [ "monster_size_capacity", "SMALL" ] ], + "use_action": "CAPTURE_MONSTER_ACT", + "flags": [ "BELTED", "WATERPROOF" ] + }, + { + "id": "backpack_tactical_large", + "type": "ARMOR", + "name": "large tactical backpack", + "description": "A large tactical multi-compartment backpack that has great lower back support.", + "weight": 2291, + "volume": "15 L", + "price": 9000, + "material": [ "leather" ], + "symbol": "[", + "color": "green", + "covers": [ "TORSO" ], + "coverage": 75, + "encumbrance": 65, + "storage": 260, + "warmth": 5, + "material_thickness": 6, + "flags": [ "BELTED", "WATERPROOF", "ONLY_ONE", "OVERSIZE" ] + }, + { + "id": "travelpack", + "type": "ARMOR", + "name": "travelpack", + "description": "A hiking pack used for short trips.", + "weight": 636, + "volume": "3 L", + "price": 7000, + "material": [ "cotton" ], + "symbol": "[", + "color": "yellow", + "covers": [ "TORSO" ], + "coverage": 25, + "encumbrance": 25, + "storage": 100, + "warmth": 5, + "material_thickness": 5, + "flags": [ "BELTED", "WATERPROOF" ] } ] diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 0133b9d1aabf5..94e6505f2da11 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -825,5 +825,71 @@ "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "components": [ [ [ "rag", 6 ] ] ] + }, + { + "result": "bigback", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 5, + "time": "250 m", + "autolearn": true, + "using": [ [ "sewing_standard", 150 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 } ], + "components": [ + [ [ "leather", 20 ], [ "tanned_hide", 4 ] ], + [ [ "sheet_metal_small", 8 ] ], + [ [ "cordage", 2, "LIST" ] ], + [ [ "leather_pouch", 2 ] ] + ] + }, + { + "result": "travelpack", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 3, + "time": "90 m", + "autolearn": true, + "using": [ [ "sewing_standard", 40 ] ], + "components": [ [ [ "rag", 5 ] ], [ [ "cordage", 1, "LIST" ] ] ] + }, + { + "result": "petpack", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 3, + "time": "100 m", + "autolearn": true, + "using": [ [ "sewing_standard", 100 ] ], + "components": [ [ [ "rag", 5 ] ], [ [ "plastic_chunk", 8 ] ] ] + }, + { + "result": "backpack_tactical_large", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 4, + "time": "160 m", + "autolearn": true, + "using": [ [ "sewing_standard", 100 ] ], + "components": [ [ [ "leather", 5 ], [ "tanned_pelt", 1 ] ], [ [ "cordage", 1, "LIST" ] ] ] + }, + { + "result": "backpack_hiking", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 4, + "time": "180 m", + "autolearn": true, + "using": [ [ "sewing_standard", 100 ] ], + "components": [ [ [ "leather", 5 ], [ "tanned_pelt", 1 ] ], [ [ "cordage", 1, "LIST" ] ] ] } ]