Fix Regressions From 52361 (#53924)

CleverRaven · Dec 31, 2021 · da19c5f · da19c5f
1 parent 14824fa
commit da19c5f
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 179 deletions.
diff --git 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,15 +77,14 @@
     "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" },
       { "proficiency": "prof_polymerworking" }
     ],
     "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 ] ],