From 689d4f1397f20b53895562f9d3f0cc7bf45150d8 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 20 Jul 2021 11:42:47 -0700
Subject: Clean up recipe requirements so that tools are not listed twice

---
 recipes.json | 58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'recipes.json')

diff --git a/recipes.json b/recipes.json
index d695bbc..07e72c6 100644
--- a/recipes.json
+++ b/recipes.json
@@ -24,7 +24,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 150 ],
+      [ "filament", 150 ],
       [ "tailoring_leather_small", 12 ]
     ],
     "components": [
@@ -44,7 +44,6 @@
     "autolearn": true,
     "using": [
       [ "sewing_standard", 150 ],
-      [ "armor_kevlar_plate", 24 ],
       [ "adhesive", 12 ]
     ],
     "components": [
@@ -61,6 +60,7 @@
         [ "purse", 2 ],
         [ "fanny", 2 ]
       ],
+      [ [ "kevlar_plate", 24 ] ],
       [ [ "rag", 20 ] ]
     ]
   },
@@ -224,7 +224,7 @@
     "reversible": false,
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 150 ],
+      [ "filament", 150 ],
       [ "tailoring_leather_small", 12 ]
       ],
     "components": [
@@ -245,7 +245,6 @@
     "autolearn": true,
     "using": [
       [ "sewing_standard", 150 ],
-      [ "armor_kevlar_plate", 24 ],
       [ "adhesive", 12 ]
     ],
     "components": [
@@ -262,7 +261,8 @@
         [ "dump_pouch", 1 ],
         [ "purse", 2 ],
         [ "fanny", 2 ]
-      ]
+      ],
+      [ [ "kevlar_plate", 24 ] ]
     ]
   },
   {
@@ -482,7 +482,7 @@
     "reversible": false,
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 150 ],
+      [ "filament", 150 ],
       [ "tailoring_leather", 12 ]
     ]
   },
@@ -510,7 +510,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 24 ],
+      [ "filament", 24 ],
       [ "tailoring_leather_small", 10 ]
     ],
     "components": [
@@ -527,11 +527,11 @@
     "time": "3 h",
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 200 ],
-      [ "armor_kevlar_plate", 12 ]
+      [ "sewing_standard", 200 ]
     ],
     "components": [
-      [ [ "kawaii_maid_hat_thermal_off", 1 ] ]
+      [ [ "kawaii_maid_hat_thermal_off", 1 ] ],
+      [ [ "kevlar_plate", 12 ] ]
     ]
   },
   {
@@ -558,7 +558,7 @@
     "time": "30 m",
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 12 ],
+      [ "filament", 12 ],
       [ "tailoring_leather_small", 4 ]
     ],
     "components": [
@@ -575,11 +575,11 @@
     "time": "1 h",
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 100 ],
-      [ "armor_kevlar_plate", 8 ]
+      [ "sewing_standard", 100 ]
     ],
     "components": [
-      [ [ "maid_gloves_long_leather", 1 ] ]
+      [ [ "maid_gloves_long_leather", 1 ] ],
+      [ [ "kevlar_plate", 8 ] ]
     ]
   },
   {
@@ -606,7 +606,7 @@
     "time": "30 m",
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 6 ],
+      [ "filament", 6 ],
       [ "tailoring_leather_small", 2 ]
     ],
     "components": [
@@ -623,11 +623,11 @@
     "time": "1 h",
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 50 ],
-      [ "armor_kevlar_plate", 4 ]
+      [ "sewing_standard", 50 ]
     ],
     "components": [
-      [ [ "maid_gloves_leather", 1 ] ]
+      [ [ "maid_gloves_leather", 1 ] ],
+      [ [ "kevlar_plate", 4 ] ]
     ]
   },
   {
@@ -786,7 +786,7 @@
     "time": "2 h",
     "autolearn": true,
     "using": [
-      [ "sewing_standard", 100 ],
+      [ "filament", 100 ],
       [ "tailoring_leather_small", 12 ]
     ],
     "components": [
@@ -806,7 +806,6 @@
     "autolearn": true,
     "using": [
       [ "sewing_standard", 100 ],
-      [ "armor_kevlar_plate", 24 ],
       [ "adhesive", 8 ]
     ],
     "components": [
@@ -823,7 +822,8 @@
         [ "purse", 2 ],
         [ "fanny", 2 ]
       ],
-      [ [ "rag", 30 ] ]
+      [ [ "rag", 30 ] ],
+      [ [ "kevlar_plate", 24 ] ]
     ]
   },
   {
@@ -1007,12 +1007,12 @@
     "autolearn": true,
     "using": [
       [ "sewing_standard", 80 ],
-      [ "tailoring_leather_small", 8 ],
-      [ "armor_kevlar_plate", 4 ],
-      [ "adhesive", 4 ]
+      [ "adhesive", 4 ],
+      [ "soldering_standard", 32 ]
     ],
     "components": [
       [ [ "kawaii_dress_shoes", 1 ] ],
+      [ [ "kevlar_plate", 4 ] ],
       [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_bunker", 1 ] ]
     ]
   },
@@ -1028,12 +1028,12 @@
     "autolearn": true,
     "using": [
       [ "sewing_standard", 80 ],
-      [ "tailoring_leather_small", 8 ],
-      [ "armor_kevlar_plate", 4 ],
-      [ "adhesive", 4 ]
+      [ "adhesive", 4 ],
+      [ "soldering_standard", 32 ]
     ],
     "components": [
       [ [ "kawaii_boots", 1 ] ],
+      [ [ "kevlar_plate", 4 ] ],
       [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_bunker", 1 ] ]
     ]
   },
@@ -1097,7 +1097,6 @@
     "using": [
       [ "sewing_standard", 10 ],
       [ "soldering_standard", 40 ],
-      [ "armor_kevlar_plate", 2 ],
       [ "adhesive", 1 ]
     ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
@@ -1110,7 +1109,8 @@
         [ "sunglasses", 1 ],
         [ "fancy_sunglasses", 1 ],
         [ "fitover_sunglasses", 1 ]
-      ]
+      ],
+      [ [ "kevlar_plate", 2 ] ]
     ]
   }
 ]
-- 
cgit v1.2.1