From bacf1534bf3124b9f32762746f6dd57eb3cfa18b Mon Sep 17 00:00:00 2001 From: Chorus System Date: Tue, 5 Nov 2024 00:55:56 -0500 Subject: [PATCH] feat(balance): Buffed survivor armors, Plastic Armors (#5651) * Buffed survivor armors Made the few survivor armors I missed last time I did this have armor values close to the kevlar vests they use as ingredients. Also decreased football armor and hard plastic chestguards' encumbrance, they were encumbering as hell despite being half-decent earlygame armor. * Fixes Restored prior materials to survivor gear, increased thickness to compensate. Added some additional ingredients for the scavenger cowl and scavenger gear to make them a bit less annoying to craft, and changed their materials from kevlar/cotton to kevlar/plastic to further differentiate it from the survivor gear. * Leather jacket for the scavenger armor * Survivor duster/trenchcoat rebalance Reduced thickness of survivor duster and trenchcoat, also reduced amount of kevlar needed to craft it. * Update data/json/items/armor/torso_armor.json Co-authored-by: Chaosvolt * Missed part of it :> --------- Co-authored-by: Chaosvolt --- data/json/items/armor/coats.json | 16 ++++++++-------- data/json/items/armor/helmets.json | 6 +++--- data/json/items/armor/legs_armor.json | 2 +- data/json/items/armor/suits_protection.json | 10 +++++----- data/json/items/armor/swimming.json | 6 +++--- data/json/items/armor/torso_armor.json | 8 ++++---- data/json/recipes/armor/head.json | 13 ++++++++++--- data/json/recipes/armor/suit.json | 9 +++++---- data/json/recipes/armor/torso.json | 8 ++++---- 9 files changed, 43 insertions(+), 35 deletions(-) diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json index 682d9c67e317..81d0a552213e 100644 --- a/data/json/items/armor/coats.json +++ b/data/json/items/armor/coats.json @@ -293,7 +293,7 @@ "price": "400 USD", "price_postapoc": "80 USD", "to_hit": -1, - "material": [ "cotton", "kevlar" ], + "material": [ "kevlar", "cotton" ], "symbol": "[", "looks_like": "duster_leather", "color": "brown", @@ -302,7 +302,7 @@ "encumbrance": 15, "storage": "9 L", "warmth": 10, - "material_thickness": 3, + "material_thickness": 4, "valid_mods": [ "steel_padded", "alloy_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ] @@ -951,7 +951,7 @@ "price": "340 USD", "price_postapoc": "45 USD", "to_hit": -1, - "material": [ "cotton", "kevlar" ], + "material": [ "kevlar", "cotton" ], "symbol": "[", "looks_like": "duster_survivor", "color": "brown", @@ -960,7 +960,7 @@ "encumbrance": 15, "storage": "9 L", "warmth": 10, - "material_thickness": 3, + "material_thickness": 4, "valid_mods": [ "steel_padded", "alloy_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ] @@ -1062,7 +1062,7 @@ "price": "340 USD", "price_postapoc": "5 USD", "to_hit": -1, - "material": [ "cotton", "kevlar" ], + "material": [ "kevlar", "cotton" ], "symbol": "[", "looks_like": "sleeveless_duster_survivor", "color": "brown", @@ -1071,7 +1071,7 @@ "encumbrance": 15, "storage": "9 L", "warmth": 10, - "material_thickness": 3, + "material_thickness": 4, "valid_mods": [ "steel_padded", "alloy_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ] @@ -1213,7 +1213,7 @@ "price": "400 USD", "price_postapoc": "80 USD", "to_hit": -1, - "material": [ "cotton", "kevlar" ], + "material": [ "kevlar", "cotton" ], "symbol": "[", "looks_like": "trenchcoat", "color": "brown", @@ -1222,7 +1222,7 @@ "encumbrance": 15, "storage": "9 L", "warmth": 10, - "material_thickness": 3, + "material_thickness": 4, "valid_mods": [ "steel_padded", "alloy_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ] diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index 6d1dde737fd5..63faebd9c677 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -571,13 +571,13 @@ "id": "helmet_scavenger", "type": "ARMOR", "name": { "str": "scavenger cowl" }, - "description": "A sturdy protective cowl extending down to the neck, fitted with a respirator and eye protection. For dangerous scavenging ventures.", + "description": "A sturdy protective cowl extending down to the neck, fitted with a respirator, helmet, and eye protection. For dangerous scavenging ventures.", "weight": "695 g", "volume": "2500 ml", "price": "550 USD", "price_postapoc": "35 USD", "to_hit": -3, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_rigid", "plastic" ], "symbol": "[", "looks_like": "mask_gas", "color": "white", @@ -585,7 +585,7 @@ "coverage": 100, "encumbrance": 23, "warmth": 30, - "material_thickness": 3, + "material_thickness": 8, "environmental_protection": 7, "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "STURDY", "WATERPROOF", "SUN_GLASSES" ] diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json index 5993695f4e27..db4337859f6d 100644 --- a/data/json/items/armor/legs_armor.json +++ b/data/json/items/armor/legs_armor.json @@ -336,7 +336,7 @@ "encumbrance": 20, "storage": "3500 ml", "warmth": 15, - "material_thickness": 4, + "material_thickness": 5, "valid_mods": [ "steel_padded", "alloy_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF" ] diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 4b222b873924..212095ea74ed 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -335,13 +335,13 @@ "id": "armor_scavenger", "type": "ARMOR", "name": { "str": "scavenger gear" }, - "description": "A sturdy scavenger's outfit made from refitted pre-Cataclysm protective gear. It has a lot of storage space.", + "description": "A sturdy scavenger's outfit made from refitted protective gear and reinforced with kevlar and heavy plastic. It has a lot of storage space.", "weight": "7915 g", "volume": "7500 ml", "price": "1800 USD", "price_postapoc": "20 USD", "to_hit": -3, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar", "plastic" ], "symbol": "[", "looks_like": "armor_nomad", "color": "green", @@ -350,7 +350,7 @@ "encumbrance": 30, "storage": "20 L", "warmth": 30, - "material_thickness": 5, + "material_thickness": 8, "valid_mods": [ "steel_padded", "alloy_padded" ], "environmental_protection": 2, "flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF" ] @@ -501,7 +501,7 @@ "coverage": 100, "encumbrance": 50, "warmth": 30, - "material_thickness": 5, + "material_thickness": 6, "environmental_protection": 20, "flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "STURDY", "OUTER" ] }, @@ -525,7 +525,7 @@ "encumbrance": 30, "storage": "10 L", "warmth": 15, - "material_thickness": 4, + "material_thickness": 6, "valid_mods": [ "steel_padded", "alloy_padded" ], "environmental_protection": 10, "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "RAINPROOF", "STURDY" ] diff --git a/data/json/items/armor/swimming.json b/data/json/items/armor/swimming.json index 4c1dfcfbf53b..0f228f86ade5 100644 --- a/data/json/items/armor/swimming.json +++ b/data/json/items/armor/swimming.json @@ -81,7 +81,7 @@ "coverage": 100, "encumbrance": 25, "warmth": 15, - "material_thickness": 2, + "material_thickness": 4, "environmental_protection": 10, "flags": [ "VARSIZE", "WATER_FRIENDLY", "STURDY", "OUTER", "HELMET_COMPAT" ] }, @@ -105,7 +105,7 @@ "encumbrance": 20, "storage": "11500 ml", "warmth": 15, - "material_thickness": 2, + "material_thickness": 4, "environmental_protection": 10, "flags": [ "VARSIZE", "WATER_FRIENDLY", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] }, @@ -127,7 +127,7 @@ "coverage": 100, "encumbrance": 25, "warmth": 15, - "material_thickness": 1, + "material_thickness": 4, "environmental_protection": 10, "flags": [ "VARSIZE", "WATER_FRIENDLY", "STURDY" ] }, diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json index c793db7233f7..6ad71b3184a4 100644 --- a/data/json/items/armor/torso_armor.json +++ b/data/json/items/armor/torso_armor.json @@ -122,7 +122,7 @@ "color": "dark_gray", "covers": [ "torso" ], "coverage": 90, - "encumbrance": 20, + "encumbrance": 10, "warmth": 20, "material_thickness": 3, "environmental_protection": 1, @@ -294,7 +294,7 @@ "color": "light_gray", "covers": [ "torso" ], "coverage": 45, - "encumbrance": 35, + "encumbrance": 15, "warmth": 10, "material_thickness": 6, "flags": [ "BELTED" ] @@ -338,9 +338,9 @@ "covers": [ "torso" ], "coverage": 95, "encumbrance": 16, - "storage": "2500 ml", + "storage": "3500 ml", "warmth": 15, - "material_thickness": 4, + "material_thickness": 5, "environmental_protection": 1, "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ] diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 450246e81ffb..c65c07fd27fe 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -610,9 +610,16 @@ "using": [ [ "sewing_standard", 65 ], [ "soldering_standard", 8 ] ], "components": [ [ [ "hat_ball", 1 ], [ "hat_boonie", 1 ] ], - [ [ "mask_filter", 1 ] ], - [ [ "glasses_bal", 1 ], [ "goggles_ski", 1 ] ], - [ [ "kevlar_plate", 8 ] ] + [ + [ "mask_filter", 1 ], + [ "mask_gas", 1 ], + [ "mask_survivor", 1 ], + [ "mask_halfsurvivor", 1 ], + [ "mask_hsurvivor", 1 ] + ], + [ [ "glasses_bal", 1 ], [ "goggles_ski", 1 ], [ "survivor_goggles", 1 ] ], + [ [ "kevlar_plate", 8 ], [ "helmet_army", 1 ] ], + [ [ "plastic_chunk", 16 ] ] ] }, { diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index ca62a134db7b..01da93dcda8d 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -278,12 +278,13 @@ "autolearn": true, "using": [ [ "sewing_standard", 90 ], [ "soldering_standard", 18 ] ], "components": [ - [ [ "jacket_army", 1 ] ], + [ [ "jacket_army", 1 ], [ "winter_jacket_army", 1 ], [ "jacket_leather", 1 ], [ "jacket_leather_red", 1 ] ], [ [ "vest", 1 ], [ "tacvest", 1 ], [ "mbag", 1 ], [ "runner_bag", 1 ] ], - [ [ "fanny", 2 ], [ "dump_pouch", 1 ] ], + [ [ "fanny", 2 ], [ "dump_pouch", 1 ], [ "legrig", 2 ] ], [ [ "tool_belt", 1 ], [ "legrig", 1 ] ], - [ [ "pants_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "pants_army", 1 ], [ "jeans", 1 ] ], + [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ], + [ [ "plastic_chunk", 24 ] ] ] }, { diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 7071e9385c7e..38fab61b794e 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -320,7 +320,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "jacket_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 16 ] ], + [ [ "kevlar_plate", 8 ] ], [ [ "rag", 19 ] ], [ [ "tacvest", 1 ], @@ -786,7 +786,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "jacket_army", 1 ], [ "sleeveless_duster", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 13 ] ], + [ [ "kevlar_plate", 6 ] ], [ [ "rag", 14 ] ], [ [ "tacvest", 1 ], @@ -923,7 +923,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ], [ "sleeveless_trenchcoat", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 10 ] ], + [ [ "kevlar_plate", 5 ] ], [ [ "rag", 11 ] ], [ [ "tacvest", 1 ], @@ -1106,7 +1106,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 12 ] ], + [ [ "kevlar_plate", 6 ] ], [ [ "rag", 14 ] ], [ [ "tacvest", 1 ],