Rebalance maid stockings and scarf

Update mass values to metric
Update maid outfit and hat recpies with the recpies to be added in 0.F

3 files changed, 45 insertions, 78 deletions

diff --git a/armor.json b/armor.json
index f733fe9..5c7ff6d 100644
--- a/armor.json
+++ b/armor.json
@@ -486,10 +486,10 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "LEGS", "FEET" ],
-    "coverage": 75,
+    "covers": [ "FEET" ],
+    "coverage": 100,
     "encumbrance": 5,
-    "warmth": 35,
+    "warmth": 15,
     "material_thickness": 1,
     "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ]
   },
@@ -504,8 +504,8 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "LEGS", "FEET" ],
-    "coverage": 75,
+    "covers": [ "FEET" ],
+    "coverage": 100,
     "encumbrance": 0,
     "warmth": 0,
     "material_thickness": 1,
@@ -697,7 +697,7 @@
     "flags" : ["POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS"],
     "warmth" : 60,
     "environmental_protection" : 5,
-    "encumbrance" : 5,
+    "encumbrance" : 3,
     "coverage" : 85,
     "material_thickness" : 1,
     "use_action": {
@@ -724,7 +724,7 @@
     "flags" : ["POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS"],
     "warmth" : 20,
     "environmental_protection" : 5,
-    "encumbrance" : 5,
+    "encumbrance" : 2,
     "coverage" : 45,
     "material_thickness" : 1,
       "use_action": {
diff --git a/recipes.json b/recipes.json
index 105f1c6..c3ccb18 100644
--- a/recipes.json
+++ b/recipes.json
@@ -1,28 +1,21 @@
 [
   {
-    "type" : "recipe",
     "result": "maid_dress",
+    "type": "recipe",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
-    "difficulty": 2,
-    "time": "90 m",
-    "reversible": false,
+    "difficulty": 3,
+    "time": "1 h 30 m",
     "autolearn": true,
-    "using": [ [ "filament", 150 ] ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 }
-    ],
-    "components": [
-      [ [ "rag", 40 ] ]
-    ]
+    "using": [ [ "sewing_standard", 15 ] ],
+    "components": [ [ [ "rag", 10 ] ] ]
   },
   {
     "type" : "recipe",
     "result": "kawaii_maid_dress_long_leather",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "difficulty": 4,
     "time": "2 h",
@@ -44,7 +37,7 @@
     "type": "recipe",
     "result": "kawaii_maid_dress_long_armor",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "difficulty": 6,
     "time": "3 h",
@@ -65,23 +58,16 @@
     ]
   },
   {
-    "type" : "recipe",
     "result": "maid_dress_french",
+    "type": "recipe",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
-    "difficulty": 2,
-    "time": "90 m",
-    "reversible": false,
+    "difficulty": 3,
+    "time": "1 h 30 m",
     "autolearn": true,
-    "using": [ [ "filament", 150 ] ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 }
-    ],
-    "components": [
-      [ [ "rag", 20 ] ]
-    ]
+    "using": [ [ "sewing_standard", 15 ] ],
+    "components": [ [ [ "rag", 10 ] ] ]
   },
   {
     "type" : "recipe",
@@ -121,29 +107,22 @@
     ]
   },
   {
-     "type" : "recipe",
     "result": "maid_hat",
+    "type": "recipe",
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_HEAD",
     "skill_used": "tailor",
     "difficulty": 2,
-    "time": "1 h",
-    "reversible": false,
+    "time": "30 m",
     "autolearn": true,
-    "using": [ [ "filament", 20 ] ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 }
-    ],
-    "components": [
-      [ [ "rag", 3 ] ]
-    ]
+    "using": [ [ "sewing_standard", 8 ] ],
+    "components": [ [ [ "rag", 3 ] ] ]
   },
   {
      "type" : "recipe",
     "result": "jokyu_fuku",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "difficulty": 4,
     "time": "90 m",
@@ -235,7 +214,7 @@
      "type" : "recipe",
     "result": "tux",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "difficulty": 4,
     "time": "90 m",
@@ -254,7 +233,7 @@
     "type" : "recipe",
     "result": "survivor_tux",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "skills_required" : ["fabrication", 6],
     "difficulty": 7,
@@ -547,16 +526,10 @@
     "subcategory": "CSC_ARMOR_HEAD",
     "skill_used": "tailor",
     "difficulty": 2,
-    "time": "15 m",
+    "time": "30 m",
     "autolearn": true,
-    "using": [ [ "filament", 20 ] ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 }
-    ],
-    "components": [
-      [ [ "rag" , 14 ] ]
-    ]
+    "using": [ [ "sewing_standard", 8 ] ],
+    "components": [ [ [ "rag", 3 ] ] ]
   },
   {
     "result": "kawaii_maid_hat_thermal_off",
@@ -798,28 +771,22 @@
     ]
   },
   {
-    "type" : "recipe",
     "result": "kawaii_maid_dress",
+    "type": "recipe",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
-    "difficulty": 2,
-    "time": "1 h",
+    "difficulty": 3,
+    "time": "1 h 30 m",
     "autolearn": true,
-    "using": [ [ "filament", 150 ] ],
-    "qualities": [
-      { "id": "SEW", "level": 1 },
-      { "id": "CUT", "level": 1 }
-    ],
-    "components": [
-      [ [ "rag" , 24 ] ]
-    ]
+    "using": [ [ "sewing_standard", 15 ] ],
+    "components": [ [ [ "rag", 10 ] ] ]
   },
    {
     "type" : "recipe",
     "result": "kawaii_maid_dress_ex",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "difficulty": 4,
     "time": "2 h",
@@ -841,7 +808,7 @@
     "type": "recipe",
     "result": "kawaii_maid_dress_lss",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "difficulty": 6,
     "time": "3 h",
@@ -865,7 +832,7 @@
     "type" : "recipe",
     "result": "kawaii_raincoat",
     "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
     "difficulty": 1,
     "time": "30 m",
diff --git a/tools.json b/tools.json
index 4629b0c..4f74d98 100644
--- a/tools.json
+++ b/tools.json
@@ -66,7 +66,7 @@
   "id": "mini_shoggoth",
   "name":  { "str": "Small Cute Maid", "str_pl" : "Small Cute Maids" },
   "description": "'Ah... I think I went overboard and turned out like this. I need some time to return to my former shape. Please warm me up in Mistress' pockets! Don't put me in a fridge! Absolutely not!'",
-  "weight": 200,
+  "weight": "200 g",
   "symbol": "m",
   "color": "white",
   "price": 5000,
@@ -91,7 +91,7 @@
   "description": "'What's up? Why haven't you put me on the ground yet? Ah, you want me to stay tiny for a little while longer? Ehh... I suppose it can't be helped.'",
   "price": 60000,
   "material": ["maid"],
-  "weight": 1200,
+  "weight": "1200 g",
   "volume": 1,
   "use_action": {
     "type": "place_monster",
@@ -110,7 +110,7 @@
   "description": "A set of scrolls and sacrifices used to summon a different kind of maid. Pour the sacrificial sugar in the middle of the magic circle and cast the correct spell.",
   "price": 60000,
   "material": ["paper"],
-  "weight": 1200,
+  "weight": "1200 g",
   "volume": 1,
   "use_action": {
     "type": "place_monster",
@@ -125,7 +125,7 @@
   "id": "mini_little_maid",
   "name":  { "str": "Little Little Maid", "str_pl" : "Little Little Maids" },
   "description": "An even smaller version of your little maid.",
-  "weight": 150,
+  "weight": "150 g",
   "symbol": "m",
   "color": "white",
   "price": 5000,
@@ -150,7 +150,7 @@
   "description": "Your little maid seems to have made a complete recovery.",
   "price": 60000,
   "material": ["maid"],
-  "weight": 1200,
+  "weight": "1200 g",
   "volume": 1,
   "use_action": {
     "type": "place_monster",