Port to DDA.

1 files changed, 207 insertions, 299 deletions

diff --git a/recipes.json b/recipes.json
index 7a09eda..48da338 100644
--- a/recipes.json
+++ b/recipes.json
@@ -6,11 +6,12 @@
     "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "difficulty": 3,
-    "time": "1 h 30 m",
-    "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 35 ] ],
-    "components": [
-      [ [ "rag", 20 ] ]
+    "time": "3 h 30 m",
+    "reversible": true,
+    "book_learn": [ [ "mag_animecon", 1 ], [ "book_maid_clothing", 1 ] ],
+    "using": [
+      [ "sewing_standard", 35 ],
+      [ "tailoring_cotton", 8 ]
     ]
   },
   {
@@ -24,17 +25,18 @@
     "time": "2 h",
     "book_learn": [ [ "book_maid_clothing", 4 ] ],
     "using": [
-      [ "filament", 150 ]
+      [ "filament", 150 ],
+      [ "tailoring_cotton", 8 ],
+      [ "tailoring_leather_patchwork", 6 ]
     ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_closures" }
     ],
     "components": [
-      [ [ "maid_dress" , 1 ] ],
-      [ [ "rag" , 20 ] ],
-      [ [ "leather", 12 ] ]
+      [ [ "maid_dress" , 1 ] ]
     ]
   },
   {
@@ -50,7 +52,13 @@
     "book_learn": [ [ "book_maid_clothing", 6 ] ],
     "using": [
       [ "sewing_standard", 150 ],
-      [ "adhesive", 12 ]
+      [ "adhesive", 12 ],
+      [ "tailoring_cotton", 8 ]
+    ],
+    "proficiencies": [
+      { "proficiency": "prof_polymerworking" },
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" }
     ],
     "components": [
       [ [ "kawaii_maid_dress_long_leather", 1 ] ],
@@ -66,36 +74,22 @@
         [ "purse", 2 ],
         [ "fanny", 2 ]
       ],
-      [ [ "kevlar_plate", 24 ] ],
-      [ [ "rag", 20 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "result": "maid_dress_french",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
-    "skill_used": "tailor",
-    "difficulty": 3,
-    "time": "1 h 30 m",
-    "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 15 ] ],
-    "components": [
-      [ [ "rag", 15 ] ]
+      [ [ "kevlar_plate", 24 ] ]
     ]
   },
   {
     "type": "recipe",
-    "result": "kawaii_maid_dress",
+    "result": "maid_dress_short",
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "difficulty": 3,
-    "time": "1 h 30 m",
-    "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 35 ] ],
-    "components": [
-      [ [ "rag", 10 ] ]
+    "time": "3 h",
+    "reversible": true,
+    "book_learn": [ [ "mag_animecon", 1 ], [ "book_maid_clothing", 1 ] ],
+    "using": [
+      [ "sewing_standard", 35 ],
+      [ "tailoring_cotton", 6 ]
     ]
   },
    {
@@ -109,17 +103,18 @@
     "time": "2 h",
     "book_learn": [ [ "book_maid_clothing", 4 ] ],
     "using": [
-      [ "filament", 100 ]
+      [ "filament", 100 ],
+      [ "tailoring_cotton", 8 ],
+      [ "tailoring_leather_patchwork", 6 ]
     ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_closures" }
     ],
     "components": [
-      [ [ "kawaii_maid_dress" , 1] ],
-      [ [ "rag" , 20 ] ],
-      [ [ "leather", 12 ] ]
+      [ [ "maid_dress_short" , 1] ]
     ]
   },
   {
@@ -135,7 +130,13 @@
     "book_learn": [ [ "book_maid_clothing", 6 ] ],
     "using": [
       [ "sewing_standard", 100 ],
-      [ "adhesive", 8 ]
+      [ "adhesive", 8 ],
+      [ "tailoring_cotton", 8 ]
+    ],
+    "proficiencies": [
+      { "proficiency": "prof_polymerworking" },
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" }
     ],
     "components": [
       [ [ "kawaii_maid_dress_ex", 1 ] ],
@@ -151,52 +152,21 @@
         [ "purse", 2 ],
         [ "fanny", 2 ]
       ],
-      [ [ "kevlar_plate", 24 ] ],
-      [ [ "rag", 20 ] ]
-    ]
-  },
-  {
-     "type": "recipe",
-    "result": "jokyu_fuku",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
-    "skill_used": "tailor",
-    "difficulty": 4,
-    "time": "2 h 30 m",
-    "reversible": false,
-    "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 35 ] ],
-    "components": [
-      [ [ "rag", 25 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "result": "kawaii_hat_cotton",
-    "//": "Loosely based on cotton hat.",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
-    "skill_used": "tailor",
-    "difficulty": 2,
-    "time": "40 m",
-    "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 8 ] ],
-    "components": [
-      [ [ "rag", 3 ] ]
+      [ [ "kevlar_plate", 24 ] ]
     ]
   },
   {
     "type": "recipe",
-    "result": "kawaii_maid_hat",
+    "result": "maid_hat",
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_HEAD",
     "skill_used": "tailor",
     "difficulty": 2,
     "time": "30 m",
     "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 8 ] ],
-    "components": [
-      [ [ "rag", 2 ] ]
+    "using": [
+      [ "sewing_standard", 8 ],
+      [ "tailoring_cotton", 1 ]
     ]
   },
   {
@@ -209,17 +179,17 @@
     "time": "45 m",
     "book_learn": [ [ "book_maid_clothing", 4 ] ],
     "using": [
-      [ "filament", 24 ]
+      [ "filament", 24 ],
+      [ "tailoring_cotton", 1 ],
+      [ "tailoring_leather_patchwork", 5 ]
     ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" },
+      { "proficiency": "prof_millinery" }
     ],
     "components": [
-      [ [ "kawaii_maid_hat", 1 ] ],
-      [ [ "rag", 2 ] ],
-      [ [ "leather", 10 ] ]
+      [ [ "maid_hat", 1 ] ]
     ]
   },
   {
@@ -234,12 +204,18 @@
     "book_learn": [ [ "book_maid_clothing", 6 ] ],
     "using": [
       [ "sewing_standard", 40 ],
-      [ "adhesive", 2 ]
+      [ "adhesive", 2 ],
+      [ "tailoring_cotton", 1 ]
+    ],
+    "proficiencies": [
+      { "proficiency": "prof_polymerworking" },
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_millinery" }
     ],
     "components": [
       [ [ "kawaii_maid_hat_thermal_off", 1 ] ],
-      [ [ "kevlar_plate", 4 ] ],
-      [ [ "rag", 2 ] ]
+      [ [ "kevlar_plate", 4 ] ]
     ]
   },
   {
@@ -251,9 +227,9 @@
     "difficulty": 2,
     "time": "30 m",
     "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 8 ] ],
-    "components": [
-      [ [ "rag", 3 ] ]
+    "using": [
+      [ "sewing_standard", 8 ],
+      [ "tailoring_cotton", 1 ]
     ]
   },
   {
@@ -266,9 +242,9 @@
     "difficulty": 2,
     "time": "10 m",
     "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 4 ] ],
-    "components": [
-      [ [ "rag", 4 ] ]
+    "using": [
+      [ "sewing_standard", 4 ],
+      [ "tailoring_cotton", 2 ]
     ]
   },
   {
@@ -282,17 +258,16 @@
     "time": "30 m",
     "book_learn": [ [ "book_maid_clothing", 4 ] ],
     "using": [
-      [ "filament", 6 ]
+      [ "filament", 6 ],
+      [ "tailoring_cotton", 2 ],
+      [ "tailoring_leather_patchwork", 1 ]
     ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [
-      [ [ "maid_gloves_cotton", 1 ] ],
-      [ [ "rag", 4 ] ],
-      [ [ "leather", 2 ] ]
+      [ [ "maid_gloves_cotton", 1 ] ]
     ]
   },
   {
@@ -307,12 +282,17 @@
     "book_learn": [ [ "book_maid_clothing", 6 ] ],
     "using": [
       [ "sewing_standard", 50 ],
-      [ "adhesive", 2 ]
+      [ "adhesive", 2 ],
+      [ "tailoring_cotton", 2 ]
+    ],
+    "proficiencies": [
+      { "proficiency": "prof_polymerworking" },
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" }
     ],
     "components": [
       [ [ "maid_gloves_leather", 1 ] ],
-      [ [ "kevlar_plate", 4 ] ],
-      [ [ "rag", 4 ] ]
+      [ [ "kevlar_plate", 4 ] ]
     ]
   },
   {
@@ -325,9 +305,9 @@
     "difficulty": 2,
     "time": "10 m",
     "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 8 ] ],
-    "components": [
-      [ [ "rag", 8 ] ]
+    "using": [
+      [ "sewing_standard", 8 ],
+      [ "tailoring_cotton", 4 ]
     ]
   },
   {
@@ -341,17 +321,16 @@
     "time": "30 m",
     "book_learn": [ [ "book_maid_clothing", 4 ] ],
     "using": [
-      [ "filament", 12 ]
+      [ "filament", 12 ],
+      [ "tailoring_cotton", 4 ],
+      [ "tailoring_leather_patchwork", 2 ]
     ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" }
     ],
     "components": [
-      [ [ "maid_gloves_long_cotton", 1 ] ],
-      [ [ "rag", 8 ] ],
-      [ [ "leather", 4 ] ]
+      [ [ "maid_gloves_long_cotton", 1 ] ]
     ]
   },
   {
@@ -366,12 +345,17 @@
     "book_learn": [ [ "book_maid_clothing", 6 ] ],
     "using": [
       [ "sewing_standard", 100 ],
-      [ "adhesive", 4 ]
+      [ "adhesive", 4 ],
+      [ "tailoring_cotton", 4 ]
+    ],
+    "proficiencies": [
+      { "proficiency": "prof_polymerworking" },
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" }
     ],
     "components": [
       [ [ "maid_gloves_long_leather", 1 ] ],
-      [ [ "kevlar_plate", 8 ] ],
-      [ [ "rag", 8 ] ]
+      [ [ "kevlar_plate", 8 ] ]
     ]
   },
   {
@@ -384,13 +368,13 @@
     "difficulty": 2,
     "time": "35 m",
     "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
+    "using": [
+      [ "tailoring_leather_patchwork", 3 ]
     ],
-    "components": [
-      [ [ "leather", 6 ] ]
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" },
+      { "proficiency": "prof_cobbling" }
     ]
   },
   {
@@ -403,13 +387,13 @@
     "difficulty": 2,
     "time": "35 m",
     "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
+    "using": [
+      [ "tailoring_leather_patchwork", 5 ]
     ],
-    "components": [
-      [ [ "leather", 10 ] ]
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" },
+      { "proficiency": "prof_cobbling" }
     ]
   },
   {
@@ -427,6 +411,10 @@
       [ "sewing_standard", 80 ],
       [ "adhesive", 4 ]
     ],
+    "proficiencies": [
+      { "proficiency": "prof_polymerworking" },
+      { "proficiency": "prof_cobbling" }
+    ],
     "components": [
       [ [ "kawaii_dress_shoes", 1 ] ],
       [ [ "kevlar_plate", 4 ] ],
@@ -448,6 +436,10 @@
       [ "sewing_standard", 80 ],
       [ "adhesive", 4 ]
     ],
+    "proficiencies": [
+      { "proficiency": "prof_polymerworking" },
+      { "proficiency": "prof_cobbling" }
+    ],
     "components": [
       [ [ "kawaii_boots", 1 ] ],
       [ [ "kevlar_plate", 4 ] ],
@@ -464,9 +456,9 @@
     "difficulty": 2,
     "time": "15 m",
     "book_learn": [ [ "mag_animecon", 2 ], [ "book_maid_clothing", 2 ] ],
-    "using": [ [ "sewing_standard", 9 ] ],
-    "components": [
-      [ [ "rag", 12 ] ]
+    "using": [
+      [ "sewing_standard", 9 ],
+      [ "tailoring_cotton", 5 ]
     ]
   },
   {
@@ -479,9 +471,9 @@
     "difficulty": 2,
     "time": "10 m",
     "book_learn": [ [ "mag_animecon", 2 ], [ "book_maid_clothing", 2 ] ],
-    "using": [ [ "sewing_standard", 6 ] ],
-    "components": [
-      [ [ "rag", 8 ] ]
+    "using": [
+      [ "sewing_standard", 6 ],
+      [ "tailoring_cotton", 4 ]
     ]
   },
   {
@@ -493,9 +485,9 @@
     "difficulty": 2,
     "time": "35 m",
     "book_learn": [ [ "mag_animecon", 2 ], [ "book_maid_clothing", 2 ] ],
-    "using": [ [ "sewing_standard", 30 ] ],
-    "components": [
-      [ [ "rag", 8 ] ]
+    "using": [
+      [ "sewing_standard", 30 ],
+      [ "tailoring_cotton", 4 ]
     ]
   },
   {
@@ -508,9 +500,9 @@
     "difficulty": 4,
     "time": "20 m",
     "book_learn": [ [ "mag_animecon", 2 ], [ "book_maid_clothing", 2 ] ],
-    "using": [ [ "sewing_standard", 18 ] ],
-    "components": [
-      [ [ "rag", 12 ] ]
+    "using": [
+      [ "sewing_standard", 18 ],
+      [ "tailoring_cotton", 5 ]
     ]
   },
   {
@@ -523,9 +515,9 @@
     "time": "80 m",
     "reversible": false,
     "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 30 ] ],
-    "components": [
-      [ [ "rag", 8 ] ]
+    "using": [
+      [ "sewing_standard", 30 ],
+      [ "tailoring_cotton", 4 ]
     ]
   },
   {
@@ -538,9 +530,9 @@
     "difficulty": 2,
     "time": "1 h",
     "book_learn": [ [ "mag_animecon", 2 ], [ "book_maid_clothing", 2 ] ],
-    "using": [ [ "sewing_standard", 15 ] ],
-    "components": [
-      [ [ "rag", 2 ] ]
+    "using": [
+      [ "sewing_standard", 15 ],
+      [ "tailoring_cotton", 1 ]
     ]
   },
   {
@@ -553,47 +545,15 @@
     "difficulty": 2,
     "time": "1 h",
     "book_learn": [ [ "mag_animecon", 2 ], [ "book_maid_clothing", 2 ] ],
-    "using": [ [ "sewing_standard", 15 ] ],
+    "using": [
+      [ "sewing_standard", 15 ],
+      [ "tailoring_cotton", 1 ]
+    ],
     "components": [
-      [ [ "rag", 2 ] ],
       [ [ "wire", 1 ] ]
     ]
   },
   {
-    "type": "recipe",
-    "result": "kawaii_vest",
-    "//": "A utility vest upgraded with cuter detailing.",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
-    "skill_used": "tailor",
-    "difficulty": 2,
-    "skills_required": [ "fabrication", 2 ],
-    "time": "45 m",
-    "book_learn": [ [ "mag_animecon", 2 ], [ "book_maid_clothing", 2 ] ],
-    "using": [ [ "sewing_standard", 50 ] ],
-    "components": [
-      [ [ "vest" , 1 ] ],
-      [ [ "rag", 6 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "result": "kawaii_vest_tac",
-    "//": "A tac vest upgraded with cuter detailing.",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
-    "skill_used": "tailor",
-    "difficulty": 6,
-    "skills_required": [ "fabrication", 6 ],
-    "time": "45 m",
-    "book_learn": [ [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 50 ] ],
-    "components": [
-      [ [ "tacvest" , 1 ] ],
-      [ [ "rag", 6 ] ]
-    ]
-  },
-  {
      "type": "recipe",
     "result": "tux",
     "category": "CC_ARMOR",
@@ -603,9 +563,9 @@
     "time": "1 h 30 m",
     "reversible": false,
     "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 150 ] ],
-    "components": [
-      [ [ "rag", 20 ] ]
+    "using": [
+      [ "sewing_standard", 150 ],
+      [ "tailoring_cotton", 8 ]
     ]
   },
   {
@@ -620,17 +580,18 @@
     "reversible": false,
     "book_learn": [ [ "book_maid_clothing", 4 ] ],
     "using": [
-      [ "filament", 150 ]
-      ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
+      [ "filament", 150 ],
+      [ "tailoring_cotton", 8 ],
+      [ "tailoring_leather_patchwork", 6 ]
+    ],
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_closures" }
     ],
     "components": [
-      [ [ "tux" , 1] ],
-      [ [ "rag" , 20 ] ],
-      [ [ "leather", 12 ] ]
+      [ [ "tux" , 1] ]
     ]
   },
   {
@@ -647,7 +608,13 @@
     "book_learn": [ [ "book_maid_clothing", 6 ] ],
     "using": [
       [ "sewing_standard", 150 ],
-      [ "adhesive", 12 ]
+      [ "adhesive", 12 ],
+      [ "tailoring_cotton", 8 ]
+    ],
+    "proficiencies": [
+      { "proficiency": "prof_polymerworking" },
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" }
     ],
     "components": [
       [ [ "survivor_tux_leather", 1 ] ],
@@ -664,8 +631,7 @@
         [ "purse", 2 ],
         [ "fanny", 2 ]
       ],
-      [ [ "kevlar_plate", 24 ] ],
-      [ [ "rag", 20 ] ]
+      [ [ "kevlar_plate", 24 ] ]
     ]
   },
   {
@@ -719,7 +685,7 @@
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ],
     "components": [
-      [ [ "wood_structural", 1, "LIST" ] ]
+      [ [ "log", 1 ] ]
     ]
   },
   {
@@ -739,7 +705,7 @@
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ],
     "components": [
-      [ [ "wood_structural_small", 1, "LIST" ] ]
+      [ [ "log", 1 ] ]
     ]
   },
   {
@@ -759,7 +725,7 @@
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ],
     "components": [
-      [ [ "wood_structural_small", 1, "LIST" ] ],
+      [ [ "log", 1 ] ],
       [ [ "spike", 6 ] ]
     ]
   },
@@ -785,7 +751,10 @@
     "components": [
       [ [ "blade", 1 ] ],
       [ [ "spike", 1 ] ],
-      [ [ "wood_structural", 1, "LIST" ], [ "broom", 1 ] ]
+      [
+        [ "log", 1 ],
+        [ "broom", 1 ]
+      ]
     ]
   },
   {
@@ -852,7 +821,7 @@
     ],
     "tools": [ [ [ "polisher", 20 ] ] ],
     "components": [
-      [ [ "wood_structural", 1, "LIST" ] ],
+      [ [ "log", 1 ] ],
       [ [ "wax", 2] ]
     ]
   },
@@ -905,30 +874,12 @@
       { "id": "HAMMER", "level": 2 }
     ],
     "components": [
-      [ [ "wood_structural", 1, "LIST" ] ],
+      [ [ "log", 1 ] ],
       [ [ "rag", 4 ] ]
     ]
   },
   {
     "type": "recipe",
-    "result": "flask_shoggoth",
-    "category": "CC_OTHER",
-    "skill_used": "cooking",
-    "difficulty": 9,
-    "time": "100 m",
-    "reversible": false,
-    "autolearn": false,
-    "book_learn": [ [ "book_shoggoth", 9 ] ],
-    "tools": [ [ [ "chemistry_set", 5 ] ] ],
-    "components": [
-      [ [ "meat_shoggoth", 1 ]  ],
-      [ [ "flask_glass", 1 ] ],
-      [ [ "blood", 10 ] ],
-      [ [ "maid_dress", 1 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
     "result": "master_doll",
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_OTHER",
@@ -938,9 +889,9 @@
     "time": "1 h",
     "reversible": false,
     "book_learn": [ [ "mag_animecon", 3 ], [ "book_maid_clothing", 3 ] ],
-    "using": [ [ "sewing_standard", 50 ] ],
-    "components": [
-      [ [ "rag", 12 ] ]
+    "using": [
+      [ "sewing_standard", 50 ],
+      [ "tailoring_cotton", 5 ]
     ]
   },
   {
@@ -962,26 +913,6 @@
   },
   {
     "type": "recipe",
-    "result": "summon_little_maid",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_TOOLS",
-    "skill_used": "fabrication",
-    "difficulty": 3,
-    "time": "20 m",
-    "reversible": false,
-    "autolearn": false,
-    "qualities":[ { "id": "CUT", "level": 1 } ],
-    "tools": [
-       [ [ "feather", -1 ] ]
-    ],
-    "components": [
-       [ [ "paper", 5 ] ],
-       [ [ "sugar", 1 ] ],
-       [ [ "wood_structural_small", 1, "LIST" ] ]
-    ]
-  },
-  {
-    "type": "recipe",
     "result": "kawaii_raincoat",
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_TORSO",
@@ -990,43 +921,15 @@
     "time": "30 m",
     "book_learn": [ [ "mag_animecon", 2 ], [ "book_maid_clothing", 2 ] ],
     "using": [
-      [ "adhesive", 2 ]
+      [ "adhesive", 2 ],
+      [ "tailoring_cotton", 4 ]
     ],
     "components": [
-      [ [ "rag", 10 ] ],
       [ [ "bag_plastic", 10 ], [ "duct_tape", 50 ] ]
     ]
   },
   {
     "type": "recipe",
-    "result": "kawaii_bikini_bottom_black",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_LEGS",
-    "skill_used": "tailor",
-    "difficulty": 2,
-    "time": "35 m",
-    "book_learn": [ [ "mag_animecon", 1 ], [ "book_maid_clothing", 1 ] ],
-    "using": [ [ "sewing_standard", 15 ] ],
-    "components": [
-      [ [ "rag", 2 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "result": "kawaii_bikini_top_black",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
-    "skill_used": "tailor",
-    "difficulty": 2,
-    "time": "38 m",
-    "book_learn": [ [ "mag_animecon", 1 ], [ "book_maid_clothing", 1 ] ],
-    "using": [ [ "sewing_standard", 15 ] ],
-    "components": [
-      [ [ "rag", 2 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
     "result": "kawaii_maid_hardcase",
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_STORAGE",
@@ -1057,16 +960,17 @@
     "book_learn": [ [ "book_maid_clothing", 5 ] ],
     "using": [
       [ "plastic_molding", 15 ],
-      [ "adhesive", 5 ]
+      [ "adhesive", 5 ],
+      [ "tailoring_leather_patchwork", 18 ]
     ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_closures" }
     ],
     "components": [
-      [ [ "kawaii_maid_hardcase_slim", 1 ] ],
-      [ [ "leather", 36 ] ]
+      [ [ "kawaii_maid_hardcase_slim", 1 ] ]
     ]
   },
   {
@@ -1081,15 +985,14 @@
     "book_learn": [ [ "book_maid_clothing", 4 ] ],
     "using": [
       [ "plastic_molding", 10 ],
-      [ "adhesive", 4 ]
+      [ "adhesive", 4 ],
+      [ "tailoring_leather_patchwork", 10 ]
     ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 },
-      { "id": "LEATHER_AWL", "level": 1 }
-    ],
-    "components": [
-      [ [ "leather", 20 ] ]
+    "proficiencies": [
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_leatherworking" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_closures" }
     ]
   },
   {
@@ -1103,9 +1006,9 @@
     "time": "90 m",
     "reversible": true,
     "book_learn": [ [ "mag_animecon", 2 ], [ "book_maid_clothing", 2 ] ],
-    "using": [ [ "sewing_standard", 3 ] ],
-    "components": [
-      [ [ "rag", 4 ] ]
+    "using": [
+      [ "sewing_standard", 3 ],
+      [ "tailoring_cotton", 2 ]
     ]
   },
   {
@@ -1143,6 +1046,11 @@
       [ "soldering_standard", 40 ],
       [ "adhesive", 1 ]
     ],
+    "proficiencies": [
+      { "proficiency": "prof_polymerworking" },
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" }
+    ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "kawaii_maid_megane_01" , 1 ] ],