diff --git a/data/json/items/armor/bespoke_armor/custom_bodysuits.json b/data/json/items/armor/bespoke_armor/custom_bodysuits.json index 8948aaad028bd..25982dc3a5568 100644 --- a/data/json/items/armor/bespoke_armor/custom_bodysuits.json +++ b/data/json/items/armor/bespoke_armor/custom_bodysuits.json @@ -295,20 +295,29 @@ "id": "lsurvivor_jumpsuit", "type": "ARMOR", "category": "armor", - "name": { "str": "light survivor suit" }, - "description": "A lightweight, hand-built combination armor made from a cut-down bulletproof vest and a reinforced fabric jumpsuit. Protects from the elements as well as from harm.", + "name": { "str": "light kevlar jumpsuit" }, + "description": "A lightweight, hand-built combination armor made from a jumpsuit padded with layered kevlar. Protects from the elements as well as from harm.", "weight": "5100 g", "volume": "10500 ml", "price": 110000, "price_postapoc": 5000, "material": [ "kevlar_layered", "cotton" ], + "to_hit": -3, + "bashing": 6, "symbol": "[", "looks_like": "survivor_jumpsuit", "color": "green", "armor": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, - { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, - { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] } + { + "material": [ + { "type": "cotton", "covered_by_mat": 100, "thickness": 0.2 }, + { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1 }, + { "type": "kevlar_layered", "covered_by_mat": 90, "thickness": 1 } + ], + "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 100, + "encumbrance": [ 7, 7 ] + } ], "pocket_data": [ { @@ -329,45 +338,54 @@ } ], "warmth": 15, - "material_thickness": 4, "environmental_protection": 3, "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] }, { "id": "xl_lsurvivor_jumpsuit", "type": "ARMOR", - "name": { "str": "XL light survivor suit" }, + "name": { "str": "XL light kevlar jumpsuit" }, "copy-from": "lsurvivor_jumpsuit", "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, - "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "OVERSIZE" ] + "extend": { "flags": [ "OVERSIZE" ] } }, { "id": "xs_lsurvivor_jumpsuit", "type": "ARMOR", + "name": { "str": "XS light kevlar jumpsuit" }, "copy-from": "lsurvivor_jumpsuit", "looks_like": "lsurvivor_jumpsuit", - "name": { "str": "XS light survivor suit" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, - "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "UNDERSIZE" ] + "extend": { "flags": [ "UNDERSIZE" ] } }, { "id": "survivor_jumpsuit", "type": "ARMOR", "category": "armor", - "name": { "str": "survivor suit" }, - "description": "A hand-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit. Protects from the elements as well as from harm.", + "name": { "str": "kevlar jumpsuit" }, + "description": "A hand-built combination armor made from a leather jumpsuit padded with layered kevlar. Protects from the elements as well as from harm.", "weight": "6800 g", "volume": "11500 ml", "price": 150000, "price_postapoc": 5000, "material": [ "kevlar_layered", "leather" ], + "to_hit": -3, + "bashing": 6, "symbol": "[", "looks_like": "touring_suit", "color": "brown", "armor": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 12, 12 ] }, - { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 12, 12 ] }, - { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 12, 12 ] } + { + "material": [ + { "type": "leather", "covered_by_mat": 100, "thickness": 0.2 }, + { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1 }, + { "type": "kevlar_layered", "covered_by_mat": 90, "thickness": 1 }, + { "type": "kevlar_layered", "covered_by_mat": 90, "thickness": 1 } + ], + "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 100, + "encumbrance": [ 12, 12 ] + } ], "pocket_data": [ { @@ -388,7 +406,6 @@ } ], "warmth": 15, - "material_thickness": 4, "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] @@ -396,174 +413,189 @@ { "id": "xlsurvivor_jumpsuit", "type": "ARMOR", + "name": { "str": "XL kevlar jumpsuit" }, + "copy-from": "survivor_jumpsuit", + "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, + "extend": { "flags": [ "OVERSIZE" ] } + }, + { + "id": "xssurvivor_jumpsuit", + "type": "ARMOR", + "name": { "str": "XS kevlar jumpsuit" }, + "copy-from": "survivor_jumpsuit", + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.75 }, + "extend": { "flags": [ "UNDERSIZE" ] } + }, + { + "id": "hsurvivor_jumpsuit", + "type": "ARMOR", "category": "armor", - "name": { "str": "XL survivor suit" }, - "description": "A massive hand-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit. Protects from the elements as well as from harm.", - "weight": "12400 g", - "volume": "18 L", - "price": 150000, - "price_postapoc": 4000, + "name": { "str": "steel-plated kevlar jumpsuit" }, + "description": "A heavy, hand-built combination armor made from tempered steel plates and a leather jumpsuit padded with layered kevlar. Protects from the elements as well as from harm.", + "weight": "15500 g", + "volume": "12 L", + "price": 200000, + "price_postapoc": 7000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar_layered", "leather" ], + "material": [ "kevlar_layered", "qt_steel", "leather" ], "symbol": "[", - "looks_like": "survivor_jumpsuit", - "color": "brown", + "looks_like": "survivor_suit", + "color": "dark_gray", "armor": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 17, 17 ] }, - { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 17, 17 ] }, - { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 17, 17 ] } - ], - "pocket_data": [ - { - "pocket_type": "CONTAINER", - "max_contains_volume": "500 ml", - "max_contains_weight": "2 kg", - "moves": 80, - "max_item_length": "15 cm", - "description": "pants pocket" - }, { - "pocket_type": "CONTAINER", - "max_contains_volume": "500 ml", - "max_contains_weight": "2 kg", - "moves": 80, - "max_item_length": "15 cm", - "description": "pants pocket" + "material": [ + { "type": "leather", "covered_by_mat": 100, "thickness": 0.2 }, + { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 2 }, + { "type": "qt_steel", "covered_by_mat": 90, "thickness": 0.6 }, + { "type": "qt_steel", "covered_by_mat": 90, "thickness": 0.6 } + ], + "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 100, + "encumbrance": [ 17, 17 ] } ], + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } + ], "warmth": 15, - "material_thickness": 4, - "valid_mods": [ "steel_padded" ], "environmental_protection": 3, - "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] + "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] }, { - "id": "xssurvivor_jumpsuit", + "id": "xl_hsurvivor_jumpsuit", "type": "ARMOR", - "copy-from": "survivor_jumpsuit", - "looks_like": "survivor_jumpsuit", - "name": { "str": "XS survivor suit" }, - "description": "A tiny hand-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit. Protects from the elements as well as from harm.", - "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, - "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "UNDERSIZE" ] + "name": { "str": "XL steel-plated kevlar jumpsuit" }, + "copy-from": "hsurvivor_jumpsuit", + "proportional": { "weight": 1.13, "volume": 1.13, "price": 1.25 }, + "extend": { "flags": [ "OVERSIZE" ] } + }, + { + "id": "xs_hsurvivor_jumpsuit", + "type": "ARMOR", + "name": { "str": "XS steel-plated kevlar jumpsuit" }, + "copy-from": "hsurvivor_jumpsuit", + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.75 }, + "extend": { "flags": [ "UNDERSIZE" ] } }, { "id": "wsurvivor_jumpsuit", "type": "ARMOR", "category": "armor", - "name": { "str": "winter survivor suit" }, - "description": "A warm and heavy hand-built combination armor made from a reinforced bulletproof vest and an insulated leather jumpsuit. Protects from the elements as well as from harm.", + "name": { "str": "fur kevlar jumpsuit" }, + "description": "A warm and heavy hand-built combination armor made from a jumpsuit padded with layered kevlar and fur. Protects from the elements as well as from harm.", "weight": "7800 g", "volume": "14 L", "price": 200000, "price_postapoc": 5000, "to_hit": -3, "bashing": 6, - "material": [ "kevlar_layered", "fur" ], + "material": [ "kevlar_layered", "fur", "leather" ], "symbol": "[", - "looks_like": "survivor_jumpsuit", - "color": "light_gray", + "looks_like": "survivor_suit", + "color": "dark_gray", "armor": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 20, 20 ] }, - { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 20, 20 ] }, - { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 20, 20 ] } - ], - "pocket_data": [ { - "pocket_type": "CONTAINER", - "max_contains_volume": "500 ml", - "max_contains_weight": "2 kg", - "moves": 80, - "max_item_length": "15 cm", - "description": "pants pocket" - }, - { - "pocket_type": "CONTAINER", - "max_contains_volume": "500 ml", - "max_contains_weight": "2 kg", - "moves": 80, - "max_item_length": "15 cm", - "description": "pants pocket" + "material": [ + { "type": "leather", "covered_by_mat": 100, "thickness": 0.2 }, + { "type": "fur", "covered_by_mat": 100, "thickness": 2 }, + { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1 }, + { "type": "kevlar_layered", "covered_by_mat": 90, "thickness": 1 } + ], + "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 100, + "encumbrance": [ 19, 19 ] } ], + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } + ], "warmth": 75, - "material_thickness": 5, - "valid_mods": [ "steel_padded" ], "environmental_protection": 5, "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] }, { "id": "xl_wsurvivor_jumpsuit", "type": "ARMOR", - "name": { "str": "XL winter survivor suit" }, + "name": { "str": "XL fur kevlar jumpsuit" }, "copy-from": "wsurvivor_jumpsuit", "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, - "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "OVERSIZE" ] + "extend": { "flags": [ "OVERSIZE" ] } }, { "id": "xs_wsurvivor_jumpsuit", "type": "ARMOR", + "name": { "str": "XS fur kevlar jumpsuit" }, "copy-from": "wsurvivor_jumpsuit", - "looks_like": "wsurvivor_jumpsuit", - "name": { "str": "XS winter survivor suit" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, - "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "UNDERSIZE" ] + "extend": { "flags": [ "UNDERSIZE" ] } }, { "id": "wsurvivor_jumpsuit_nofur", "type": "ARMOR", - "name": { "str": "winter survivor suit" }, - "description": "A warm and heavy hand-built combination armor made from a reinforced bulletproof vest and a faux fur insulated leather jumpsuit. Protects from the elements as well as from harm.", + "name": { "str": "faux fur kevlar jumpsuit" }, + "description": "A warm and heavy hand-built combination armor made from a jumpsuit padded with layered kevlar and faux fur. Protects from the elements as well as from harm.", "copy-from": "wsurvivor_jumpsuit", - "material": [ "kevlar_layered", "faux_fur" ], - "symbol": "[", - "warmth": 65, - "looks_like": "survivor_jumpsuit", - "color": "pink" + "material": [ "kevlar_layered", "faux_fur", "leather" ], + "armor": [ + { + "material": [ + { "type": "leather", "covered_by_mat": 100, "thickness": 0.2 }, + { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2 }, + { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1 }, + { "type": "kevlar_layered", "covered_by_mat": 90, "thickness": 1 } + ], + "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 100, + "encumbrance": [ 19, 19 ] + } + ], + "warmth": 65 }, { - "id": "xl_wsurvivor_jumpsuit_nofur", + "id": "xs_wsurvivor_jumpsuit_nofur", "type": "ARMOR", - "name": { "str": "XL winter survivor suit" }, - "copy-from": "wsurvivor_jumpsuit", - "material": [ "kevlar_layered", "faux_fur" ], - "description": "A warm, heavy and oversized hand-built combination armor made from a reinforced bulletproof vest and a faux fur insulated leather jumpsuit. Protects from the elements as well as from harm.", - "color": "pink", - "warmth": 65, - "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, - "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "OVERSIZE" ] + "name": { "str": "XS faux fur kevlar jumpsuit" }, + "copy-from": "wsurvivor_jumpsuit_nofur", + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "extend": { "flags": [ "UNDERSIZE" ] } }, { - "id": "xs_wsurvivor_jumpsuit_nofur", + "id": "xl_wsurvivor_jumpsuit_nofur", "type": "ARMOR", + "name": { "str": "XL faux fur kevlar jumpsuit" }, "copy-from": "wsurvivor_jumpsuit_nofur", - "looks_like": "wsurvivor_jumpsuit_nofur", - "name": { "str": "XS winter survivor suit" }, - "description": "A warm, heavy and undersized hand-built combination armor made from a reinforced bulletproof vest and a faux fur insulated leather jumpsuit. Protects from the elements as well as from harm.", - "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, - "flags": [ "UNDERSIZE" ] + "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, + "extend": { "flags": [ "OVERSIZE" ] } }, { "id": "h20survivor_jumpsuit", "type": "ARMOR", "category": "armor", - "name": { "str": "survivor wetsuit" }, - "description": "A lightweight, hand-built combination armor made from a cut-down bulletproof vest and a reinforced neoprene wetsuit. Protects from the elements as well as from harm.", + "name": { "str": "kevlar wetsuit" }, + "description": "A hand-built combination armor made from a wetsuit padded with layered kevlar. Protects from the elements as well as from harm.", "weight": "6400 g", - "volume": "7 L", + "volume": "7000 ml", "price": 110000, "price_postapoc": 5000, + "material": [ "neoprene", "kevlar_layered" ], + "symbol": "[", "to_hit": -3, "bashing": 6, - "material": [ "kevlar", "plastic", "neoprene" ], - "symbol": "[", "looks_like": "wetsuit", "color": "dark_gray", "armor": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 10, 10 ] }, - { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 10, 10 ] }, - { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 10, 10 ] } + { + "material": [ + { "type": "neoprene", "covered_by_mat": 100, "thickness": 3 }, + { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1 } + ], + "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 100, + "encumbrance": [ 11, 11 ] + } ], "pocket_data": [ { @@ -571,7 +603,7 @@ "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80, - "max_item_length": "15 cm", + "max_item_length": "11 cm", "description": "pants pocket" }, { @@ -579,13 +611,80 @@ "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 80, - "max_item_length": "15 cm", + "max_item_length": "11 cm", "description": "pants pocket" } ], - "warmth": 15, - "material_thickness": 3, + "warmth": 30, "environmental_protection": 10, "flags": [ "VARSIZE", "WATER_FRIENDLY", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] + }, + { + "id": "xs_h20survivor_jumpsuit", + "type": "ARMOR", + "name": { "str": "XS kevlar wetsuit" }, + "copy-from": "h20survivor_jumpsuit", + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "extend": { "flags": [ "UNDERSIZE" ] } + }, + { + "id": "xl_h20survivor_jumpsuit", + "type": "ARMOR", + "name": { "str": "XL kevlar wetsuit" }, + "copy-from": "h20survivor_jumpsuit", + "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, + "extend": { "flags": [ "OVERSIZE" ] } + }, + { + "id": "fsurvivor_jumpsuit", + "type": "ARMOR", + "category": "armor", + "name": { "str": "kevlar firesuit" }, + "description": "A heavy, hand-built combination armor made from flame-resistant Nomex padded with layered kevlar. Protects from the fire as well as from harm.", + "weight": "6800 g", + "volume": "11500 ml", + "price": 200000, + "price_postapoc": 5000, + "to_hit": -3, + "bashing": 6, + "material": [ "nomex", "kevlar_layered" ], + "symbol": "[", + "looks_like": "survivor_suit", + "color": "light_gray", + "armor": [ + { + "material": [ + { "type": "nomex", "covered_by_mat": 100, "thickness": 2 }, + { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1 }, + { "type": "kevlar_layered", "covered_by_mat": 90, "thickness": 1 } + ], + "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 100, + "encumbrance": [ 19, 19 ] + } + ], + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 } + ], + "warmth": 15, + "environmental_protection": 4, + "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "RAINPROOF", "STURDY" ] + }, + { + "id": "xs_fsurvivor_jumpsuit", + "type": "ARMOR", + "name": { "str": "XS kevlar firesuit" }, + "copy-from": "fsurvivor_jumpsuit", + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "extend": { "flags": [ "UNDERSIZE" ] } + }, + { + "id": "xl_fsurvivor_jumpsuit", + "type": "ARMOR", + "name": { "str": "XL kevlar firesuit" }, + "copy-from": "fsurvivor_jumpsuit", + "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, + "extend": { "flags": [ "OVERSIZE" ] } } ] diff --git a/data/json/items/armor/bespoke_armor/cuttingroom.json b/data/json/items/armor/bespoke_armor/cuttingroom.json index a8b31ac46fa3f..1bfdcbfb0b29d 100644 --- a/data/json/items/armor/bespoke_armor/cuttingroom.json +++ b/data/json/items/armor/bespoke_armor/cuttingroom.json @@ -281,34 +281,12 @@ { "id": "xlhsurvivor_suit", "type": "ARMOR", - "category": "armor", - "name": { "str": "XL heavy survivor suit" }, - "description": "A massive, heavy, hand-built combination armor made from a reinforced bulletproof vest and a metal-plated leather jumpsuit. Protects from the elements as well as from harm.", - "weight": "20500 g", - "volume": "18750 ml", - "price": 200000, - "price_postapoc": 5000, - "to_hit": -3, - "bashing": 6, - "material": [ "kevlar_layered", "steel", "leather" ], - "symbol": "[", + "copy-from": "hsurvivor_suit", "looks_like": "hsurvivor_suit", - "color": "dark_gray", - "armor": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 22, 39 ] }, - { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 22, 28 ] }, - { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 22, 22 ] } - ], - "pocket_data": [ - { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 } - ], - "warmth": 15, - "material_thickness": 6, - "environmental_protection": 3, - "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] + "name": { "str": "XL heavy survivor suit" }, + "description": "A heavy, hand-built combination armor made from a reinforced bulletproof vest and a metal-plated leather jumpsuit. Protects from the elements as well as from harm.", + "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, + "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "OVERSIZE" ] }, { "id": "xshsurvivor_suit", diff --git a/data/json/items/armor/swimming.json b/data/json/items/armor/swimming.json index 4643ac31fef33..49996147559c0 100644 --- a/data/json/items/armor/swimming.json +++ b/data/json/items/armor/swimming.json @@ -46,14 +46,16 @@ "price": 10000, "price_postapoc": 500, "to_hit": -3, - "material": [ "neoprene", "cotton" ], + "material": [ "neoprene" ], "symbol": "[", - "looks_like": "wetsuit_spring", "color": "dark_gray", "armor": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 11, 14 ] }, - { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 11, 13 ] }, - { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 11, 11 ] } + { + "material": [ { "type": "neoprene", "covered_by_mat": 100, "thickness": 3 } ], + "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 100, + "encumbrance": [ 11, 11 ] + } ], "pocket_data": [ { @@ -71,9 +73,8 @@ "moves": 130 } ], - "warmth": 50, - "material_thickness": 3, - "environmental_protection": 2, + "warmth": 30, + "environmental_protection": 3, "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT" ] }, { @@ -85,7 +86,7 @@ "volume": "1 L", "price": 4500, "price_postapoc": 250, - "material": [ "neoprene", "cotton" ], + "material": [ "neoprene" ], "symbol": "[", "looks_like": "hood_rain", "color": "dark_gray", diff --git a/data/json/recipes/armor/bespoke_armor/survivor.json b/data/json/recipes/armor/bespoke_armor/survivor.json index a8bab828743b1..54037f0fd4c19 100644 --- a/data/json/recipes/armor/bespoke_armor/survivor.json +++ b/data/json/recipes/armor/bespoke_armor/survivor.json @@ -30,6 +30,7 @@ { "result": "xs_wsurvivor_jumpsuit_nofur", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "copy-from": "wsurvivor_jumpsuit_nofur", "time": "10 h", "using": [ [ "sewing_standard", 150 ], [ "fabric_standard_nostretch", 7 ], [ "fabric_fauxfur", 15 ] ], @@ -43,9 +44,10 @@ }, { "result": "xl_wsurvivor_jumpsuit_nofur", - "copy-from": "wsurvivor_jumpsuit_nofur", - "time": "16 h", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "copy-from": "wsurvivor_jumpsuit_nofur", + "time": "11 h 36 m", "using": [ [ "sewing_standard", 300 ], [ "fabric_standard_nostretch", 20 ], @@ -71,14 +73,46 @@ "skills_required": [ "fabrication", 6 ], "time": "12 h", "autolearn": true, - "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 10 ] ], + "using": [ [ "sewing_standard", 200 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" } ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], - "components": [ [ [ "wetsuit", 1 ], [ "wetsuit_spring", 1 ] ], [ [ "duct_tape", 400 ] ], [ [ "sheet_kevlar_layered", 24 ] ] ] + "components": [ + [ [ "wetsuit", 1 ], [ "sheet_neoprene_patchwork", 2 ], [ "neoprene", 10 ], [ "sheet_neoprene", 140 ] ], + [ [ "duct_tape", 400 ] ], + [ [ "sheet_kevlar_layered", 12 ] ] + ] + }, + { + "result": "xs_h20survivor_jumpsuit", + "type": "recipe", + "copy-from": "h20survivor_jumpsuit", + "activity_level": "LIGHT_EXERCISE", + "time": "12 h", + "using": [ [ "sewing_standard", 150 ] ], + "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], + "components": [ + [ [ "wetsuit", 1 ], [ "sheet_neoprene_patchwork", 2 ], [ "neoprene", 7 ], [ "sheet_neoprene", 105 ] ], + [ [ "duct_tape", 300 ] ], + [ [ "sheet_kevlar_layered", 9 ] ] + ] + }, + { + "result": "xl_h20survivor_jumpsuit", + "type": "recipe", + "copy-from": "h20survivor_jumpsuit", + "activity_level": "LIGHT_EXERCISE", + "time": "14 h", + "using": [ [ "sewing_standard", 300 ] ], + "tools": [ [ [ "welder", 84 ], [ "welder_crude", 126 ], [ "soldering_iron", 126 ], [ "toolset", 126 ] ] ], + "components": [ + [ [ "wetsuit", 1 ], [ "sheet_neoprene_patchwork", 3 ], [ "neoprene", 15 ], [ "sheet_neoprene", 210 ] ], + [ [ "duct_tape", 600 ] ], + [ [ "sheet_kevlar_layered", 18 ] ] + ] }, { "result": "lsurvivor_jumpsuit", @@ -91,7 +125,7 @@ "skills_required": [ "fabrication", 6 ], "time": "6 h", "autolearn": true, - "using": [ [ "sewing_standard", 100 ], [ "fabric_standard_nostretch", 30 ] ], + "using": [ [ "sewing_standard", 100 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -99,6 +133,7 @@ ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ + [ [ "rag", 20 ], [ "sheet_cotton_patchwork", 20 ], [ "sheet_cotton", 20 ], [ "jumpsuit", 1 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 200 ] ], [ [ "sheet_kevlar_layered", 24 ] ] @@ -109,9 +144,10 @@ "type": "recipe", "copy-from": "lsurvivor_jumpsuit", "time": "6 h", - "using": [ [ "sewing_standard", 75 ], [ "fabric_standard_nostretch", 22 ] ], + "using": [ [ "sewing_standard", 75 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ + [ [ "rag", 15 ], [ "sheet_cotton_patchwork", 15 ], [ "sheet_cotton", 22 ], [ "jumpsuit", 1 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 150 ] ], [ [ "sheet_kevlar_layered", 18 ] ] @@ -122,12 +158,13 @@ "type": "recipe", "copy-from": "lsurvivor_jumpsuit", "time": "7 h", - "using": [ [ "sewing_standard", 150 ], [ "fabric_standard_nostretch", 45 ] ], + "using": [ [ "sewing_standard", 150 ] ], "tools": [ [ [ "welder", 36 ], [ "welder_crude", 58 ], [ "soldering_iron", 58 ], [ "toolset", 58 ] ] ], "components": [ + [ [ "rag", 30 ], [ "sheet_cotton_patchwork", 30 ], [ "sheet_cotton", 30 ], [ "jumpsuit", 2 ] ], [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "sheet_kevlar_layered", 48 ] ] + [ [ "sheet_kevlar_layered", 36 ] ] ] }, { @@ -141,7 +178,7 @@ "skills_required": [ "fabrication", 6 ], "time": "7 h", "autolearn": true, - "using": [ [ "sewing_standard", 150 ], [ "fabric_standard_nostretch", 20 ] ], + "using": [ [ "sewing_standard", 150 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -152,24 +189,45 @@ ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ - [ [ "leather", 20 ], [ "tanned_hide", 4 ] ], + [ [ "rag", 10 ], [ "sheet_cotton_patchwork", 10 ], [ "sheet_cotton", 10 ], [ "jumpsuit", 1 ] ], + [ [ "leather", 12 ], [ "tanned_hide", 2 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 300 ] ], - [ [ "sheet_kevlar_layered", 24 ] ] + [ [ "sheet_kevlar_layered", 36 ] ] ] }, { "result": "xssurvivor_jumpsuit", "type": "recipe", "copy-from": "survivor_jumpsuit", + "activity_level": "LIGHT_EXERCISE", "time": "7 h", - "using": [ [ "sewing_standard", 112 ], [ "fabric_standard_nostretch", 15 ] ], + "using": [ [ "sewing_standard", 112 ] ], + "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ - [ [ "leather", 15 ], [ "tanned_hide", 3 ] ], + [ [ "rag", 7 ], [ "sheet_cotton_patchwork", 7 ], [ "sheet_cotton", 7 ], [ "jumpsuit", 1 ] ], + [ [ "leather", 9 ], [ "tanned_hide", 2 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 225 ] ], - [ [ "sheet_kevlar_layered", 18 ] ] + [ [ "sheet_kevlar_layered", 27 ] ] + ] + }, + { + "result": "xlsurvivor_jumpsuit", + "type": "recipe", + "copy-from": "survivor_jumpsuit", + "activity_level": "LIGHT_EXERCISE", + "time": "8 h 10 m", + "using": [ [ "sewing_standard", 200 ] ], + "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], + "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "components": [ + [ [ "rag", 15 ], [ "sheet_cotton_patchwork", 15 ], [ "sheet_cotton", 15 ], [ "jumpsuit", 2 ] ], + [ [ "leather", 18 ], [ "tanned_hide", 3 ] ], + [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], + [ [ "duct_tape", 450 ] ], + [ [ "sheet_kevlar_layered", 54 ] ] ] }, { @@ -183,12 +241,7 @@ "skills_required": [ "fabrication", 6 ], "time": "10 h", "autolearn": true, - "using": [ - [ "sewing_standard", 200 ], - [ "fabric_standard_nostretch", 10 ], - [ "fabric_leather_hide", 4 ], - [ "fabric_fur_pelt", 3 ] - ], + "using": [ [ "sewing_standard", 200 ], [ "fabric_leather_hide", 2 ], [ "fabric_fur_pelt", 3 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -200,6 +253,7 @@ ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ + [ [ "rag", 10 ], [ "sheet_cotton_patchwork", 10 ], [ "sheet_cotton", 10 ], [ "jumpsuit", 1 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 300 ] ], [ [ "sheet_kevlar_layered", 24 ] ] @@ -209,15 +263,13 @@ "result": "xs_wsurvivor_jumpsuit", "type": "recipe", "copy-from": "wsurvivor_jumpsuit", + "activity_level": "LIGHT_EXERCISE", "time": "10 h", - "using": [ - [ "sewing_standard", 150 ], - [ "fabric_standard_nostretch", 7 ], - [ "fabric_leather_hide", 3 ], - [ "fabric_fur_pelt", 2 ] - ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "using": [ [ "sewing_standard", 150 ], [ "fabric_leather_hide", 2 ], [ "fabric_fur_pelt", 2 ] ], + "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], + "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ + [ [ "rag", 7 ], [ "sheet_cotton_patchwork", 7 ], [ "sheet_cotton", 7 ], [ "jumpsuit", 1 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 225 ] ], [ [ "sheet_kevlar_layered", 18 ] ] @@ -225,75 +277,116 @@ }, { "result": "xl_wsurvivor_jumpsuit", - "copy-from": "wsurvivor_jumpsuit", - "time": "11 h 30 m", "type": "recipe", - "using": [ - [ "sewing_standard", 300 ], - [ "fabric_standard_nostretch", 20 ], - [ "fabric_leather_hide", 6 ], - [ "fabric_fur_pelt", 6 ] - ], + "copy-from": "wsurvivor_jumpsuit", + "activity_level": "LIGHT_EXERCISE", + "time": "11 h 36 m", + "using": [ [ "sewing_standard", 300 ], [ "fabric_leather_hide", 3 ], [ "fabric_fur_pelt", 5 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 104 ], [ "soldering_iron", 104 ], [ "toolset", 104 ] ] ], + "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], "components": [ + [ [ "rag", 15 ], [ "sheet_cotton_patchwork", 15 ], [ "sheet_cotton", 15 ], [ "jumpsuit", 2 ] ], [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], - [ [ "duct_tape", 400 ] ], - [ [ "sheet_kevlar_layered", 48 ] ] + [ [ "duct_tape", 450 ] ], + [ [ "sheet_kevlar_layered", 36 ] ] ] }, { - "result": "xlsurvivor_jumpsuit", + "result": "survivor_rig", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_SUIT", + "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", - "difficulty": 6, - "skills_required": [ "fabrication", 6 ], - "time": "8 h 10 m", + "difficulty": 5, + "skills_required": [ "fabrication", 3 ], + "time": "5 h", "autolearn": true, - "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 30 ], [ "fabric_leather_hide", 7 ] ], + "using": [ [ "sewing_standard", 100 ], [ "fastener_large", 1 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ - { "proficiency": "prof_leatherworking_basic" }, - { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" } ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ - [ [ "scrap", 8 ] ], - [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], - [ [ "duct_tape", 400 ] ], - [ [ "sheet_kevlar_layered", 42 ] ] + [ [ "nylon", 10 ] ], + [ [ "duct_tape", 200 ] ], + [ [ "legrig", 1 ], [ "ragpouch", 6 ], [ "leather_pouch", 4 ], [ "dump_pouch", 2 ] ], + [ [ "purse", 2 ], [ "fanny", 2 ], [ "mbag", 2 ] ] ] }, { - "result": "survivor_rig", + "result": "fsurvivor_jumpsuit", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_STORAGE", + "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", - "difficulty": 5, - "skills_required": [ "fabrication", 3 ], - "time": "5 h", + "difficulty": 8, + "skills_required": [ "fabrication", 7 ], + "time": "12 h 20 m", "autolearn": true, - "using": [ [ "sewing_standard", 100 ], [ "fastener_large", 1 ] ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], + "book_learn": [ [ "tailor_portfolio", 7 ], [ "textbook_fireman", 7 ] ], + "using": [ [ "sewing_standard", 200 ] ], + "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" } ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ - [ [ "nylon", 10 ] ], + [ + [ "nomex_suit", 1 ], + [ "entry_suit", 1 ], + [ "sheet_neoprene_patchwork", 2 ], + [ "neoprene", 10 ], + [ "sheet_neoprene", 140 ] + ], + [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 200 ] ], - [ [ "legrig", 1 ], [ "ragpouch", 6 ], [ "leather_pouch", 4 ], [ "dump_pouch", 2 ] ], - [ [ "purse", 2 ], [ "fanny", 2 ], [ "mbag", 2 ] ] + [ [ "sheet_kevlar_layered", 24 ] ] + ] + }, + { + "result": "xs_fsurvivor_jumpsuit", + "type": "recipe", + "copy-from": "fsurvivor_jumpsuit", + "time": "12 h 20 m", + "using": [ [ "sewing_standard", 150 ] ], + "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], + "components": [ + [ + [ "nomex_suit", 1 ], + [ "entry_suit", 1 ], + [ "sheet_neoprene_patchwork", 2 ], + [ "neoprene", 7 ], + [ "sheet_neoprene", 105 ] + ], + [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], + [ [ "duct_tape", 150 ] ], + [ [ "sheet_kevlar_layered", 18 ] ] + ] + }, + { + "result": "xl_fsurvivor_jumpsuit", + "type": "recipe", + "copy-from": "fsurvivor_jumpsuit", + "time": "14 h 18 m", + "using": [ [ "sewing_standard", 300 ] ], + "tools": [ [ [ "welder", 45 ], [ "welder_crude", 90 ], [ "soldering_iron", 90 ], [ "toolset", 90 ] ] ], + "components": [ + [ + [ "nomex_suit", 1 ], + [ "entry_suit", 1 ], + [ "sheet_neoprene_patchwork", 3 ], + [ "neoprene", 15 ], + [ "sheet_neoprene", 210 ] + ], + [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], + [ [ "duct_tape", 300 ] ], + [ [ "sheet_kevlar_layered", 48 ] ] ] } ] diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index c353d087699c4..8b10f1186c0c6 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -1357,111 +1357,6 @@ ] ] }, - { - "result": "fsurvivor_suit", - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_SUIT", - "skill_used": "tailor", - "difficulty": 8, - "skills_required": [ "fabrication", 7 ], - "time": "12 h 20 m", - "autolearn": true, - "book_learn": [ [ "tailor_portfolio", 7 ], [ "textbook_fireman", 7 ] ], - "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 4 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], - "proficiencies": [ - { "proficiency": "prof_closures" }, - { "proficiency": "prof_closures_waterproofing" }, - { "proficiency": "prof_polymerworking" } - ], - "components": [ - [ [ "nomex_suit", 1 ], [ "entry_suit", 1 ] ], - [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], - [ - [ "tacvest", 1 ], - [ "legrig", 1 ], - [ "vest", 1 ], - [ "tool_belt", 1 ], - [ "ragpouch", 6 ], - [ "leather_pouch", 4 ], - [ "dump_pouch", 1 ], - [ "purse", 2 ], - [ "fanny", 2 ] - ], - [ [ "duct_tape", 200 ] ], - [ - [ "kevlar", 1 ], - [ "ballistic_vest_light", 1 ], - [ "ballistic_vest_esapi", 1 ], - [ "swat_armor", 1 ], - [ "sheet_kevlar_layered", 24 ] - ] - ] - }, - { - "result": "xs_fsurvivor_suit", - "type": "recipe", - "copy-from": "fsurvivor_suit", - "time": "12 h 20 m", - "using": [ [ "sewing_standard", 150 ], [ "fabric_standard_nostretch", 3 ] ], - "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], - "components": [ - [ [ "nomex_suit", 1 ], [ "entry_suit", 1 ] ], - [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], - [ - [ "tacvest", 1 ], - [ "legrig", 1 ], - [ "vest", 1 ], - [ "tool_belt", 1 ], - [ "ragpouch", 6 ], - [ "leather_pouch", 4 ], - [ "dump_pouch", 1 ], - [ "purse", 2 ], - [ "fanny", 2 ] - ], - [ [ "duct_tape", 150 ] ], - [ - [ "kevlar", 1 ], - [ "ballistic_vest_light", 1 ], - [ "ballistic_vest_esapi", 1 ], - [ "swat_armor", 1 ], - [ "sheet_kevlar_layered", 18 ] - ] - ] - }, - { - "result": "xl_fsurvivor_suit", - "type": "recipe", - "copy-from": "fsurvivor_suit", - "time": "13 h 50 m", - "using": [ [ "sewing_standard", 300 ], [ "fabric_standard_nostretch", 8 ] ], - "tools": [ [ [ "welder", 45 ], [ "welder_crude", 90 ], [ "soldering_iron", 90 ], [ "toolset", 90 ] ] ], - "components": [ - [ [ "xl_nomex_suit", 1 ], [ "xl_entry_suit", 1 ] ], - [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], - [ - [ "tacvest", 1 ], - [ "legrig", 1 ], - [ "vest", 1 ], - [ "tool_belt", 1 ], - [ "ragpouch", 6 ], - [ "leather_pouch", 4 ], - [ "dump_pouch", 1 ], - [ "purse", 2 ], - [ "fanny", 2 ] - ], - [ [ "duct_tape", 300 ] ], - [ - [ "kevlar", 2 ], - [ "ballistic_vest_light", 2 ], - [ "ballistic_vest_esapi", 2 ], - [ "swat_armor", 2 ], - [ "sheet_kevlar_layered", 48 ] - ] - ] - }, { "result": "mask_wsurvivor_nofur", "type": "recipe", @@ -1797,7 +1692,7 @@ "components": [ [ [ "sheet_kevlar_layered", 25 ] ] ] }, { - "result": "hsurvivor_suit", + "result": "hsurvivor_jumpsuit", "type": "recipe", "activity_level": "MODERATE_EXERCISE", "category": "CC_ARMOR", @@ -1807,71 +1702,87 @@ "skills_required": [ "fabrication", 7 ], "time": "20 h", "autolearn": true, - "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 20 ], [ "fabric_leather_hide", 4 ] ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], + "using": [ + [ "sewing_standard", 200 ], + [ "blacksmithing_standard", 10 ], + [ "mc_steel_standard", 3 ], + [ "fabric_leather_fur_hide", 2 ] + ], "proficiencies": [ - { "proficiency": "prof_leatherworking_basic" }, - { "proficiency": "prof_leatherworking" }, - { "proficiency": "prof_closures" }, + { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.1, "time_multiplier": 1.1 }, + { "proficiency": "prof_leatherworking", "fail_multiplier": 1.1, "time_multiplier": 1.1 }, + { "proficiency": "prof_closures", "fail_multiplier": 1.1, "time_multiplier": 1.1 }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" }, { "proficiency": "prof_metalworking" }, - { "proficiency": "prof_articulation" } + { "proficiency": "prof_articulation", "fail_multiplier": 1.1, "time_multiplier": 1.1 }, + { "proficiency": "prof_blacksmithing" }, + { "proficiency": "prof_armorsmithing" }, + { "proficiency": "prof_quenching" } + ], + "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "CHISEL", "level": 3 } ], + "tools": [ + [ [ "welder", 64 ], [ "welder_crude", 97 ], [ "soldering_iron", 97 ], [ "toolset", 97 ] ], + [ [ "swage", -1 ] ], + [ [ "metal_tank", -1 ] ], + [ [ "water", -240 ] ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ - [ [ "steel_chunk", 4 ], [ "scrap", 12 ] ], + [ [ "rag", 10 ], [ "sheet_cotton_patchwork", 10 ], [ "sheet_cotton", 10 ], [ "jumpsuit", 1 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], - [ - [ "tacvest", 1 ], - [ "legrig", 1 ], - [ "vest", 1 ], - [ "tool_belt", 1 ], - [ "ragpouch", 6 ], - [ "leather_pouch", 4 ], - [ "dump_pouch", 1 ], - [ "purse", 2 ], - [ "fanny", 2 ] - ], [ [ "duct_tape", 300 ] ], - [ - [ "kevlar", 1 ], - [ "ballistic_vest_light", 1 ], - [ "ballistic_vest_esapi", 1 ], - [ "swat_armor", 1 ], - [ "sheet_kevlar_layered", 24 ] - ] + [ [ "sheet_kevlar_layered", 30 ] ] ] }, { - "result": "xshsurvivor_suit", + "result": "xs_hsurvivor_jumpsuit", "type": "recipe", - "copy-from": "hsurvivor_suit", - "time": "20 h", - "using": [ [ "sewing_standard", 150 ], [ "fabric_standard_nostretch", 15 ], [ "fabric_leather_hide", 3 ] ], - "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], + "activity_level": "MODERATE_EXERCISE", + "copy-from": "hsurvivor_jumpsuit", + "using": [ + [ "sewing_standard", 150 ], + [ "blacksmithing_standard", 8 ], + [ "mc_steel_standard", 2 ], + [ "fabric_leather_fur_hide", 2 ] + ], + "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "CHISEL", "level": 3 } ], + "tools": [ + [ [ "welder", 48 ], [ "welder_crude", 72 ], [ "soldering_iron", 72 ], [ "toolset", 72 ] ], + [ [ "swage", -1 ] ], + [ [ "metal_tank", -1 ] ], + [ [ "water", -240 ] ] + ], "components": [ - [ [ "steel_chunk", 3 ], [ "scrap", 9 ] ], + [ [ "rag", 7 ], [ "sheet_cotton_patchwork", 7 ], [ "sheet_cotton", 7 ], [ "jumpsuit", 1 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], - [ - [ "tacvest", 1 ], - [ "legrig", 1 ], - [ "vest", 1 ], - [ "tool_belt", 1 ], - [ "ragpouch", 6 ], - [ "leather_pouch", 4 ], - [ "dump_pouch", 1 ], - [ "purse", 2 ], - [ "fanny", 2 ] - ], [ [ "duct_tape", 225 ] ], - [ - [ "kevlar", 1 ], - [ "ballistic_vest_light", 1 ], - [ "ballistic_vest_esapi", 1 ], - [ "swat_armor", 1 ], - [ "sheet_kevlar_layered", 18 ] - ] + [ [ "sheet_kevlar_layered", 23 ] ] + ] + }, + { + "result": "xl_hsurvivor_jumpsuit", + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "copy-from": "hsurvivor_jumpsuit", + "time": "23 h", + "using": [ + [ "sewing_standard", 300 ], + [ "blacksmithing_standard", 15 ], + [ "mc_steel_standard", 5 ], + [ "fabric_leather_fur_hide", 3 ] + ], + "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "CHISEL", "level": 3 } ], + "tools": [ + [ [ "welder", 72 ], [ "welder_crude", 109 ], [ "soldering_iron", 109 ], [ "toolset", 109 ] ], + [ [ "swage", -1 ] ], + [ [ "metal_tank", -1 ] ], + [ [ "water", -240 ] ] + ], + "components": [ + [ [ "rag", 15 ], [ "sheet_cotton_patchwork", 15 ], [ "sheet_cotton", 15 ], [ "jumpsuit", 1 ] ], + [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], + [ [ "duct_tape", 450 ] ], + [ [ "sheet_kevlar_layered", 45 ] ] ] }, { @@ -2103,53 +2014,6 @@ "autolearn": true, "using": [ [ "sewing_standard", 150 ], [ "fabric_felt", 24 ] ] }, - { - "result": "xlhsurvivor_suit", - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_SUIT", - "skill_used": "tailor", - "difficulty": 8, - "skills_required": [ "fabrication", 8 ], - "time": "22 h 30 m", - "autolearn": true, - "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 30 ], [ "fabric_leather_hide", 7 ] ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "proficiencies": [ - { "proficiency": "prof_leatherworking_basic" }, - { "proficiency": "prof_metalworking" }, - { "proficiency": "prof_articulation" }, - { "proficiency": "prof_leatherworking" }, - { "proficiency": "prof_closures" }, - { "proficiency": "prof_closures_waterproofing" }, - { "proficiency": "prof_polymerworking" } - ], - "tools": [ [ [ "welder", 112 ], [ "welder_crude", 168 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ], - "components": [ - [ [ "steel_chunk", 8 ], [ "scrap", 24 ] ], - [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], - [ - [ "tacvest", 1 ], - [ "legrig", 1 ], - [ "vest", 1 ], - [ "tool_belt", 1 ], - [ "ragpouch", 6 ], - [ "leather_pouch", 4 ], - [ "dump_pouch", 1 ], - [ "purse", 2 ], - [ "fanny", 2 ] - ], - [ [ "duct_tape", 400 ] ], - [ - [ "kevlar", 2 ], - [ "ballistic_vest_light", 2 ], - [ "ballistic_vest_esapi", 2 ], - [ "swat_armor", 2 ], - [ "sheet_kevlar_layered", 48 ] - ] - ] - }, { "result": "yukata", "type": "recipe", diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index d41efd409c2a8..4fd8c8fb8319b 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -454,5 +454,35 @@ "type": "recipe", "result": "xl_chainmail_arms", "obsolete": true + }, + { + "type": "recipe", + "result": "hsurvivor_suit", + "obsolete": true + }, + { + "type": "recipe", + "result": "xshsurvivor_suit", + "obsolete": true + }, + { + "type": "recipe", + "result": "xlhsurvivor_suit", + "obsolete": true + }, + { + "type": "recipe", + "result": "fsurvivor_suit", + "obsolete": true + }, + { + "type": "recipe", + "result": "xs_fsurvivor_suit", + "obsolete": true + }, + { + "type": "recipe", + "result": "xl_fsurvivor_suit", + "obsolete": true } ] diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index ec9c04bc05b31..8a219d1f5cf56 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -584,6 +584,7 @@ firemask firepit firestarters firesuit +firesuits fireweed fishfolk fishily