From fdb6831c9d192003b99e0edaab176ee74dc28ee1 Mon Sep 17 00:00:00 2001 From: AtomicFox556 Date: Sun, 8 Jan 2023 16:35:10 +0300 Subject: [PATCH] Add more wearable gear --- data/json/EraOfDecay/items/armor/hats.json | 20 +++++ data/json/EraOfDecay/items/armor/hoods.json | 12 ++- data/json/EraOfDecay/items/armor/storage.json | 87 +++++++++++++++++++ data/json/EraOfDecay/recipes/armor/head.json | 30 +++++++ .../EraOfDecay/recipes/armor/storage.json | 41 +++++++++ data/json/items/armor/hoods.json | 4 +- data/json/items/armor/storage.json | 22 ++--- data/json/items/containers.json | 2 +- data/json/recipes/armor/head.json | 3 +- data/json/recipes/armor/storage.json | 8 +- 10 files changed, 207 insertions(+), 22 deletions(-) create mode 100644 data/json/EraOfDecay/items/armor/hats.json create mode 100644 data/json/EraOfDecay/items/armor/storage.json create mode 100644 data/json/EraOfDecay/recipes/armor/head.json create mode 100644 data/json/EraOfDecay/recipes/armor/storage.json diff --git a/data/json/EraOfDecay/items/armor/hats.json b/data/json/EraOfDecay/items/armor/hats.json new file mode 100644 index 0000000000000..5cf8695058472 --- /dev/null +++ b/data/json/EraOfDecay/items/armor/hats.json @@ -0,0 +1,20 @@ +[ + { + "id": "paper_hat", + "type": "ARMOR", + "category": "armor", + "name": { "str": "paper hat" }, + "description": "A simple hat folded from paper. You can wear it but it's not particularly useful for anything.", + "weight": "18 g", + "volume": "36 ml", + "price": 0, + "price_postapoc": 0, + "material": [ "paper" ], + "symbol": "[", + "warmth": 2, + "looks_like": "tinfoil_hat", + "material_thickness": 0.1, + "color": "white", + "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 40, "covers": [ "head" ] } ] + } +] diff --git a/data/json/EraOfDecay/items/armor/hoods.json b/data/json/EraOfDecay/items/armor/hoods.json index 3c5c1916ab7ab..28a2a3ff24b75 100644 --- a/data/json/EraOfDecay/items/armor/hoods.json +++ b/data/json/EraOfDecay/items/armor/hoods.json @@ -1,3 +1,13 @@ [ - + { + "id": "hood_rain_plastic", + "copy-from": "hood_rain", + "type": "ARMOR", + "name": { "str": "plastic rain hood" }, + "description": "A cheap plastic hood, meant to be used together with a rain coat to provide protection from rain.", + "material": [ "plastic" ], + "warmth": 2, + "material_thickness": 0.1, + "proportional": { "weight": 0.8, "volume": 0.8, "price": 0.8 } + } ] diff --git a/data/json/EraOfDecay/items/armor/storage.json b/data/json/EraOfDecay/items/armor/storage.json new file mode 100644 index 0000000000000..a1a2c929667af --- /dev/null +++ b/data/json/EraOfDecay/items/armor/storage.json @@ -0,0 +1,87 @@ +[ + { + "id": "jerrypack_big", + "type": "ARMOR", + "name": { "str": "steel jerrypack" }, + "description": "A big steel jerrycan with two straps attached, for wearing it on back.", + "weight": "4732 g", + "volume": "27470 ml", + "longest_side": "47 cm", + "price": 5720, + "price_postapoc": 120, + "to_hit": -3, + "bashing": 4, + "material": [ "steel" ], + "symbol": "[", + "looks_like": "jerrypack", + "color": "green", + "material_thickness": 2, + "pocket_data": [ + { + "max_contains_volume": "20 L", + "max_contains_weight": "25 kg", + "max_item_volume": "32 ml", + "watertight": true, + "rigid": true + } + ], + "qualities": [ [ "BOIL", 1 ] ], + "flags": [ "OVERSIZE", "BELTED", "WATER_FRIENDLY" ], + "armor": [ { "encumbrance": 32, "coverage": 85, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ] + }, + { + "id": "jerrypack_clay", + "type": "ARMOR", + "name": { "str": "clay hydria with straps", "str_pl": "clay hydriai with straps" }, + "description": "A 15-liter clay pot with two straps attached, for wearing it on back. Can carry solid items as well as liquids, but it's fragile.", + "weight": "2387 g", + "volume": "18132 ml", + "price": 2720, + "price_postapoc": 70, + "to_hit": -1, + "bashing": 1, + "material": [ "clay" ], + "symbol": "[", + "looks_like": "jerrypack", + "color": "green", + "material_thickness": 2, + "pocket_data": [ + { + "max_contains_volume": "15 L", + "max_contains_weight": "25 kg", + "watertight": true, + "rigid": true + } + ], + "qualities": [ [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], + "flags": [ "OVERSIZE", "BELTED", "WATER_FRIENDLY", "FRAGILE" ], + "armor": [ { "encumbrance": 24, "coverage": 70, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ] + }, + { + "id": "jerrypack_gallon", + "type": "ARMOR", + "name": { "str": "gallon jug with strap", "str_pl": "gallon jugs with straps" }, + "description": "A standard plastic jug used for milk and household cleaning chemicals with a strap attached, for wearing it on back.", + "weight": "226 g", + "volume": "3885 ml", + "price": 60, + "price_postapoc": 20, + "to_hit": 1, + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "jerrypack", + "color": "green", + "material_thickness": 1, + "pocket_data": [ + { + "max_contains_volume": "3750 ml", + "max_contains_weight": "8 kg", + "max_item_volume": "32 ml", + "watertight": true, + "rigid": true + } + ], + "flags": [ "OVERSIZE", "BELTED", "WATER_FRIENDLY" ], + "armor": [ { "encumbrance": 6, "coverage": 40, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ] + } +] diff --git a/data/json/EraOfDecay/recipes/armor/head.json b/data/json/EraOfDecay/recipes/armor/head.json new file mode 100644 index 0000000000000..6d72462bf8db3 --- /dev/null +++ b/data/json/EraOfDecay/recipes/armor/head.json @@ -0,0 +1,30 @@ +[ + { + "result": "hood_rain_plastic", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HEAD", + "skill_used": "tailor", + "difficulty": 1, + "time": "10 m", + "autolearn": true, + "proficiencies": [ { "proficiency": "prof_closures_waterproofing" } ], + "using": [ [ "waterproofing_plastic_sheets", 2 ] ], + "qualities": [ { "id": "SEW", "level": 1 } ], + "components": [ [ [ "filament", 1, "LIST" ] ] ] + }, + { + "result": "paper_hat", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "fabrication", + "time": "1 m 30 s", + "autolearn": true, + "reversible": true, + "components": [ [ [ "paper", 6 ] ] ], + "flags": [ "BLIND_HARD" ] + } +] diff --git a/data/json/EraOfDecay/recipes/armor/storage.json b/data/json/EraOfDecay/recipes/armor/storage.json new file mode 100644 index 0000000000000..91286f6133a2f --- /dev/null +++ b/data/json/EraOfDecay/recipes/armor/storage.json @@ -0,0 +1,41 @@ +[ + { + "result": "jerrypack_big", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "fabrication", + "time": "1 m 30 s", + "autolearn": true, + "reversible": true, + "components": [ [ [ "jerrycan_big", 1 ] ], [ [ "rope_natural_short", 2, "LIST" ] ] ], + "flags": [ "BLIND_HARD" ] + }, + { + "result": "jerrypack_clay", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "fabrication", + "time": "1 m 30 s", + "autolearn": true, + "reversible": true, + "components": [ [ [ "clay_hydria", 1 ] ], [ [ "rope_natural_short", 2, "LIST" ] ] ], + "flags": [ "BLIND_HARD" ] + }, + { + "result": "jerrypack_gallon", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "fabrication", + "time": "1 m 30 s", + "autolearn": true, + "reversible": true, + "components": [ [ [ "jug_plastic", 1 ] ], [ [ "cordage", 1, "LIST" ] ] ], + "flags": [ "BLIND_HARD" ] + } +] diff --git a/data/json/items/armor/hoods.json b/data/json/items/armor/hoods.json index 13c1694d155d1..c584d768baf84 100644 --- a/data/json/items/armor/hoods.json +++ b/data/json/items/armor/hoods.json @@ -325,8 +325,8 @@ "symbol": "[", "looks_like": "hat_cotton", "color": "yellow", - "warmth": 8, - "material_thickness": 0.3, + "warmth": 10, + "material_thickness": 0.2, "environmental_protection": 2, "flags": [ "WATERPROOF", "OUTER", "SOFT" ], "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ] diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json index 389a2d5bc2bff..318e059d529e6 100644 --- a/data/json/items/armor/storage.json +++ b/data/json/items/armor/storage.json @@ -1047,14 +1047,14 @@ { "id": "jerrypack", "type": "ARMOR", - "name": { "str": "jerrypack" }, - "description": "A jerrycan modified to be worn in a similar manner to a backpack.", - "weight": "1763 g", - "volume": "10500 ml", - "price": 1450, - "price_postapoc": 250, - "to_hit": -1, - "material": [ "plastic", "cotton" ], + "name": { "str": "plastic jerrypack" }, + "description": "A plastic jerrycan with two straps attached, for wearing it on back.", + "weight": "2019 g", + "volume": "11220 ml", + "price": 2000, + "price_postapoc": 80, + "to_hit": -2, + "material": [ "plastic" ], "symbol": "[", "looks_like": "backpack", "color": "green", @@ -1063,14 +1063,14 @@ "pocket_data": [ { "max_contains_volume": "10 L", - "max_contains_weight": "10 kg", - "max_item_volume": "65 ml", + "max_contains_weight": "15 kg", + "max_item_volume": "32 ml", "watertight": true, "rigid": true } ], "flags": [ "OVERSIZE", "BELTED", "WATER_FRIENDLY" ], - "armor": [ { "encumbrance": 30, "coverage": 80, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ] + "armor": [ { "encumbrance": 18, "coverage": 60, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ] }, { "id": "leather_pouch", diff --git a/data/json/items/containers.json b/data/json/items/containers.json index 7da64277850b4..ec747541e8a14 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -1518,7 +1518,7 @@ "id": "clay_hydria", "type": "GENERIC", "category": "container", - "name": { "str": "clay hydria" }, + "name": { "str": "clay hydria", "str_pl": "clay hydriai" }, "looks_like": "bowl_clay", "description": "A 15-liter clay pot with three handles for carrying and for pouring.", "weight": "1955 g", diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 5cd34790abf8f..69eab806a547a 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -1255,8 +1255,7 @@ "difficulty": 1, "time": "20 m", "autolearn": true, - "using": [ [ "waterproofing_plastic_sheets", 2 ] ], - "components": [ [ [ "cotton_patchwork", 2 ] ] ], + "using": [ [ "tailoring_cotton_patchwork", 2 ], [ "waterproofing_plastic_sheets", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" } ] }, { diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 03ef60996c503..99aa3b51ed77f 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -889,13 +889,11 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "fabrication", - "difficulty": 2, "time": "1 m 30 s", "autolearn": true, "reversible": true, - "using": [ [ "adhesive", 3 ] ], - "qualities": [ { "id": "HAMMER", "level": 3 } ], - "components": [ [ [ "strap_small", 3, "LIST" ] ], [ [ "jerrycan", 1 ] ] ] + "components": [ [ [ "jerrycan", 1 ] ], [ [ "rope_natural_short", 2, "LIST" ] ] ], + "flags": [ "BLIND_HARD" ] }, { "result": "boxpack", @@ -909,7 +907,7 @@ "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_carpentry_basic" } ], - "components": [ [ [ "2x4", 3 ] ], [ [ "wood_panel", 1 ] ], [ [ "nail", 20 ] ], [ [ "rope_natural", 1, "LIST" ] ] ] + "components": [ [ [ "2x4", 3 ] ], [ [ "wood_panel", 1 ] ], [ [ "nail", 20 ] ], [ [ "rope_natural_short", 2, "LIST" ] ] ] }, { "result": "leather_belt",