From da19c5f9c9f0cf7a228396cdabfe7882729d27eb Mon Sep 17 00:00:00 2001 From: Dillon Matchett Date: Fri, 31 Dec 2021 14:50:57 -0400 Subject: [PATCH] Fix Regressions From 52361 (#53924) --- .../recipes/armor/bespoke_armor/survivor.json | 56 ++--- data/json/recipes/armor/suit.json | 224 ++++++------------ 2 files changed, 101 insertions(+), 179 deletions(-) diff --git a/data/json/recipes/armor/bespoke_armor/survivor.json b/data/json/recipes/armor/bespoke_armor/survivor.json index bc29d3ade3060..26083ee3e599e 100644 --- a/data/json/recipes/armor/bespoke_armor/survivor.json +++ b/data/json/recipes/armor/bespoke_armor/survivor.json @@ -10,7 +10,7 @@ "skills_required": [ "fabrication", 6 ], "time": "10 h", "autolearn": true, - "using": [ [ "sewing_standard", 200 ] ], + "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 10 ], [ "fabric_fauxfur", 20 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -21,9 +21,7 @@ ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ - [ [ "rag", 10 ] ], [ [ "leather", 20 ], [ "tanned_hide", 4 ] ], - [ [ "faux_fur", 20 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 300 ] ], [ [ "sheet_kevlar_layered", 24 ] ] @@ -34,13 +32,15 @@ "copy-from": "wsurvivor_jumpsuit_nofur", "time": "16 h", "type": "recipe", - "using": [ [ "sewing_standard", 300 ] ], + "using": [ + [ "sewing_standard", 300 ], + [ "fabric_standard_nostretch", 20 ], + [ "fabric_leather_hide", 6 ], + [ "fabric_fauxfur", 30 ] + ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 104 ], [ "soldering_iron", 104 ], [ "toolset", 104 ] ] ], "components": [ - [ [ "rag", 20 ] ], - [ [ "leather", 30 ], [ "tanned_hide", 6 ] ], - [ [ "faux_fur", 30 ] ], [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], [ [ "duct_tape", 400 ] ], [ [ "sheet_kevlar_layered", 48 ] ] @@ -57,19 +57,14 @@ "skills_required": [ "fabrication", 6 ], "time": "12 h", "autolearn": true, - "using": [ [ "sewing_standard", 200 ] ], + "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 10 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" } ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], - "components": [ - [ [ "rag", 10 ] ], - [ [ "wetsuit", 1 ], [ "wetsuit_spring", 1 ] ], - [ [ "duct_tape", 400 ] ], - [ [ "sheet_kevlar_layered", 24 ] ] - ] + "components": [ [ [ "wetsuit", 1 ], [ "wetsuit_spring", 1 ] ], [ [ "duct_tape", 400 ] ], [ [ "sheet_kevlar_layered", 24 ] ] ] }, { "result": "lsurvivor_jumpsuit", @@ -82,7 +77,7 @@ "skills_required": [ "fabrication", 6 ], "time": "6 h", "autolearn": true, - "using": [ [ "sewing_standard", 100 ] ], + "using": [ [ "sewing_standard", 100 ], [ "fabric_standard_nostretch", 30 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -90,7 +85,6 @@ ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ - [ [ "rag", 30 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 200 ] ], [ [ "sheet_kevlar_layered", 24 ] ] @@ -101,10 +95,9 @@ "type": "recipe", "copy-from": "lsurvivor_jumpsuit", "time": "7 h", - "using": [ [ "sewing_standard", 150 ] ], + "using": [ [ "sewing_standard", 150 ], [ "fabric_standard_nostretch", 45 ] ], "tools": [ [ [ "welder", 36 ], [ "welder_crude", 58 ], [ "soldering_iron", 58 ], [ "toolset", 58 ] ] ], "components": [ - [ [ "rag", 45 ] ], [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], [ [ "duct_tape", 300 ] ], [ [ "sheet_kevlar_layered", 48 ] ] @@ -121,7 +114,7 @@ "skills_required": [ "fabrication", 6 ], "time": "7 h", "autolearn": true, - "using": [ [ "sewing_standard", 150 ] ], + "using": [ [ "sewing_standard", 150 ], [ "fabric_standard_nostretch", 20 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -132,7 +125,6 @@ ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ - [ [ "rag", 20 ] ], [ [ "leather", 20 ], [ "tanned_hide", 4 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 300 ] ], @@ -150,7 +142,12 @@ "skills_required": [ "fabrication", 6 ], "time": "10 h", "autolearn": true, - "using": [ [ "sewing_standard", 200 ] ], + "using": [ + [ "sewing_standard", 200 ], + [ "fabric_standard_nostretch", 10 ], + [ "fabric_leather_hide", 4 ], + [ "fabric_fur_pelt", 3 ] + ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -162,9 +159,6 @@ ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "components": [ - [ [ "rag", 10 ] ], - [ [ "leather", 20 ], [ "tanned_hide", 4 ] ], - [ [ "fur", 20 ], [ "tanned_pelt", 3 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ [ "duct_tape", 300 ] ], [ [ "sheet_kevlar_layered", 24 ] ] @@ -175,13 +169,15 @@ "copy-from": "wsurvivor_jumpsuit", "time": "11 h 30 m", "type": "recipe", - "using": [ [ "sewing_standard", 300 ] ], + "using": [ + [ "sewing_standard", 300 ], + [ "fabric_standard_nostretch", 20 ], + [ "fabric_leather_hide", 6 ], + [ "fabric_fur_pelt", 6 ] + ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 104 ], [ "soldering_iron", 104 ], [ "toolset", 104 ] ] ], "components": [ - [ [ "rag", 20 ] ], - [ [ "leather", 30 ], [ "tanned_hide", 6 ] ], - [ [ "fur", 30 ], [ "tanned_pelt", 6 ] ], [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], [ [ "duct_tape", 400 ] ], [ [ "sheet_kevlar_layered", 48 ] ] @@ -198,7 +194,7 @@ "skills_required": [ "fabrication", 6 ], "time": "8 h 10 m", "autolearn": true, - "using": [ [ "sewing_standard", 200 ] ], + "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 30 ], [ "fabric_leather_hide", 7 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -209,8 +205,6 @@ ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ - [ [ "rag", 30 ] ], - [ [ "leather", 40 ], [ "tanned_hide", 7 ] ], [ [ "scrap", 8 ] ], [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], [ [ "duct_tape", 400 ] ], diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index f053cd6c122eb..0e524d973dc69 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -107,19 +107,17 @@ "difficulty": 5, "time": "8 h", "autolearn": true, - "using": [ [ "sewing_standard", 68 ] ], + "using": [ [ "sewing_standard", 68 ], [ "fabric_fur_pelt", 8 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ], - "components": [ [ [ "fur", 48 ], [ "tanned_pelt", 8 ] ] ] + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] }, { "result": "xl_armor_farmor", "type": "recipe", "copy-from": "armor_farmor", "time": "9 h", - "using": [ [ "sewing_standard", 96 ] ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "components": [ [ [ "fur", 72 ], [ "tanned_pelt", 12 ] ] ] + "using": [ [ "sewing_standard", 96 ], [ "fabric_fur_pelt", 12 ] ], + "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ] }, { "result": "armor_larmor", @@ -141,9 +139,8 @@ "type": "recipe", "copy-from": "armor_larmor", "time": "9 h", - "using": [ [ "sewing_standard", 76 ] ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "components": [ [ [ "leather", 42 ], [ "tanned_hide", 7 ], [ "fur", 42 ], [ "tanned_pelt", 7 ] ] ] + "using": [ [ "sewing_standard", 76 ], [ "fabric_leather_fur_hide", 7 ] ], + "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ] }, { "result": "armor_lightplate", @@ -155,7 +152,7 @@ "difficulty": 8, "time": "9 h 20 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 80 ], [ "steel_standard", 20 ] ], + "using": [ [ "blacksmithing_standard", 80 ], [ "steel_standard", 20 ], [ "fabric_leather_fur_hide", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -165,18 +162,16 @@ { "proficiency": "prof_armorsmithing" }, { "proficiency": "prof_articulation" } ], - "tools": [ [ [ "swage", -1 ] ] ], - "components": [ [ [ "fur", 20 ], [ "tanned_pelt", 3 ], [ "leather", 20 ], [ "tanned_hide", 3 ] ] ] + "tools": [ [ [ "swage", -1 ] ] ] }, { "result": "xl_armor_lightplate", "type": "recipe", "copy-from": "armor_lightplate", "time": "10 h 30 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "steel_standard", 32 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "steel_standard", 32 ], [ "fabric_leather_fur_hide", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "swage", -1 ] ] ], - "components": [ [ [ "fur", 32 ], [ "tanned_pelt", 5 ], [ "leather", 32 ], [ "tanned_hide", 5 ] ] ] + "tools": [ [ [ "swage", -1 ] ] ] }, { "result": "armor_lightplate", @@ -228,7 +223,7 @@ "difficulty": 7, "time": "7 h 28 m", "book_learn": [ [ "textbook_armwest", 8 ] ], - "using": [ [ "forging_standard", 5 ], [ "steel_standard", 5 ] ], + "using": [ [ "forging_standard", 5 ], [ "steel_standard", 5 ], [ "fabric_leather_fur_hide", 2 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ], "proficiencies": [ @@ -238,65 +233,16 @@ { "proficiency": "prof_blacksmithing" }, { "proficiency": "prof_armorsmithing" }, { "proficiency": "prof_articulation" } - ], - "components": [ [ [ "fur", 12 ], [ "tanned_pelt", 2 ], [ "leather", 12 ], [ "tanned_hide", 2 ] ] ] + ] }, { "result": "xl_armor_lorica", "type": "recipe", "copy-from": "armor_lorica", "time": "8 h 30 m", - "using": [ [ "forging_standard", 7 ], [ "steel_standard", 7 ] ], + "using": [ [ "forging_standard", 7 ], [ "steel_standard", 7 ], [ "fabric_leather_fur_hide", 3 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ], - "components": [ [ [ "fur", 18 ], [ "tanned_pelt", 3 ], [ "leather", 18 ], [ "tanned_hide", 3 ] ] ] - }, - { - "result": "armor_nomad", - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_SUIT", - "skill_used": "tailor", - "difficulty": 5, - "time": "3 h 20 m", - "autolearn": true, - "using": [ [ "sewing_standard", 90 ] ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "proficiencies": [ - { "proficiency": "prof_leatherworking_basic" }, - { "proficiency": "prof_closures" }, - { "proficiency": "prof_closures_waterproofing" } - ], - "components": [ - [ [ "duster", 1 ] ], - [ [ "vest", 1 ], [ "tacvest", 1 ] ], - [ [ "ragpouch", 1 ], [ "leather_pouch", 1 ], [ "dump_pouch", 1 ], [ "fanny", 1 ] ], - [ [ "tool_belt", 1 ], [ "legrig", 1 ] ], - [ [ "pants_cargo", 1 ], [ "pants_army", 1 ] ], - [ [ "leather", 24 ], [ "tanned_hide", 4 ] ] - ] - }, - { - "result": "armor_nomad_light", - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_SUIT", - "skill_used": "tailor", - "difficulty": 4, - "time": "1 h 20 m", - "autolearn": true, - "using": [ [ "sewing_standard", 90 ] ], - "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ], - "components": [ - [ [ "tunic", 1 ] ], - [ [ "shorts_cargo", 1 ], [ "shorts_denim", 1 ] ], - [ [ "vest", 1 ], [ "tacvest", 1 ] ], - [ [ "ragpouch", 2 ], [ "dump_pouch", 2 ], [ "fanny", 2 ] ], - [ [ "tool_belt", 1 ], [ "legrig", 1 ] ], - [ [ "rag", 20 ] ] - ] + "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ] }, { "result": "armor_plarmor", @@ -338,7 +284,7 @@ "difficulty": 9, "time": "10 h", "book_learn": [ [ "textbook_armwest", 8 ] ], - "using": [ [ "blacksmithing_standard", 120 ], [ "steel_standard", 30 ] ], + "using": [ [ "blacksmithing_standard", 120 ], [ "steel_standard", 30 ], [ "fabric_leather_fur_hide", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], "proficiencies": [ @@ -348,18 +294,16 @@ { "proficiency": "prof_blacksmithing" }, { "proficiency": "prof_armorsmithing" }, { "proficiency": "prof_articulation" } - ], - "components": [ [ [ "fur", 16 ], [ "tanned_pelt", 3 ], [ "leather", 16 ], [ "tanned_hide", 3 ] ] ] + ] }, { "result": "xl_armor_plate", "type": "recipe", "copy-from": "armor_plate", "time": "11 h 15 m", - "using": [ [ "blacksmithing_standard", 160 ], [ "steel_standard", 45 ] ], + "using": [ [ "blacksmithing_standard", 160 ], [ "steel_standard", 45 ], [ "fabric_leather_fur_hide", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], - "tools": [ [ [ "swage", -1 ] ] ], - "components": [ [ [ "fur", 24 ], [ "tanned_pelt", 5 ], [ "leather", 24 ], [ "tanned_hide", 5 ] ] ] + "tools": [ [ [ "swage", -1 ] ] ] }, { "result": "armor_samurai", @@ -371,7 +315,12 @@ "difficulty": 9, "time": "9 h 20 m", "book_learn": [ [ "textbook_armeast", 8 ] ], - "using": [ [ "blacksmithing_standard", 64 ], [ "steel_standard", 16 ] ], + "using": [ + [ "blacksmithing_standard", 64 ], + [ "steel_standard", 16 ], + [ "fabric_standard_nostretch", 10 ], + [ "fabric_leather_fur_hide", 6 ] + ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], "proficiencies": [ @@ -381,8 +330,7 @@ { "proficiency": "prof_blacksmithing" }, { "proficiency": "prof_armorsmithing" }, { "proficiency": "prof_articulation" } - ], - "components": [ [ [ "fur", 28 ], [ "tanned_pelt", 6 ], [ "leather", 28 ], [ "tanned_hide", 6 ] ], [ [ "rag", 10 ] ] ] + ] }, { "result": "armor_scavenger", @@ -402,7 +350,7 @@ { "proficiency": "prof_polymerworking" } ], "components": [ - [ [ "jacket_army", 1 ] ], + [ [ "jacket_army", 1 ], [ "jacket_army_modern", 1 ] ], [ [ "vest", 1 ], [ "tacvest", 1 ], [ "chestrig", 1 ] ], [ [ "mbag", 1 ], [ "runner_bag", 1 ] ], [ [ "fanny", 2 ], [ "dump_pouch", 1 ] ], @@ -649,7 +597,7 @@ "skills_required": [ "electronics", 3 ], "time": "180 m", "book_learn": [ [ "textbook_fabrication", 6 ], [ "advanced_electronics", 6 ], [ "textbook_electronics", 6 ] ], - "using": [ [ "chainmail_standard", 20 ] ], + "using": [ [ "chainmail_standard", 20 ], [ "fabric_standard_nostretch", 26 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_chain_armour" }, { "proficiency": "prof_shock_weapons" } ], "components": [ [ [ "link_sheet", 2 ], [ "chainmail_hood", 1 ] ], @@ -659,8 +607,7 @@ [ [ "link_sheet", 2 ], [ "chainmail_hands", 1 ] ], [ [ "link_sheet", 2 ], [ "chainmail_feet", 1 ] ], [ [ "chain_link", 500 ] ], - [ [ "wire", 5 ] ], - [ [ "rag", 26 ] ] + [ [ "wire", 5 ] ] ] }, { @@ -675,8 +622,7 @@ [ [ "link_sheet", 3 ], [ "xl_chainmail_hands", 1 ] ], [ [ "link_sheet", 3 ], [ "xl_chainmail_feet", 1 ] ], [ [ "chain_link", 750 ] ], - [ [ "wire", 5 ] ], - [ [ "rag", 26 ] ] + [ [ "wire", 5 ] ] ] }, { @@ -690,8 +636,7 @@ "time": "3 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 18 ] ], - "components": [ [ [ "rag", 20 ] ] ] + "using": [ [ "sewing_standard", 18 ], [ "fabric_standard_nostretch", 20 ] ] }, { "result": "cloak_fur", @@ -706,10 +651,9 @@ "reversible": true, "autolearn": true, "book_learn": [ [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], - "using": [ [ "sewing_standard", 18 ] ], + "using": [ [ "sewing_standard", 18 ], [ "fabric_fur_pelt", 3 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ], - "components": [ [ [ "fur", 15 ], [ "tanned_pelt", 3 ] ] ] + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] }, { "result": "cloak_leather", @@ -722,10 +666,9 @@ "time": "5 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 18 ] ], + "using": [ [ "sewing_standard", 18 ], [ "fabric_leather_hide", 3 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "components": [ [ [ "leather", 20 ], [ "tanned_hide", 3 ] ] ] + "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ] }, { "result": "cloak_wool", @@ -738,8 +681,7 @@ "time": "25 m", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 18 ] ], - "components": [ [ [ "felt_patch", 18 ] ] ] + "using": [ [ "sewing_standard", 18 ], [ "fabric_felt", 18 ] ] }, { "result": "entry_suit", @@ -752,7 +694,7 @@ "skills_required": [ "tailor", 6 ], "time": "6 h", "book_learn": [ [ "textbook_fireman", 8 ], [ "tailor_portfolio", 8 ] ], - "using": [ [ "sewing_standard", 200 ] ], + "using": [ [ "sewing_standard", 200 ], [ "fabric_nomex", 40 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, @@ -760,7 +702,6 @@ { "proficiency": "prof_polymerworking" } ], "components": [ - [ [ "nomex", 40 ] ], [ [ "sheet_kevlar_layered", 8 ] ], [ [ "duct_tape", 200 ], [ "superglue", 5 ] ], [ @@ -777,10 +718,9 @@ "type": "recipe", "copy-from": "entry_suit", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 300 ] ], + "using": [ [ "sewing_standard", 300 ], [ "fabric_nomex", 60 ] ], "tools": [ [ [ "welder", 45 ], [ "welder_crude", 90 ], [ "soldering_iron", 90 ], [ "toolset", 90 ] ] ], "components": [ - [ [ "nomex", 60 ] ], [ [ "sheet_kevlar_layered", 12 ] ], [ [ "duct_tape", 300 ], [ "superglue", 7 ] ], [ @@ -804,7 +744,7 @@ "time": "12 h 20 m", "autolearn": true, "book_learn": [ [ "tailor_portfolio", 7 ], [ "textbook_fireman", 7 ] ], - "using": [ [ "sewing_standard", 200 ] ], + "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 4 ] ], "tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, @@ -812,7 +752,6 @@ { "proficiency": "prof_polymerworking" } ], "components": [ - [ [ "rag", 4 ] ], [ [ "nomex_suit", 1 ], [ "entry_suit", 1 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ @@ -841,10 +780,9 @@ "type": "recipe", "copy-from": "fsurvivor_suit", "time": "13 h 50 m", - "using": [ [ "sewing_standard", 300 ] ], + "using": [ [ "sewing_standard", 300 ], [ "fabric_standard_nostretch", 8 ] ], "tools": [ [ [ "welder", 45 ], [ "welder_crude", 90 ], [ "soldering_iron", 90 ], [ "toolset", 90 ] ] ], "components": [ - [ [ "rag", 8 ] ], [ [ "xl_nomex_suit", 1 ], [ "xl_entry_suit", 1 ] ], [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], [ @@ -927,12 +865,12 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", + "proficiencies": [ { "proficiency": "prof_closures" } ], "difficulty": 4, "time": "6 h", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 30 ] ], - "components": [ [ [ "rag", 26 ] ] ] + "using": [ [ "sewing_standard", 35 ], [ "fabric_standard_nostretch", 26 ], [ "fastener_large", 1 ] ] }, { "result": "k_gambeson", @@ -941,28 +879,28 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_SUIT", "skill_used": "tailor", - "difficulty": 8, - "time": "6 h", - "autolearn": true, - "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 30 ] ], - "components": [ [ [ "sheet_kevlar_layered", 36 ] ] ] + "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_polymerworking" } ], + "difficulty": 6, + "time": "8 h", + "autolearn": [ [ "tailor", 8 ] ], + "book_learn": [ [ "textbook_armwest", 4 ] ], + "using": [ [ "sewing_standard", 35 ], [ "tailoring_kevlar_fabric", 12 ], [ "fastener_large", 1 ] ], + "components": [ [ [ "sheet_kevlar_layered", 18 ] ] ] }, { "result": "xl_gambeson", "type": "recipe", "copy-from": "gambeson", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 45 ] ], - "components": [ [ [ "rag", 62 ] ] ] + "using": [ [ "sewing_standard", 45 ], [ "fabric_standard_nostretch", 52 ], [ "fastener_large", 2 ] ] }, { "result": "xl_k_gambeson", "type": "recipe", "copy-from": "k_gambeson", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 45 ] ], - "components": [ [ [ "sheet_kevlar_layered", 85 ] ] ] + "using": [ [ "sewing_standard", 50 ], [ "tailoring_kevlar_fabric", 24 ], [ "fastener_large", 2 ] ], + "components": [ [ [ "sheet_kevlar_layered", 36 ] ] ] }, { "result": "hsurvivor_suit", @@ -975,7 +913,7 @@ "skills_required": [ "fabrication", 7 ], "time": "20 h", "autolearn": true, - "using": [ [ "sewing_standard", 200 ] ], + "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 20 ], [ "fabric_leather_hide", 4 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -988,8 +926,6 @@ ], "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "components": [ - [ [ "rag", 20 ] ], - [ [ "leather", 20 ], [ "tanned_hide", 4 ] ], [ [ "steel_chunk", 4 ], [ "scrap", 12 ] ], [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ], [ @@ -1023,8 +959,7 @@ "difficulty": 2, "time": "48 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 20 ] ], - "components": [ [ [ "rag", 20 ] ] ] + "using": [ [ "sewing_standard", 20 ], [ "fabric_standard_nostretch", 20 ] ] }, { "result": "jumpsuit_xl", @@ -1036,8 +971,7 @@ "difficulty": 2, "time": "54 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 40 ] ], - "components": [ [ [ "rag", 30 ] ] ] + "using": [ [ "sewing_standard", 40 ], [ "fabric_standard_nostretch", 30 ] ] }, { "result": "jumpsuit_xl", @@ -1050,8 +984,8 @@ "difficulty": 2, "time": "38 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 20 ] ], - "components": [ [ [ "jumpsuit", 1 ] ], [ [ "rag", 10 ] ] ] + "using": [ [ "sewing_standard", 20 ], [ "fabric_standard_nostretch", 10 ] ], + "components": [ [ [ "jumpsuit", 1 ] ] ] }, { "result": "kimono", @@ -1063,8 +997,7 @@ "difficulty": 4, "time": "2 h 30 m", "book_learn": [ [ "tailor_japanese", 4 ] ], - "using": [ [ "sewing_standard", 35 ] ], - "components": [ [ [ "rag", 25 ] ] ] + "using": [ [ "sewing_standard", 35 ], [ "fabric_standard_nostretch", 25 ] ] }, { "result": "nomex_suit", @@ -1076,21 +1009,19 @@ "difficulty": 6, "time": "6 h", "book_learn": [ [ "textbook_fireman", 6 ], [ "tailor_portfolio", 7 ] ], - "using": [ [ "sewing_standard", 40 ] ], + "using": [ [ "sewing_standard", 40 ], [ "fabric_nomex", 18 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" } - ], - "components": [ [ [ "nomex", 18 ] ] ] + ] }, { "result": "xl_nomex_suit", "copy-from": "nomex_suit", "type": "recipe", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 80 ] ], - "components": [ [ [ "nomex", 36 ] ] ] + "using": [ [ "sewing_standard", 80 ], [ "fabric_nomex", 36 ] ] }, { "result": "shark_suit_faraday", @@ -1118,9 +1049,9 @@ "skills_required": [ "tailor", 2 ], "time": "7 h", "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], - "using": [ [ "sewing_standard", 52 ], [ "soldering_standard", 100 ] ], + "using": [ [ "sewing_standard", 52 ], [ "fabric_standard_nostretch", 40 ], [ "soldering_standard", 100 ] ], "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_closures" } ], - "components": [ [ [ "rag", 40 ] ], [ [ "element", 18 ] ], [ [ "cable", 37 ] ] ] + "components": [ [ [ "element", 18 ] ], [ [ "cable", 37 ] ] ] }, { "result": "thermal_outfit", @@ -1157,7 +1088,11 @@ "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 30 ], [ "soldering_standard", 60 ] ], "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_closures" } ], - "components": [ [ [ "rag", 30 ], [ "union_suit", 1 ] ], [ [ "element", 12 ] ], [ [ "cable", 20 ] ] ] + "components": [ + [ [ "rag", 30 ], [ "sheet_cotton", 30 ], [ "sheet_cotton_patchwork", 30 ], [ "union_suit", 1 ] ], + [ [ "element", 12 ] ], + [ [ "cable", 20 ] ] + ] }, { "result": "tunic_rag", @@ -1199,10 +1134,9 @@ "difficulty": 4, "time": "10 h", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 50 ] ], + "using": [ [ "sewing_standard", 50 ], [ "fabric_standard_nostretch", 12 ], [ "fabric_neoprene", 12 ] ], "tools": [ [ [ "soldering_iron", 20 ], [ "welder", 20 ], [ "hotplate", 20 ], [ "toolset", 20 ] ] ], - "proficiencies": [ { "proficiency": "prof_elastics" }, { "proficiency": "prof_closures_waterproofing" } ], - "components": [ [ [ "neoprene", 12 ] ], [ [ "rag", 12 ] ] ] + "proficiencies": [ { "proficiency": "prof_elastics" }, { "proficiency": "prof_closures_waterproofing" } ] }, { "result": "wetsuit_spring", @@ -1214,10 +1148,9 @@ "difficulty": 3, "time": "7 h 30 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ], - "using": [ [ "sewing_standard", 40 ] ], + "using": [ [ "sewing_standard", 40 ], [ "fabric_standard_nostretch", 8 ], [ "fabric_neoprene", 8 ] ], "proficiencies": [ { "proficiency": "prof_elastics" }, { "proficiency": "prof_closures_waterproofing" } ], - "tools": [ [ [ "soldering_iron", 15 ], [ "welder", 15 ], [ "hotplate", 15 ], [ "toolset", 15 ] ] ], - "components": [ [ [ "neoprene", 8 ] ], [ [ "rag", 8 ] ] ] + "tools": [ [ [ "soldering_iron", 15 ], [ "welder", 15 ], [ "hotplate", 15 ], [ "toolset", 15 ] ] ] }, { "result": "wool_suit", @@ -1229,8 +1162,7 @@ "difficulty": 3, "time": "10 h", "autolearn": true, - "using": [ [ "sewing_standard", 150 ] ], - "components": [ [ [ "felt_patch", 24 ] ] ] + "using": [ [ "sewing_standard", 150 ], [ "fabric_felt", 24 ] ] }, { "result": "xlhsurvivor_suit", @@ -1243,7 +1175,7 @@ "skills_required": [ "fabrication", 8 ], "time": "22 h 30 m", "autolearn": true, - "using": [ [ "sewing_standard", 200 ] ], + "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 30 ], [ "fabric_leather_hide", 7 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -1256,8 +1188,6 @@ ], "tools": [ [ [ "welder", 112 ], [ "welder_crude", 168 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ], "components": [ - [ [ "rag", 30 ] ], - [ [ "leather", 40 ], [ "tanned_hide", 7 ] ], [ [ "steel_chunk", 8 ], [ "scrap", 24 ] ], [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ], [ @@ -1291,8 +1221,7 @@ "difficulty": 3, "time": "1 h 30 m", "book_learn": [ [ "tailor_japanese", 3 ] ], - "using": [ [ "sewing_standard", 18 ] ], - "components": [ [ [ "rag", 16 ] ] ] + "using": [ [ "sewing_standard", 18 ], [ "fabric_standard_nostretch", 16 ] ] }, { "result": "zentai", @@ -1304,8 +1233,7 @@ "difficulty": 4, "time": "2 h", "book_learn": [ [ "mag_animecon", 1 ] ], - "using": [ [ "sewing_standard", 36 ] ], - "proficiencies": [ { "proficiency": "prof_elastics" } ], - "components": [ [ [ "lycra_patch", 34 ] ] ] + "using": [ [ "sewing_standard", 36 ], [ "fabric_lycra", 34 ] ], + "proficiencies": [ { "proficiency": "prof_elastics" } ] } ]