From 0fac7c74eb200dc20fc5411b908426fc1ef1347b Mon Sep 17 00:00:00 2001 From: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com> Date: Mon, 25 Oct 2021 22:59:13 -0500 Subject: [PATCH] Make more things made out of nylon (#52376) * adds nylon jackets and nylon-ifies stuff Co-authored-by: Binrui Dong Co-authored-by: Kevin Granade --- .../itemgroups/Clothing_Gear/clothing.json | 17 ++++-- .../Locations_MapExtras/locations.json | 11 +++- .../locations_commercial.json | 1 + data/json/itemgroups/military.json | 6 +- data/json/itemgroups/misc.json | 2 +- data/json/items/armor/bandolier.json | 4 +- data/json/items/armor/coats.json | 61 ++++++++++++++++++- data/json/items/armor/storage.json | 28 ++++----- data/json/items/armor/torso_clothes.json | 45 ++++++++++++++ .../mapgen/military/mil_base/mil_base_z0.json | 2 +- data/json/npcs/NC_SOLDIER.json | 6 +- data/json/npcs/items_generic.json | 3 +- .../NPC_free_merchant_shopkeep.json | 2 +- data/json/professions.json | 30 ++++++--- data/json/recipes/armor/storage.json | 20 +++--- data/json/recipes/armor/suit.json | 2 +- data/json/recipes/armor/torso.json | 10 +-- 17 files changed, 193 insertions(+), 57 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 7cb201321e622..a0de053cfd13d 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -129,7 +129,7 @@ "//": "Standard (non-winter) set of clothes worn by soldiers and paramilitary forces.", "items": [ { "group": "clothing_soldier_shirt" }, - { "item": "jacket_army" }, + { "distribution": [ { "item": "jacket_army_modern", "prob": 50 }, { "item": "combat_shirt", "prob": 50 } ] }, { "item": "pants_army" }, { "item": "webbing_belt" }, { "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] }, @@ -224,7 +224,7 @@ "subtype": "collection", "//": "Standard set of clothes worn by a military helicopter pilot.", "items": [ - { "item": "jacket_army", "prob": 40 }, + { "item": "chestrig", "prob": 40 }, { "item": "flight_helmet", "ammo-item": "light_plus_battery_cell", "charges": [ 0, 150 ] }, { "item": "mil_flight_suit", "prob": 80 }, { "item": "nomex_gloves" }, @@ -1782,6 +1782,8 @@ { "item": "boots_combat", "prob": 10 }, { "item": "pants_army", "prob": 10 }, { "item": "jacket_army", "prob": 10 }, + { "item": "jacket_army_modern", "prob": 2 }, + { "item": "combat_shirt", "prob": 2 }, { "item": "winter_pants_army", "prob": 10 }, { "item": "winter_jacket_army", "prob": 10 }, { "item": "winter_gloves_army", "prob": 10 }, @@ -1946,7 +1948,8 @@ "id": "mil_armor", "items": [ [ "pants_army", 10 ], - [ "jacket_army", 10 ], + [ "jacket_army_modern", 5 ], + [ "jacket_army_modern", 5 ], [ "winter_pants_army", 30 ], [ "winter_jacket_army", 30 ], [ "winter_gloves_army", 30 ], @@ -2077,7 +2080,9 @@ [ "pants_cargo", 70 ], [ "shorts_cargo", 50 ], [ "pants_army", 30 ], - [ "jacket_army", 30 ], + [ "jacket_army", 6 ], + [ "combat_shirt", 6 ], + [ "jacket_army_modern", 18 ], [ "winter_pants_army", 10 ], [ "winter_jacket_army", 10 ], [ "winter_gloves_army", 10 ], @@ -2299,7 +2304,9 @@ [ "sleeveless_duster_survivor", 2 ], [ "vest", 40 ], [ "kevlar", 16 ], - [ "jacket_army", 28 ], + [ "jacket_army", 5 ], + [ "jacket_army_modern", 16 ], + [ "combat_shirt", 5 ], [ "trenchcoat", 12 ], [ "trenchcoat_leather", 10 ], [ "trenchcoat_fur", 5 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index dcb32e6cc901c..8d618097ae4dc 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -2398,7 +2398,10 @@ "subtype": "collection", "items": [ { "group": "clothing_soldier_shirt" }, - { "item": "jacket_army", "prob": 50 }, + { + "distribution": [ { "item": "combat_shirt", "prob": 50 }, { "item": "jacket_army_modern", "prob": 50 } ], + "prob": 50 + }, { "item": "elbow_pads", "prob": 10 }, { "item": "pants_army", "prob": 75 }, { "item": "webbing_belt", "prob": 50 }, @@ -2461,7 +2464,11 @@ "prob": 80 }, { - "distribution": [ { "item": "jacket_army", "prob": 80 }, { "item": "winter_jacket_army", "prob": 20 } ], + "distribution": [ + { "item": "combat_shirt", "prob": 40 }, + { "item": "jacket_army_modern", "prob": 40 }, + { "item": "winter_jacket_army", "prob": 20 } + ], "prob": 100 } ] diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index bdf0b4869132e..2ab7e8b396c0b 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -710,6 +710,7 @@ [ "emer_blanket", 20 ], [ "flyer", 10 ], [ "helmet_liner", 20 ], + [ "jacket_army", 40 ], [ "pur_tablets", 10 ], [ "knife_trench", 14 ], [ "flaregun", 20 ], diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index d675470d94dba..f42d3980f57b3 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -319,7 +319,8 @@ { "item": "mil_flight_suit", "prob": 30 }, { "item": "combo_cover", "prob": 20 }, { "item": "pants_army", "prob": 70 }, - { "item": "jacket_army", "prob": 70 }, + { "item": "combat_shirt", "prob": 35 }, + { "item": "jacket_army_modern", "prob": 35 }, { "item": "socks", "prob": 40 }, { "item": "winter_pants_army", "prob": 20 }, { "item": "winter_jacket_army", "prob": 20 }, @@ -536,7 +537,8 @@ { "item": "pants_army", "prob": 30 }, { "item": "flight_helmet", "prob": 10, "charges-min": 0, "charges-max": 100 }, { "item": "mil_flight_suit", "prob": 30 }, - { "item": "jacket_army", "prob": 30 }, + { "item": "combat_shirt", "prob": 15 }, + { "item": "jacket_army_modern", "prob": 15 }, { "item": "winter_pants_army", "prob": 10 }, { "item": "winter_jacket_army", "prob": 10 }, { "item": "winter_gloves_army", "prob": 10 }, diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index ea4e85c7b4629..cd05d85d81c8a 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -127,7 +127,7 @@ { "item": "duffelbag" }, { "item": "backpack" }, { "item": "helmet_army" }, - { "item": "jacket_army" }, + { "item": "jacket_army_modern" }, { "item": "pants_army" }, { "item": "tshirt", "count": 3 }, { "item": "under_armor" }, diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json index f4e35cb001581..7658a462229a4 100644 --- a/data/json/items/armor/bandolier.json +++ b/data/json/items/armor/bandolier.json @@ -199,7 +199,7 @@ "volume": "250 ml", "price": 5900, "price_postapoc": 750, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "ammo_satchel", "color": "dark_gray", @@ -237,7 +237,7 @@ "volume": "1250 ml", "price": 3000, "price_postapoc": 1250, - "material": [ "cotton" ], + "material": [ "nylon" ], "symbol": "[", "looks_like": "leather_belt", "color": "dark_gray", diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json index 40b31ccee0166..4de42ae8a404f 100644 --- a/data/json/items/armor/coats.json +++ b/data/json/items/armor/coats.json @@ -743,7 +743,7 @@ "repairs_like": "trenchcoat", "type": "ARMOR", "name": { "str_sp": "army jacket" }, - "description": "A tough jacket with lots of pockets. Favored by the military.", + "description": "A vintage army jacket, or at least a copy of one, with lots of pockets. Favored by the military.", "weight": "780 g", "volume": "3 L", "price": 3500, @@ -805,6 +805,65 @@ "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, + { + "id": "jacket_army_modern", + "type": "ARMOR", + "name": { "str_sp": "combat blouse" }, + "description": "A sleek blouse in a camouflage pattern with angled breast pockets and lots of loop velcro for affixing patches. You might call it a jacket but it's really a blouse. It has a pocket for your pen!", + "weight": "650 g", + "volume": "3 L", + "price": 6400, + "price_postapoc": 750, + "material": [ "nylon", "cotton" ], + "symbol": "[", + "looks_like": "jacket_army", + "color": "green", + "armor": [ + { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 7, 9 ] }, + { "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 7, 9 ] } + ], + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "max_contains_volume": "900 ml", + "max_contains_weight": "2 kg", + "max_item_length": "15 cm", + "moves": 70 + }, + { + "pocket_type": "CONTAINER", + "max_contains_volume": "900 ml", + "max_contains_weight": "2 kg", + "max_item_length": "15 cm", + "moves": 70 + }, + { + "pocket_type": "CONTAINER", + "max_contains_volume": "500 ml", + "max_contains_weight": "1 kg", + "max_item_length": "13 cm", + "moves": 120 + }, + { + "pocket_type": "CONTAINER", + "max_contains_volume": "500 ml", + "max_contains_weight": "1 kg", + "max_item_length": "13 cm", + "moves": 120 + }, + { + "pocket_type": "CONTAINER", + "max_contains_volume": "10 ml", + "max_contains_weight": "50 g", + "max_item_length": "13 cm", + "moves": 120 + } + ], + "warmth": 20, + "material_thickness": 0.4, + "valid_mods": [ "steel_padded" ], + "flags": [ "VARSIZE", "POCKETS", "OUTER" ] + }, { "id": "jacket_chef", "repairs_like": "trenchcoat", diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json index a40109e48afe6..23c016907c402 100644 --- a/data/json/items/armor/storage.json +++ b/data/json/items/armor/storage.json @@ -8,7 +8,7 @@ "volume": "2 L", "price": 3900, "price_postapoc": 500, - "material": [ "cotton" ], + "material": [ "nylon" ], "symbol": "[", "looks_like": "ragpouch", "color": "green", @@ -105,7 +105,7 @@ "volume": "9186 ml", "price": 4500, "price_postapoc": 750, - "material": [ "cotton" ], + "material": [ "nylon" ], "symbol": "[", "looks_like": "backpack", "color": "green", @@ -417,7 +417,7 @@ "//": "REI Co-op 22-liter daypack costs $54.95, so ballpark to $55", "price": 5500, "price_postapoc": 500, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "material_thickness": 1, "pocket_data": [ { @@ -528,7 +528,7 @@ "price": 3500, "to_hit": 2, "bashing": 1, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "holster", "color": "green", @@ -556,7 +556,7 @@ "volume": "45 L", "price": 800, "price_postapoc": 750, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "quiver_large", "color": "green", @@ -729,7 +729,7 @@ "volume": "1050 ml", "price": 3000, "price_postapoc": 250, - "material": [ "cotton" ], + "material": [ "nylon" ], "symbol": "[", "color": "dark_gray", "pocket_data": [ @@ -763,7 +763,7 @@ "volume": "550 ml", "price": 3000, "price_postapoc": 250, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "armguard_soft", "color": "dark_gray", @@ -850,7 +850,7 @@ "price_postapoc": 250, "to_hit": 1, "bashing": 1, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "purse", "color": "green", @@ -878,7 +878,7 @@ "volume": "5000 ml", "price": 6700, "price_postapoc": 1500, - "material": [ "cotton", "nylon" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "backpack", "color": "green", @@ -955,7 +955,7 @@ "volume": "36750 ml", "price": 7900, "price_postapoc": 250, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "backpack", "color": "blue", @@ -1064,7 +1064,7 @@ "volume": "11 L", "price": 9200, "price_postapoc": 1250, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "backpack", "color": "green", @@ -1150,7 +1150,7 @@ "price": 2900, "price_postapoc": 750, "bashing": 1, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "purse", "color": "green", @@ -1297,7 +1297,7 @@ "volume": "5 L", "price": 7000, "price_postapoc": 1500, - "material": [ "cotton" ], + "material": [ "nylon" ], "symbol": "[", "looks_like": "backpack", "color": "yellow", @@ -1689,7 +1689,7 @@ "price": 5500, "price_postapoc": 700, "bashing": 1, - "material": [ "cotton", "plastic" ], + "material": [ "nylon", "plastic" ], "symbol": "[", "looks_like": "slingpack", "color": "yellow", diff --git a/data/json/items/armor/torso_clothes.json b/data/json/items/armor/torso_clothes.json index 01850a128a533..c94213886f78b 100644 --- a/data/json/items/armor/torso_clothes.json +++ b/data/json/items/armor/torso_clothes.json @@ -93,6 +93,51 @@ "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "FANCY", "OUTER" ] }, + { + "id": "combat_shirt", + "repairs_like": "jacket_army_modern", + "type": "ARMOR", + "name": { "str_sp": "combat shirt" }, + "description": "An oddly balanced long-sleeved shirt with a thin, moisture wicking torso and thicker arms more appropriate for a jacket. The arms are covered in a camouflage pattern and have two shoulder pockets. It has a pocket for your pen!", + "weight": "450 g", + "volume": "3 L", + "price": 6400, + "price_postapoc": 750, + "material": [ "nylon", "cotton" ], + "symbol": "[", + "looks_like": "jacket_army", + "color": "green", + "armor": [ + { "covers": [ "torso" ], "coverage": 95, "encumbrance": 3 }, + { "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 7, 9 ] } + ], + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "max_contains_volume": "500 ml", + "max_contains_weight": "1 kg", + "max_item_length": "13 cm", + "moves": 120 + }, + { + "pocket_type": "CONTAINER", + "max_contains_volume": "500 ml", + "max_contains_weight": "1 kg", + "max_item_length": "13 cm", + "moves": 120 + }, + { + "pocket_type": "CONTAINER", + "max_contains_volume": "10 ml", + "max_contains_weight": "50 g", + "max_item_length": "13 cm", + "moves": 120 + } + ], + "warmth": 5, + "material_thickness": 0.3, + "flags": [ "VARSIZE", "POCKETS" ] + }, { "id": "dress", "repairs_like": "jeans", diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index f0d0fedae1530..a2d08bfb0b715 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -440,7 +440,7 @@ { "item": "briefs", "x": 51, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "boxer_briefs", "x": 50, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "boxer_shorts", "x": 49, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "jacket_army", "x": 46, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, + { "item": "jacket_army_modern", "x": 46, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "winter_jacket_army", "x": 45, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "pants_army", "x": 44, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "winter_pants_army", "x": 43, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, diff --git a/data/json/npcs/NC_SOLDIER.json b/data/json/npcs/NC_SOLDIER.json index d8a8c0df2a07e..25b26e42bd214 100644 --- a/data/json/npcs/NC_SOLDIER.json +++ b/data/json/npcs/NC_SOLDIER.json @@ -31,7 +31,11 @@ "type": "item_group", "id": "NC_SOLDIER_coat", "subtype": "distribution", - "entries": [ { "item": "null", "prob": 20 }, { "item": "jacket_army", "prob": 50 }, { "item": "winter_jacket_army", "prob": 50 } ] + "entries": [ + { "item": "null", "prob": 20 }, + { "item": "jacket_army_modern", "prob": 50 }, + { "item": "winter_jacket_army", "prob": 50 } + ] }, { "type": "item_group", diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index 90c55d7f3f59b..018ba4a1c1d26 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -135,7 +135,8 @@ [ "jacket_leather_mod", 5 ], [ "american_flag", 5 ], [ "jacket_leather_red", 10 ], - [ "jacket_army", 10 ], + [ "jacket_army", 3 ], + [ "jacket_army_modern", 7 ], [ "jacket_flannel", 10 ], [ "jacket_evac", 20 ], [ "winter_jacket_army", 5 ], diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json index 8b4efb996700e..5614a8b2cd431 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json @@ -80,7 +80,7 @@ { "item": "case_cigar", "prob": 5 }, [ "vest", 40 ], [ "kevlar", 15 ], - [ "jacket_army", 30 ], + [ "jacket_army_modern", 30 ], [ "trenchcoat", 25 ], [ "trenchcoat_leather", 20 ], [ "trenchcoat_fur", 10 ], diff --git a/data/json/professions.json b/data/json/professions.json index 4705585766339..c61a16b5c08bd 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -765,7 +765,17 @@ ], "items": { "both": { - "items": [ "pants_army", "undershirt", "jacket_army", "gloves_liner", "socks", "boots", "beret", "wristwatch", "binoculars" ], + "items": [ + "pants_army", + "undershirt", + "jacket_army_modern", + "gloves_liner", + "socks", + "boots", + "beret", + "wristwatch", + "binoculars" + ], "entries": [ { "item": "water_clean", "container-item": "canteen" }, { "item": "m17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 }, @@ -798,7 +808,7 @@ "items": [ "pants_army", "undershirt", - "jacket_army", + "combat_shirt", "ballistic_vest_esapi", "helmet_army", "mask_ski", @@ -850,7 +860,7 @@ "items": [ "pants_army", "undershirt", - "jacket_army", + "combat_shirt", "ballistic_vest_esapi", "helmet_army", "mask_ski", @@ -943,7 +953,7 @@ "items": [ "pants_army", "undershirt", - "jacket_army", + "combat_shirt", "ballistic_vest_esapi", "helmet_army", "mask_ski", @@ -994,7 +1004,7 @@ "items": [ "pants_army", "undershirt", - "jacket_army", + "combat_shirt", "ballistic_vest_esapi", "helmet_army", "mask_ski", @@ -1942,7 +1952,7 @@ "both": { "items": [ "pants_army", - "jacket_army", + "combat_shirt", "socks", "sweatshirt", "boots", @@ -2948,7 +2958,7 @@ "items": [ "socks", "pants_army", - "jacket_army", + "jacket_army_modern", "balclava", "boots_combat", "gloves_tactical", @@ -3752,7 +3762,7 @@ "gloves_tactical", { "item": "flight_helmet", "ammo-item": "light_plus_battery_cell", "charges": 150 }, "mil_flight_suit", - "jacket_army", + "chestrig", "webbing_belt", "legpouch_large" ], @@ -3847,7 +3857,7 @@ "items": [ "pants_army", "undershirt", - "jacket_army", + "combat_shirt", "ballistic_vest_esapi", "helmet_army", "gloves_liner", @@ -3968,7 +3978,7 @@ "wristwatch", "gloves_tactical", "helmet_army", - "jacket_army", + "jacket_army_modern", "webbing_belt", "chestpouch" ], diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index ccd4510d0451f..9ae28f0c56dfe 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -142,7 +142,7 @@ "time": "10 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 3 ], [ "fastener_large", 2 ] ], + "using": [ [ "tailoring_nylon_patchwork", 3 ], [ "fastener_large", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -429,7 +429,7 @@ "time": "10 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton", 5 ], [ "plastic_molding", 2 ] ], + "using": [ [ "tailoring_nylon", 5 ], [ "plastic_molding", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_plasticworking" } ], "components": [ [ [ "ragpouch", 2 ], [ "leather_pouch", 2 ] ], [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ], [ "chestrig", 1 ] ] ] }, @@ -438,7 +438,7 @@ "type": "recipe", "copy-from": "tacvest", "time": "11 h 15 m", - "using": [ [ "tailoring_cotton", 7 ], [ "plastic_molding", 3 ] ], + "using": [ [ "tailoring_nylon", 7 ], [ "plastic_molding", 3 ] ], "components": [ [ [ "ragpouch", 2 ], [ "leather_pouch", 2 ] ], [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ], [ "chestrig", 1 ] ] ] }, { @@ -486,7 +486,7 @@ "time": "3 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 1 ], [ "strap_small", 1 ], [ "plastic_molding", 2 ], [ "fastener_small", 1 ] ], + "using": [ [ "tailoring_nylon_patchwork", 1 ], [ "strap_small", 1 ], [ "plastic_molding", 2 ], [ "fastener_small", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_plasticworking" } ] }, { @@ -634,7 +634,7 @@ "time": "2 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 2 ], [ "fastener_small", 1 ] ], + "using": [ [ "tailoring_nylon_patchwork", 2 ], [ "fastener_small", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ] ] }, @@ -650,7 +650,7 @@ "time": "2 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "fastener_small", 1 ] ], + "using": [ [ "tailoring_nylon_patchwork", 4 ], [ "fastener_small", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ], "components": [ [ [ "strap_large", 1, "LIST" ] ], [ [ "chestpouch", 2 ] ] ] }, @@ -665,7 +665,7 @@ "skills_required": [ "fabrication", 2 ], "time": "3 h", "autolearn": true, - "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "plastic_molding", 2 ] ], + "using": [ [ "tailoring_nylon_patchwork", 4 ], [ "plastic_molding", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1156,7 +1156,7 @@ "time": "3 h", "autolearn": true, "reversible": true, - "using": [ [ "strap_large", 2 ], [ "tailoring_cotton_patchwork", 1 ] ], + "using": [ [ "strap_large", 2 ], [ "tailoring_nylon_patchwork", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -1191,7 +1191,7 @@ "time": "7 h 30 m", "reversible": true, "autolearn": true, - "using": [ [ "tailoring_cotton_patchwork", 5 ], [ "fastener_large", 1 ], [ "waterproofing_plastic_bags", 2 ] ], + "using": [ [ "tailoring_nylon_patchwork", 5 ], [ "fastener_large", 1 ], [ "waterproofing_plastic_bags", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ], "components": [ [ [ "strap_large", 1, "LIST" ] ] ] }, @@ -1206,7 +1206,7 @@ "time": "6 h 40 m", "reversible": true, "book_learn": [ [ "plastics_book", 1 ] ], - "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "fastener_large", 1 ], [ "waterproofing_plastic_bags", 2 ] ], + "using": [ [ "tailoring_nylon_patchwork", 4 ], [ "fastener_large", 1 ], [ "waterproofing_plastic_bags", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index a2df1d9466e7d..b55fab23448ad 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -355,7 +355,7 @@ { "proficiency": "prof_polymerworking" } ], "components": [ - [ [ "jacket_army", 1 ] ], + [ [ "jacket_army", 1 ], [ "jacket_army_modern", 1 ] ], [ [ "vest", 1 ], [ "tacvest", 1 ], [ "mbag", 1 ], [ "runner_bag", 1 ] ], [ [ "fanny", 2 ], [ "dump_pouch", 1 ] ], [ [ "tool_belt", 1 ], [ "legrig", 1 ] ], diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index ce3f2bab24013..53487c65f1131 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -500,7 +500,7 @@ "using": [ [ "sewing_standard", 135 ] ], "components": [ [ [ "coat_rain", 1 ] ], - [ [ "duster", 1 ], [ "jacket_army", 1 ] ], + [ [ "duster", 1 ], [ "jacket_army", 1 ], [ "jacket_army_modern", 1 ] ], [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "sheet_kevlar_layered", 16 ] ], [ [ "rag", 19 ] ], [ @@ -530,7 +530,7 @@ "using": [ [ "sewing_standard", 175 ] ], "components": [ [ [ "coat_rain", 2 ] ], - [ [ "jacket_army", 2 ], [ "xl_duster", 1 ] ], + [ [ "jacket_army", 2 ], [ "jacket_army_modern", 2 ], [ "xl_duster", 1 ] ], [ [ "kevlar", 2 ], [ "ballistic_vest_empty", 2 ], [ "sheet_kevlar_layered", 32 ] ], [ [ "rag", 26 ] ], [ @@ -1084,7 +1084,7 @@ "using": [ [ "sewing_standard", 115 ] ], "components": [ [ [ "coat_rain", 1 ] ], - [ [ "duster", 1 ], [ "jacket_army", 1 ], [ "sleeveless_duster", 1 ] ], + [ [ "duster", 1 ], [ "jacket_army", 1 ], [ "jacket_army_modern", 1 ], [ "sleeveless_duster", 1 ] ], [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "sheet_kevlar_layered", 13 ] ], [ [ "rag", 14 ] ], [ @@ -1266,7 +1266,7 @@ "using": [ [ "sewing_standard", 85 ] ], "components": [ [ [ "coat_rain", 1 ] ], - [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ], [ "sleeveless_trenchcoat", 1 ] ], + [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ], [ "jacket_army_modern", 1 ], [ "sleeveless_trenchcoat", 1 ] ], [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "sheet_kevlar_layered", 10 ] ], [ [ "rag", 11 ] ], [ @@ -1568,7 +1568,7 @@ "using": [ [ "sewing_standard", 100 ] ], "components": [ [ [ "coat_rain", 1 ] ], - [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ] ], + [ [ "trenchcoat", 1 ], [ "jacket_army_modern", 1 ], [ "jacket_army", 1 ], [ "jacket_army_modern", 1 ] ], [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "sheet_kevlar_layered", 12 ] ], [ [ "rag", 14 ] ], [