Port to DDA.

1 files changed, 1011 insertions, 649 deletions

diff --git a/armor.json b/armor.json
index ac82b67..a80052d 100644
--- a/armor.json
+++ b/armor.json
@@ -12,11 +12,20 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "black",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 95,
-    "encumbrance": 7,
-    "max_encumbrance": 10,
-    "storage": "2500 ml",
+    "armor": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 10 ] },
+      { "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": [ 5, 5 ] },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 5, 5 ] }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "10 cm",
+        "moves": 80
+      }
+    ],
     "warmth": 20,
     "material_thickness": 2,
     "environmental_protection": 1,
@@ -35,11 +44,34 @@
     "material": [ "leather", "cotton" ],
     "symbol": "[",
     "color": "black",
-    "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
-    "coverage": 100,
-    "encumbrance": 12,
-    "max_encumbrance": 16,
-    "storage": "6 L",
+    "armor": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 12, 16 ] },
+      { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "2500 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "20 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "2500 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "20 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "10 cm",
+        "moves": 80
+      }
+    ],
     "warmth": 45,
     "material_thickness": 5,
     "environmental_protection": 2,
@@ -59,11 +91,34 @@
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
     "color": "black",
-    "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
-    "coverage": 100,
-    "encumbrance": 15,
-    "max_encumbrance": 20,
-    "storage": "9 L",
+    "armor": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 15, 20 ] },
+      { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 10, 10 ] },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 10, 10 ] }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "2500 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "20 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "2500 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "20 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "10 cm",
+        "moves": 80
+      }
+    ],
     "warmth": 45,
     "material_thickness": 8,
     "environmental_protection": 3,
@@ -77,33 +132,9 @@
     "flags": [ "VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ]
   },
   {
-    "id": "maid_dress_french",
-    "//": "Copy of the vanilla french maid dress. Super fancy, renamed, using a different item ID, and counts as clothing.",
-    "repairs_like": "trenchcoat",
-    "type": "ARMOR",
-    "category": "clothing",
-    "name": { "str": "french maid dress", "str_pl": "french maid dresses" },
-    "description": "The French maid dress, blue with a frilly white apron.",
-    "weight": "100 g",
-    "volume": "250 ml",
-    "price": 5000,
-    "price_postapoc": 50,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "looks_like": "dress",
-    "color": "blue",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 75,
-    "encumbrance": 5,
-    "max_encumbrance": 7,
-    "storage": "500 ml",
-    "warmth": 5,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SUPER_FANCY" ]
-  },
-  {
-    "id": "kawaii_maid_dress",
+    "id": "maid_dress_short",
     "type": "ARMOR",
+    "looks_like": "kawaii_maid_dress",
     "name": { "str": "maid dress", "str_pl": "maid dresses" },
     "description": "A black dress with white apron and lace trim, worn by maids.",
     "weight": "150 g",
@@ -113,11 +144,32 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "blue",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 75,
-    "encumbrance": 5,
-    "max_encumbrance": 7,
-    "storage": "1500 ml",
+    "armor": [
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ], "coverage": 100, "encumbrance": [ 5, 7 ] },
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ], "coverage": 75 },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ],
+        "coverage": 100,
+        "encumbrance": 2
+      },
+      { "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ], "coverage": 50 },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r" ],
+        "coverage": 50,
+        "encumbrance": 2
+      }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "10 cm",
+        "moves": 80
+      }
+    ],
     "warmth": 15,
     "material_thickness": 1,
     "flags": [ "VARSIZE", "FANCY" ]
@@ -134,11 +186,46 @@
     "material": [ "leather", "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 100,
-    "encumbrance": 7,
-    "max_encumbrance": 10,
-    "storage": " 5 L",
+    "armor": [
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ], "coverage": 100, "encumbrance": [ 7, 10 ] },
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ], "coverage": 75 },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ],
+        "coverage": 100,
+        "encumbrance": 3
+      },
+      { "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ], "coverage": 50 },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r" ],
+        "coverage": 50,
+        "encumbrance": 3
+      }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "10 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "2000 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "20 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "2000 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "20 cm",
+        "moves": 80
+      }
+    ],
     "warmth": 15,
     "material_thickness": 3,
     "environmental_protection": 1,
@@ -157,11 +244,46 @@
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
     "color": "green",
-    "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
-    "coverage": 100,
-    "encumbrance": 12,
-    "max_encumbrance": 15,
-    "storage": "7500 ml",
+    "armor": [
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ], "coverage": 100, "encumbrance": [ 12, 15 ] },
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ], "coverage": 75 },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ],
+        "coverage": 100,
+        "encumbrance": 5
+      },
+      { "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ], "coverage": 50 },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r" ],
+        "coverage": 50,
+        "encumbrance": 5
+      }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "10 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "2000 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "20 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "2000 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "20 cm",
+        "moves": 80
+      }
+    ],
     "warmth": 15,
     "material_thickness": 5,
     "environmental_protection": 2,
@@ -175,343 +297,425 @@
     "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ]
   },
   {
-    "id": "jokyu_fuku",
-    "type": "ARMOR",
-    "category": "clothing",
-    "name": { "str": "jokyū dress", "str_pl": "jokyū dresses" },
-    "description": "Women's servant clothes worn in Japanese cafes a long time ago. Essentially a white apron over a kimono.",
-    "weight": "1200 g",
-    "volume": "5000 ml",
-    "price": 5000,
-    "price_postapoc": 50,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "color": "brown",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 95,
-    "encumbrance": 5,
-    "max_encumbrance": 7,
-    "storage": "500 ml",
-    "warmth": 20,
-    "material_thickness": 4,
-    "environmental_protection": 1,
-    "flags": [ "VARSIZE", "FANCY" ]
-  },
-  {
-    "id": "kawaii_hat_cotton",
-    "//": "Loosely based on cotton hat.",
-    "type": "ARMOR",
-    "category": "clothing",
-    "name": { "str": "maid hat" },
-    "description": "It's a warm hat made of cotton, coloured white to better match a maid uniform.",
-    "weight": "78 g",
-    "volume": "250 ml",
-    "price": 2000,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "head" ],
-    "coverage": 65,
-    "warmth": 20,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "HOOD" ]
-  },
-  {
-    "id": "kawaii_maid_hat",
+    "id": "maid_hat",
+    "//": "Originally the kawaii_maid_hat, now overwrites maid_hat. Based on maid_hat.",
+    "looks_like": "hat_cotton",
+    "repairs_like": "balclava",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "maid headband" },
     "description": "A black headband with white lace trim, worn by maids.",
-    "weight": "150 g",
+    "weight": "10 g",
     "volume": "250 ml",
-    "price": "25 USD",
+    "price": 2500,
+    "price_postapoc": 50,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "white",
-    "covers": [ "head" ],
-    "coverage": 25,
-    "encumbrance": 3,
-    "warmth": 15,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "FANCY", "SKINTIGHT" ]
+    "warmth": 2,
+    "material_thickness": 0.05,
+    "flags": [ "VARSIZE", "FANCY", "SKINTIGHT" ],
+    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 25, "covers": [ "head" ] } ]
   },
   {
     "id": "kawaii_maid_hat_thermal_off",
+    "copy-from": "maid_hat",
     "type": "ARMOR",
     "name": { "str": "tailored maid headband" },
     "description": "A black headband with white lace trim, worn by maids. It has been reinforced with leather for greater protection.",
     "weight": "250 g",
-    "volume": "250 ml",
-    "price": 25000,
+    "price": 2500,
+    "price_postapoc": 100,
     "material": [ "leather", "cotton" ],
-    "symbol": "[",
-    "color": "white",
-    "covers": [ "head" ],
-    "coverage": 25,
-    "encumbrance": 3,
-    "warmth": 15,
-    "material_thickness": 3,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "SKINTIGHT" ]
+    "material_thickness": 0.2,
+    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "SKINTIGHT" ],
+    "armor": [
+      {
+        "encumbrance_modifiers": [ "NONE" ],
+        "material": [
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 0.4 },
+          { "type": "leather", "covered_by_mat": 80, "thickness": 1.5 }
+        ],
+        "coverage": 25,
+        "covers": [ "head" ]
+      }
+    ]
   },
   {
     "id": "kawaii_maid_hat_lss",
+    "copy-from": "maid_hat",
     "type": "ARMOR",
     "name": { "str": "survivor maid headband" },
     "description": "A black headband with white lace trim, worn by maids. It has been reinforced with kevlar for greater protection.",
     "weight": "350 g",
-    "volume": "250 ml",
-    "price": 55000,
+    "price": 5500,
+    "price_postapoc": 200,
     "material": [ "kevlar", "cotton" ],
-    "symbol": "[",
-    "color": "white",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 10,
-    "warmth": 15,
-    "material_thickness": 9,
     "environmental_protection": 3,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "RAINPROOF", "SKINTIGHT", "STURDY" ]
-  },
-  {
-    "id": "maid_hat",
-    "//": "Copy of the vanilla maid headband, but renamed, super fancy, and with warmth to match the dress.",
-    "repairs_like": "balclava",
-    "type": "ARMOR",
-    "category": "clothing",
-    "name": { "str": "french maid headband"},
-    "description": "A frilly white headpiece.",
-    "weight": "10 g",
-    "volume": "250 ml",
-    "price": 2500,
-    "price_postapoc": 50,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "looks_like": "hat_cotton",
-    "color": "white",
-    "covers": [ "head" ],
-    "coverage": 25,
-    "encumbrance": 10,
-    "warmth": 5,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SUPER_FANCY" ]
+    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "RAINPROOF", "SKINTIGHT", "STURDY" ],
+    "armor": [
+      {
+        "encumbrance_modifiers": [ "NONE" ],
+        "material": [
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 0.4 },
+          { "type": "kevlar", "covered_by_mat": 80, "thickness": 1.5 }
+        ],
+        "coverage": 25,
+        "covers": [ "head" ]
+      }
+    ]
   },
   {
     "id": "maid_gloves_cotton",
+    "//": "Based on gloves_liner",
     "type": "ARMOR",
     "category": "clothing",
-    "looks_like": "gloves_liner",
     "name": { "str": "pair of maid gloves", "str_pl": "pairs of maid gloves" },
     "description": "A pair of white gloves, used by maids.",
-    "weight": "118 g",
+    "weight": "63 g",
     "volume": "250 ml",
-    "price": 1100,
+    "price": 600,
+    "price_postapoc": 50,
     "to_hit": 1,
     "material": [ "cotton" ],
     "symbol": "[",
-    "color": "light_blue",
-    "covers": [ "hand_l", "hand_r" ],
-    "coverage": 95,
-    "encumbrance": 4,
+    "looks_like": "gloves_light",
+    "color": "light_gray",
     "warmth": 15,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "FANCY" ]
+    "material_thickness": 0.1,
+    "flags": [ "VARSIZE", "SKINTIGHT" ],
+    "armor": [ { "encumbrance": 1, "coverage": 95, "covers": [ "hand_l", "hand_r" ] } ]
   },
-    {
+  {
     "id": "maid_gloves_leather",
+    "copy-from": "maid_gloves_cotton",
     "type": "ARMOR",
     "looks_like": "gloves_liner",
     "name": { "str": "pair of tailored maid gloves", "str_pl": "pairs of tailored maid gloves" },
     "description": "A pair of white gloves, used by maids. They have been reinforced with leather for greater protection.",
     "weight": "150 g",
     "volume": "500 ml",
-    "price": 12000,
-    "to_hit": 1,
+    "price": 1200,
+    "price_postapoc": 100,
     "material": [ "cotton", "leather" ],
-    "symbol": "[",
-    "color": "light_blue",
     "covers": [ "hand_l", "hand_r" ],
-    "coverage": 100,
-    "encumbrance": 6,
+    "coverage": 95,
     "warmth": 15,
-    "material_thickness": 3,
-    "environmental_protection": 1,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF" ]
+    "material_thickness": 0.5,
+    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY", "WATERPROOF" ],
+    "armor": [
+      {
+        "encumbrance": 3,
+        "material": [
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 0.4 },
+          { "type": "leather", "covered_by_mat": 80, "thickness": 2 }
+        ],
+        "coverage": 95,
+        "covers": [ "hand_l", "hand_r" ]
+      }
+    ]
   },
-    {
+  {
     "id": "maid_gloves_armor",
+    "copy-from": "maid_gloves_cotton",
     "type": "ARMOR",
     "looks_like": "gloves_liner",
     "name": { "str": "pair of survivor maid gloves", "str_pl": "pairs of survivor maid gloves" },
     "description": "A pair of white gloves, used by maids. They have been reinforced with kevlar for greater protection.",
     "weight": "190 g",
-    "volume": "750 ml",
-    "price": 18000,
+    "volume": "500 ml",
+    "price": 5200,
+    "price_postapoc": 1500,
     "to_hit": 2,
     "material": [ "cotton", "kevlar" ],
-    "symbol": "[",
-    "color": "light_blue",
-    "covers": [ "hand_l", "hand_r" ],
-    "coverage": 100,
-    "encumbrance": 8,
-    "warmth": 15,
-    "material_thickness": 5,
-    "environmental_protection": 3,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY"  ]
+    "environmental_protection": 2,
+    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY", "WATERPROOF", "STURDY"  ],
+    "armor": [
+      {
+        "encumbrance": 10,
+        "material": [
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 0.4 },
+          { "type": "kevlar", "covered_by_mat": 80, "thickness": 3 }
+        ],
+        "coverage": 100,
+        "covers": [ "hand_l", "hand_r" ]
+      }
+    ]
   },
-    {
+  {
     "id": "maid_gloves_long_cotton",
+    "//": "Based on long_glove_white",
+    "repairs_like": "long_glove_white",
     "type": "ARMOR",
-    "category": "clothing",
-    "looks_like": "long_glove_white",
     "name": { "str": "pair of long maid gloves", "str_pl": "pairs of long maid gloves" },
     "description": "A pair of long white gloves, used by maids.",
     "weight": "400 g",
-    "volume": "1000 ml",
+    "volume": "1 L",
     "price": 1100,
+    "price_postapoc": 100,
     "to_hit": 1,
     "material": [ "cotton" ],
     "symbol": "[",
-    "color": "light_blue",
-    "covers": [ "hand_l", "hand_r" ],
-    "coverage": 95,
-    "encumbrance": 8,
-    "warmth": 50,
-    "material_thickness": 2,
-    "flags": [ "VARSIZE", "FANCY" ]
+    "looks_like": "gloves_light",
+    "color": "white",
+    "armor": [
+      { "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 2 },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "specifically_covers": [ "arm_elbow_l", "arm_elbow_r", "arm_lower_l", "arm_lower_r" ],
+        "coverage": 100,
+        "encumbrance": 2
+      },
+      { "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_upper_l", "arm_upper_r" ], "coverage": 50 }
+    ],
+    "warmth": 10,
+    "material_thickness": 0.2,
+    "flags": [ "VARSIZE", "SKINTIGHT" ]
   },
-    {
+  {
     "id": "maid_gloves_long_leather",
+    "copy-from": "maid_gloves_long_cotton",
     "type": "ARMOR",
     "looks_like": "long_glove_white",
     "name": { "str": "pair of tailored long maid gloves", "str_pl": "pairs of tailored long maid gloves" },
     "description": "A pair of long white gloves, used by maids. They have been reinforced with leather for greater protection.",
-    "weight": "150 g",
-    "volume": "500 ml",
-    "price": 12000,
-    "to_hit": 1,
+    "weight": "700 g",
+    "price": 2500,
+    "price_postapoc": 200,
     "material": [ "leather", "cotton" ],
-    "symbol": "[",
-    "color": "light_blue",
-    "covers": [ "hand_l", "hand_r" ],
-    "coverage": 100,
-    "encumbrance": 10,
-    "warmth": 50,
-    "material_thickness": 4,
-    "environmental_protection": 2,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF" ]
+    "armor": [
+      { "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 6 },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "specifically_covers": [ "arm_elbow_l", "arm_elbow_r", "arm_lower_l", "arm_lower_r" ],
+        "coverage": 95,
+        "encumbrance": 6,
+        "material": [
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 0.4 },
+          { "type": "leather", "covered_by_mat": 80, "thickness": 2 }
+        ]
+      },
+      { "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_upper_l", "arm_upper_r" ], "coverage": 50 }
+    ],
+    "material_thickness": 0.5,
+    "flags": [ "VARSIZE", "FANCY", "SKINTIGHT", "WATERPROOF" ]
   },
-    {
+  {
     "id": "maid_gloves_long_armor",
+    "copy-from": "maid_gloves_long_cotton",
     "type": "ARMOR",
     "looks_like": "long_glove_white",
     "name": { "str": "pair of survivor long maid gloves", "str_pl": "pairs of survivor long maid gloves" },
     "description": "A pair of long white gloves, used by maids. They have been reinforced with kevlar for greater protection.",
-    "weight": "190 g",
-    "volume": "750 ml",
-    "price": 18000,
+    "weight": "1000 g",
+    "price": 4500,
+    "price_postapoc": 400,
     "to_hit": 2,
     "material": [ "kevlar", "cotton" ],
-    "symbol": "[",
-    "color": "light_blue",
-    "covers": [ "hand_l", "hand_r", "arm_l", "arm_r" ],
-    "coverage": 100,
-    "encumbrance": 12,
-    "warmth": 40,
-    "material_thickness": 6,
-    "environmental_protection": 4,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY"  ]
+    "armor": [
+      { "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 10 },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "specifically_covers": [ "arm_elbow_l", "arm_elbow_r", "arm_lower_l", "arm_lower_r" ],
+        "coverage": 100,
+        "encumbrance": 10,
+        "material": [
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 0.4 },
+          { "type": "kevlar", "covered_by_mat": 80, "thickness": 3 }
+        ]
+      },
+      { "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_upper_l", "arm_upper_r" ], "coverage": 50 }
+    ],
+    "environmental_protection": 3,
+    "flags": [ "VARSIZE", "FANCY", "SKINTIGHT", "WATERPROOF", "STURDY"  ]
   },
   {
     "id": "kawaii_dress_shoes",
-    "//": "Loosely based on dress shoes.",
+    "//": "Based on dress_shoes.",
+    "repairs_like": "boots",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "pair of maid shoes", "str_pl": "pairs of maid shoes" },
     "description": "A pair of black dress shoes designed to be worn with a maid dress.",
-    "weight": "500 g",
-    "volume": "1250 ml",
+    "weight": "870 g",
+    "volume": "1500 ml",
     "price": 12000,
     "price_postapoc": 250,
+    "to_hit": 1,
+    "bashing": 1,
     "material": [ "leather" ],
     "symbol": "[",
+    "looks_like": "sneakers",
     "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r" ],
-    "coverage": 60,
-    "encumbrance": 15,
-    "warmth": 5,
-    "material_thickness": 2,
-    "flags": [ "VARSIZE", "FANCY" ]
+    "warmth": 10,
+    "material_thickness": 2.0,
+    "flags": [ "VARSIZE", "FANCY" ],
+    "armor": [
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_heel_r", "foot_heel_l", "foot_arch_r", "foot_arch_l", "foot_toes_r", "foot_toes_l" ],
+        "material": [ { "type": "leather", "covered_by_mat": 100, "thickness": 2 } ],
+        "encumbrance": 15,
+        "coverage": 100
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_ankle_r", "foot_ankle_l" ],
+        "material": [ { "type": "leather", "covered_by_mat": 100, "thickness": 2.0 } ],
+        "coverage": 40
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_sole_r", "foot_sole_l" ],
+        "material": [
+          { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 },
+          { "type": "rubber", "covered_by_mat": 100, "thickness": 4.0 }
+        ],
+        "coverage": 100
+      }
+    ]
   },
   {
     "id": "kawaii_shoes_hi",
     "//": "Loosely based on medium survivor boots.",
+    "copy-from": "kawaii_dress_shoes",
     "looks_like": "kawaii_dress_shoes",
     "type": "ARMOR",
     "name": { "str": "pair of survivor maid shoes", "str_pl": "pairs of survivor maid shoes" },
     "description": "A pair of black dress shoes designed to be worn with a maid dress. They have been reinforced with kevlar for greater protection.",
-    "weight": "400 g",
-    "volume": "750 ml",
+    "weight": "1130 g",
     "price": 24000,
     "price_postapoc": 6000,
     "material": [ "kevlar", "leather" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r" ],
-    "coverage": 100,
-    "warmth": 15,
-    "encumbrance": 15,
-    "material_thickness": 5,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY" ]
+    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY" ],
+    "armor": [
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_heel_r", "foot_heel_l", "foot_arch_r", "foot_arch_l", "foot_toes_r", "foot_toes_l" ],
+        "material": [
+          { "type": "kevlar", "covered_by_mat": 100, "thickness": 3.5 },
+          { "type": "leather", "covered_by_mat": 100, "thickness": 2 }
+        ],
+        "encumbrance": 20,
+        "coverage": 100
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_ankle_r", "foot_ankle_l" ],
+        "material": [
+          { "type": "kevlar", "covered_by_mat": 100, "thickness": 3.5 },
+          { "type": "leather", "covered_by_mat": 100, "thickness": 2.0 }
+        ],
+        "coverage": 40
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_sole_r", "foot_sole_l" ],
+        "material": [
+          { "type": "kevlar", "covered_by_mat": 100, "thickness": 0.1 },
+          { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 },
+          { "type": "rubber", "covered_by_mat": 100, "thickness": 4.0 }
+        ],
+        "coverage": 100
+      }
+    ]
   },
   {
     "id": "kawaii_boots",
-    "//": "Loosely based on leather boots.",
+    "//": "Loosely based on boots.",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "pair of maid boots", "str_pl": "pairs of maid boots" },
     "description": "A pair of black boots designed to be worn with a maid dress.",
-    "weight": "800 g",
-    "volume": "2000 ml",
+    "weight": "1060 g",
+    "volume": "2500 ml",
     "price": 10000,
     "price_postapoc": 750,
-    "material": [ "leather" ],
+    "to_hit": -1,
+    "bashing": 1,
     "symbol": "[",
+    "looks_like": "dress_shoes",
     "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r" ],
-    "coverage": 90,
     "warmth": 20,
-    "encumbrance": 12,
-    "material_thickness": 3,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF" ]
+    "flags": [ "VARSIZE", "FANCY", "WATERPROOF" ],
+    "armor": [
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [
+          "foot_toes_r",
+          "foot_toes_l",
+          "foot_ankle_r",
+          "foot_ankle_l",
+          "foot_heel_r",
+          "foot_heel_l",
+          "foot_arch_r",
+          "foot_arch_l"
+        ],
+        "material": [ { "type": "leather", "covered_by_mat": 100, "thickness": 2.5 } ],
+        "encumbrance": 12,
+        "coverage": 100
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_sole_r", "foot_sole_l" ],
+        "material": [
+          { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 },
+          { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 }
+        ],
+        "coverage": 100
+      }
+    ]
   },
   {
     "id": "kawaii_boots_hi",
     "//": "Loosely based on medium survivor boots.",
+    "copy-from": "kawaii_boots",
     "looks_like": "kawaii_boots",
     "type": "ARMOR",
     "name": { "str": "pair of survivor maid boots", "str_pl": "pairs of survivor maid boots" },
     "description": "A pair of black boots designed to be worn with a maid dress. They have been reinforced with kevlar for greater protection.",
-    "weight": "600 g",
-    "volume": "1250 ml",
+    "weight": "1330 g",
     "price": 24000,
     "price_postapoc": 6000,
     "material": [ "kevlar", "leather" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r" ],
-    "coverage": 100,
-    "warmth": 30,
-    "encumbrance": 16,
-    "material_thickness": 7,
     "environmental_protection": 4,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY" ]
+    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY" ],
+    "armor": [
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [
+          "foot_toes_r",
+          "foot_toes_l",
+          "foot_ankle_r",
+          "foot_ankle_l",
+          "foot_heel_r",
+          "foot_heel_l",
+          "foot_arch_r",
+          "foot_arch_l"
+        ],
+        "material": [
+          { "type": "kevlar", "covered_by_mat": 100, "thickness": 3.5 },
+          { "type": "leather", "covered_by_mat": 100, "thickness": 2.5 }
+        ],
+        "encumbrance": 16,
+        "coverage": 100
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_sole_r", "foot_sole_l" ],
+        "material": [
+          { "type": "kevlar", "covered_by_mat": 100, "thickness": 0.1 },
+          { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 },
+          { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 }
+        ],
+        "coverage": 100
+      }
+    ]
   },
   {
     "id": "kawaii_maid_niso_thick",
+    "//": "Loosrly based on stockings",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "pair of maid stockings", "str_pl": "pairs of maid stockings" },
     "description": "A pair of black stockings with white lace trim. The thick material keeps the wearer's legs warm.",
     "weight": "90 g",
@@ -520,121 +724,137 @@
     "price_postapoc": 250,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "leg_warmers",
     "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r", "leg_l", "leg_r" ],
-    "coverage": 75,
-    "encumbrance": 5,
-    "warmth": 15,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ]
+    "warmth": 10,
+    "material_thickness": 0.1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ],
+    "armor": [
+      { "encumbrance": 5, "coverage": 100, "covers": [ "foot_l", "foot_r" ] },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_lower_l", "leg_lower_r", "leg_knee_l", "leg_knee_r" ],
+        "coverage": 100,
+        "encumbrance": 4
+      },
+      { "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ], "coverage": 60 }
+    ]
   },
   {
     "id": "kawaii_maid_niso_thin",
+    "copy-from": "kawaii_maid_niso_thick",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "pair of maid stockings (sheer)", "str_pl": "pairs of maid stockings (sheer)" },
     "description": "A pair of black stockings with white lace trim. The material is thin enough to be slightly transparent when worn.",
     "weight": "40 g",
-    "volume": "250 ml",
-    "price": 500,
-    "price_postapoc": 250,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r", "leg_l", "leg_r" ],
-    "coverage": 75,
-    "encumbrance": 0,
-    "warmth": 0,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ]
+    "armor": [
+      { "encumbrance": 2, "coverage": 100, "covers": [ "foot_l", "foot_r" ] },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_lower_l", "leg_lower_r", "leg_knee_l", "leg_knee_r" ],
+        "coverage": 100,
+        "encumbrance": 1
+      },
+      { "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ], "coverage": 60 }
+    ]
   },
   {
     "id": "kawaii_tights_black",
+    "//": "Loosely based on tights",
+    "repairs_like": "jeans",
     "type": "ARMOR",
-    "category": "clothing",
     "name": "black tights",
     "description": "A pair of warm tights.",
-    "weight": "40 g",
+    "weight": "114 g",
     "volume": "250 ml",
-    "price": 500,
-    "price_postapoc": 250,
+    "price": 2000,
+    "price_postapoc": 100,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "leggings",
     "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r", "leg_l", "leg_r" ],
-    "coverage": 95,
-    "encumbrance": 10,
-    "warmth": 40,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ]
+    "warmth": 10,
+    "material_thickness": 0.1,
+    "flags": [ "VARSIZE", "SKINTIGHT" ],
+    "armor": [ { "coverage": 100, "covers": [ "foot_l", "foot_r", "leg_r", "leg_l" ] } ]
   },
   {
     "id": "kawaii_tights_white",
+    "copy-from": "kawaii_tights_black",
     "type": "ARMOR",
     "category": "clothing",
     "name": "white tights",
-    "description": "A pair of warm tights.",
-    "weight": "40 g",
-    "volume": "250 ml",
-    "price": 500,
-    "price_postapoc": 250,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r", "leg_l", "leg_r" ],
-    "coverage": 95,
-    "encumbrance": 10,
-    "warmth": 40,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ]
+    "description": "A pair of warm tights."
   },
-    {
+  {
     "id": "kawaii_maid_garter",
+    "//": "Based on garter_belt",
     "type": "ARMOR",
-    "category": "clothing",
-    "name": { "str": "garter belt" },
-    "description": "A black garter belt, designed to hold up stockings. It could also be used to conceal a handgun under your skirt, if needed.",
-    "weight": "10 g",
-    "volume": "250 ml",
-    "price": 1500,
+    "name": { "str": "maid garter belt" },
+    "description": "A black garter belt with white trim, designed to hold up stockings.  It could also be used to conceal a handgun, if needed.",
+    "weight": "80 g",
+    "volume": "200 ml",
+    "looks_like": "panties",
+    "price": 500,
     "price_postapoc": 250,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Conceal handgun",
-      "holster_msg": "You hide your %s.",
-      "max_volume": "500 ml",
-      "draw_cost": 80,
-      "skills": [ "pistol" ]
-    },
-    "flags": [ "FANCY" ]
+    "material_thickness": 0.1,
+    "flags": [ "SKINTIGHT", "VARSIZE", "FANCY", "TARDIS" ],
+    "armor": [ { "encumbrance": 1, "coverage": 38, "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ] } ],
+    "pocket_data": [
+      {
+        "magazine_well": "500 ml",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "moves": 80
+      }
+    ],
+    "use_action": { "type": "holster" }
   },
   {
     "id": "kawaii_secretpoach",
-    "//": "Loosely based on deep concealment holster.",
+    "//": "Loosely based on deep concealment holster, aka bholster.",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "garter purse" },
-    "description": "A small storage purse that can be concealed beneath a skirt, held up using a garter band. It also has sleeves for concealing handgun magazines, if needed.",
+    "description": "A small storage purse that can be concealed beneath a skirt, held up using a garter band.  It also has sleeves for concealing handgun magazines, if needed.",
     "weight": "120 g",
     "volume": "250 ml",
-    "price": 2000,
-    "price_postapoc": 1000,
-    "material": [ "cotton" ],
+    "price": 3000,
+    "price_postapoc": 500,
+    "material": [ "lycra" ],
     "symbol": "[",
-    "color": "dark_gray",
-    "storage": "500 ml",
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Conceal magazine",
-      "holster_msg": "You coneal your %s.",
-      "multi": 2,
-      "max_volume": "250 ml",
-      "draw_cost": 40,
-      "flags": [ "MAG_COMPACT" ]
-    }
+    "looks_like": "bholster",
+    "color": "light_gray",
+    "sided": true,
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "165 mm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "250 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "165 mm",
+        "flag_restriction": [ "MAG_COMPACT" ],
+        "moves": 40
+      }
+    ],
+    "flags": [ "SKINTIGHT", "WATER_FRIENDLY" ],
+    "armor": [
+      {
+        "encumbrance": [ 1, 3 ],
+        "coverage": 25,
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
+      }
+    ]
   },
   {
     "type": "ARMOR",
@@ -662,51 +882,164 @@
   },
   {
     "id": "tux",
+    "repairs_like": "trenchcoat",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "tuxedo" },
     "description": "A full-body tuxedo.  Makes the apocalypse feel a little more classy.",
     "weight": "1587 g",
     "volume": "5500 ml",
     "price": 21000,
     "price_postapoc": 750,
-    "material": [ "cotton" ],
+    "to_hit": -5,
     "symbol": "[",
+    "looks_like": "suit",
     "color": "dark_gray",
-    "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
-    "coverage": 95,
-    "encumbrance": 13,
-    "max_encumbrance": 16,
-    "storage": "2500 ml",
+    "armor": [
+      {
+        "covers": [ "torso" ],
+        "specifically_covers": [ "torso_lower" ],
+        "material": [ { "type": "cotton", "covered_by_mat": 100, "thickness": 1.0 } ],
+        "coverage": 100,
+        "encumbrance": [ 13, 16 ]
+      },
+      {
+        "covers": [ "torso" ],
+        "specifically_covers": [ "torso_upper" ],
+        "material": [ { "type": "cotton", "covered_by_mat": 100, "thickness": 1.0 } ],
+        "coverage": 90
+      },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "material": [ { "type": "cotton", "covered_by_mat": 100, "thickness": 1.0 } ],
+        "coverage": 95,
+        "encumbrance": [ 13, 13 ]
+      },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_upper_l", "leg_upper_r", "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r", "leg_hip_l", "leg_hip_r" ],
+        "material": [ { "type": "cotton", "covered_by_mat": 100, "thickness": 0.5 } ],
+        "coverage": 100
+      }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "600 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      }
+    ],
     "warmth": 30,
-    "material_thickness": 4,
-    "environmental_protection": 1,
     "flags": [ "VARSIZE", "POCKETS", "FANCY" ]
   },
   {
     "id": "survivor_tux_leather",
+    "copy-from": "tux",
     "type": "ARMOR",
     "name": { "str": "tailored tuxedo" },
     "description": "A full-body tuxedo, the proper uniform of a butler. It has been reinforced with leather for greater protection.",
     "weight": "3050 g",
     "volume": "11250 ml",
-    "price": 17900,
-    "price_postapoc": 1500,
+    "price": 25000,
+    "price_postapoc": 850,
     "material": [ "leather", "cotton" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
-    "coverage": 100,
-    "encumbrance": 13,
-    "max_encumbrance": 16,
-    "storage": "5500 ml",
-    "warmth": 30,
-    "material_thickness": 5,
+    "armor": [
+      {
+        "covers": [ "torso" ],
+        "specifically_covers": [ "torso_lower" ],
+        "material": [
+          { "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 1.0 }
+        ],
+        "coverage": 100,
+        "encumbrance": [ 13, 16 ]
+      },
+      {
+        "covers": [ "torso" ],
+        "specifically_covers": [ "torso_upper" ],
+        "material": [
+          { "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 1.0 }
+        ],
+        "coverage": 90
+      },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "material": [
+          { "type": "leather", "covered_by_mat": 100, "thickness": 2.0 },
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 1.0 }
+        ],
+        "coverage": 95,
+        "encumbrance": [ 13, 13 ]
+      },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_upper_l", "leg_upper_r", "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r", "leg_hip_l", "leg_hip_r" ],
+        "material": [
+          { "type": "leather", "covered_by_mat": 100, "thickness": 1.5 },
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 0.5 }
+        ],
+        "coverage": 100
+      }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "600 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      }
+    ],
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "FANCY" ]
+    "flags": [ "VARSIZE", "POCKETS", "FANCY", "HOOD", "COLLAR", "WATERPROOF" ]
   },
   {
     "id": "survivor_tux",
+    "copy-from": "tux",
     "type": "ARMOR",
     "name": { "str": "survivor tuxedo" },
     "description": "A full-body tuxedo, the proper uniform of a butler. It has been reinforced with kevlar for greater protection and has dedicated storage for throwing weapons.",
@@ -715,143 +1048,178 @@
     "price": 150000,
     "price_postapoc": 5000,
     "material": [ "kevlar", "cotton" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
-    "coverage": 100,
-    "encumbrance": 13,
-    "max_encumbrance": 16,
-    "storage": "5500 ml",
-    "warmth": 30,
-    "material_thickness": 5,
+    "armor": [
+      {
+        "covers": [ "torso" ],
+        "specifically_covers": [ "torso_lower" ],
+        "material": [
+          { "type": "kevlar", "covered_by_mat": 100, "thickness": 2.0 },
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 1.0 }
+        ],
+        "coverage": 100,
+        "encumbrance": [ 13, 16 ]
+      },
+      {
+        "covers": [ "torso" ],
+        "specifically_covers": [ "torso_upper" ],
+        "material": [
+          { "type": "kevlar", "covered_by_mat": 100, "thickness": 2.0 },
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 1.0 }
+        ],
+        "coverage": 90
+      },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "material": [
+          { "type": "kevlar", "covered_by_mat": 100, "thickness": 2.0 },
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 1.0 }
+        ],
+        "coverage": 95,
+        "encumbrance": [ 13, 13 ]
+      },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_upper_l", "leg_upper_r", "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r", "leg_hip_l", "leg_hip_r" ],
+        "material": [
+          { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.5 },
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 0.5 }
+        ],
+        "coverage": 100
+      }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1000 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "16 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "600 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      },
+      {
+        "magazine_well": "50 ml",
+        "holster": true,
+        "flag_restriction": [ "SHEATH_KNIFE" ],
+        "moves": 30,
+        "max_contains_volume": "100 ml",
+        "max_contains_weight": "500 g",
+        "max_item_length": "10 cm"
+      },
+      {
+        "magazine_well": "50 ml",
+        "holster": true,
+        "flag_restriction": [ "SHEATH_KNIFE" ],
+        "moves": 30,
+        "max_contains_volume": "100 ml",
+        "max_contains_weight": "500 g",
+        "max_item_length": "10 cm"
+      },
+      {
+        "magazine_well": "50 ml",
+        "holster": true,
+        "flag_restriction": [ "SHEATH_KNIFE" ],
+        "moves": 30,
+        "max_contains_volume": "100 ml",
+        "max_contains_weight": "500 g",
+        "max_item_length": "10 cm"
+      },
+      {
+        "magazine_well": "50 ml",
+        "holster": true,
+        "flag_restriction": [ "SHEATH_KNIFE" ],
+        "moves": 30,
+        "max_contains_volume": "100 ml",
+        "max_contains_weight": "500 g",
+        "max_item_length": "10 cm"
+      },
+      {
+        "magazine_well": "50 ml",
+        "holster": true,
+        "flag_restriction": [ "SHEATH_KNIFE" ],
+        "moves": 30,
+        "max_contains_volume": "100 ml",
+        "max_contains_weight": "500 g",
+        "max_item_length": "10 cm"
+      },
+      {
+        "magazine_well": "50 ml",
+        "holster": true,
+        "flag_restriction": [ "SHEATH_KNIFE" ],
+        "moves": 30,
+        "max_contains_volume": "100 ml",
+        "max_contains_weight": "500 g",
+        "max_item_length": "10 cm"
+      }
+    ],
     "environmental_protection": 3,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Sheath throwing knife",
-      "holster_msg": "You sheath your %s",
-      "max_volume": "250 ml",
-      "multi": 12,
-      "flags": [ "SHEATH_DAGGER" ]
-    },
-    "flags": [ "VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ]
-  },
-  {
-    "id": "kawaii_vest",
-    "//": "Loosely based on utility vest.",
-    "type": "ARMOR",
-    "category": "clothing",
-    "name": { "str": "maid utility vest" },
-    "description": "A modified utility vest with many pockets, worn by maids.",
-    "weight": "516 g",
-    "volume": "1 L",
-    "price": 3900,
-    "price_postapoc": 500,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "color": "light_gray",
-    "covers": [ "torso" ],
-    "coverage": 20,
-    "encumbrance": 2,
-    "max_encumbrance": 5,
-    "storage": "3 L",
-    "warmth": 5,
-    "material_thickness": 2,
-    "flags": [ "VARSIZE", "WAIST" ]
-  },
-  {
-    "id": "kawaii_vest_tac",
-    "//": "Loosely based on tac vest.",
-    "type": "ARMOR",
-    "category": "clothing",
-    "looks_like": "kawaii_vest",
-    "name": { "str": "maid tactical vest" },
-    "description": "A modified tac vest meant to carry your gear and ammunition, worn by maids.",
-    "weight": "600 g",
-    "volume": "1250 ml",
-    "price": 7400,
-    "price_postapoc": 2000,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "color": "light_gray",
-    "covers": [ "torso" ],
-    "coverage": 20,
-    "encumbrance": 2,
-    "max_encumbrance": 5,
-    "storage": "3 L",
-    "warmth": 5,
-    "material_thickness": 2,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash magazine",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT", "MAG_BULKY" ]
-    },
-    "flags": [ "VARSIZE", "WAIST" ]
+    "flags": [ "VARSIZE", "POCKETS", "SUPER_FANCY", "HOOD", "COLLAR", "WATERPROOF", "RAINPROOF", "STURDY" ]
   },
   {
     "id": "kawaii_scarf",
+    "//": "Based on wool scarf, aka scarf. Just slightly warmer and more expensive.",
     "type": "TOOL_ARMOR",
     "category": "clothing",
     "symbol": "[",
     "color": "light_gray",
     "name": { "str": "fashionable scarf", "str_pl": "fashionable scarves" },
     "description": "A stylish light cloth scarf, worn over the mouth for warmth.",
-    "price": 3800,
-    "price_postapoc": 50,
+    "price": 7500,
+    "price_postapoc": 150,
     "material": [ "cotton" ],
     "weight": "120 g",
     "volume": "1000 ml",
     "to_hit": -3,
-    "covers": [ "mouth" ],
     "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS", "FANCY" ],
     "warmth": 55,
-    "environmental_protection": 5,
-    "encumbrance": 3,
-    "coverage": 85,
-    "material_thickness": 1,
-    "use_action": {
-      "type": "transform",
-      "msg": "You loosen the scarf.",
-      "target": "kawaii_scarf_loose",
-      "menu_text": "Adjust scarf"
-    }
+    "environmental_protection": 4,
+    "material_thickness": 1.5,
+    "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "kawaii_scarf_loose", "menu_text": "Loosen" },
+    "armor": [ { "encumbrance": 3, "coverage": 85, "covers": [ "mouth" ] } ]
   },
   {
     "id": "kawaii_scarf_loose",
+    "copy-from": "kawaii_scarf",
     "type": "TOOL_ARMOR",
     "category": "clothing",
     "symbol": "[",
     "color": "light_gray",
     "name": { "str": "fashionable scarf (loose)", "str_pl": "fashionable scarves (loose)" },
     "description": "A stylish light cloth scarf, worn over the mouth for warmth.",
-    "price": 3800,
-    "price_postapoc": 50,
-    "material": [ "cotton" ],
-    "weight": "120 g",
-    "volume": "1000 ml",
-    "to_hit": -3,
-    "covers": [ "mouth" ],
-    "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS", "FANCY" ],
     "warmth": 20,
-    "environmental_protection": 5,
-    "encumbrance": 2,
-    "coverage": 45,
-    "material_thickness": 1,
-      "use_action": {
-      "type": "transform",
-      "msg": "You pull the scarf tighter around you.",
-      "target": "kawaii_scarf",
-      "menu_text": "Adjust scarf"
-    }
+    "use_action": { "type": "transform", "msg": "You wrap your %s a bit tighter.", "target": "scarf", "menu_text": "Wrap tighter" },
+    "armor": [ { "encumbrance": 2, "coverage": 45, "covers": [ "mouth" ] } ]
   },
   {
     "id": "kawaii_raincoat",
+    "//": "Based on rain coat, aka coat_rain. But lighter and with no pockets.",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "transparent rain coat" },
     "description": "A transparent raincoat made from very thin vinyl. The material is thin enough that the entire coat can fold away into a pocket when not in use.",
     "weight": "120 g",
@@ -860,53 +1228,46 @@
     "price_postapoc": 50,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
+    "looks_like": "coat_winter",
     "color": "blue",
-    "covers": [ "torso", "arm_l", "arm_r" ,"head" ],
-    "coverage": 95,
-    "encumbrance": 3,
+    "armor": [
+      {
+        "covers": [ "torso" ],
+        "specifically_covers": [ "torso_upper", "torso_lower" ],
+        "coverage": 100,
+        "encumbrance": [ 7, 15 ]
+      },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+    ],
     "warmth": 5,
-    "material_thickness": 2,
+    "material_thickness": 0.2,
     "environmental_protection": 3,
-    "flags": [ "HOOD", "POCKETS", "WATERPROOF", "RAINPROOF", "OUTER", "FANCY" ],
+    "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "RAINPROOF", "HOOD", "OUTER", "SOFT", "FANCY" ],
     "use_action": {
       "type": "transform",
-      "msg": "You pack the hood.",
+      "msg": "You pack the %s hood.",
       "target": "kawaii_raincoat_off",
-      "menu_text": "Toggle hood"
+      "menu_text": "Pack hood"
      }
   },
   {
     "id": "kawaii_raincoat_off",
+    "copy-from": "kawaii_raincoat",
     "type": "ARMOR",
     "category": "clothing",
-    "name": { "str": "transparent rain coat (hood packed)" },
-    "description": "A transparent raincoat made from very thin vinyl. The material is thin enough that the entire coat can fold away into a pocket when not in use.",
-    "weight": "120 g",
-    "volume": "750 ml",
-    "price": 7900,
-    "price_postapoc": 50,
-    "material": [ "plastic", "cotton" ],
-    "symbol": "[",
-    "color": "blue",
-    "covers": [ "torso", "arm_l", "arm_r" ],
-    "coverage": 95,
-    "encumbrance": 3,
-    "warmth": 5,
-    "material_thickness": 2,
-    "environmental_protection": 3,
-    "flags": [ "POCKETS", "WATERPROOF", "RAINPROOF", "OUTER", "FANCY" ],
+    "name": { "str": "transparent rain coat (hood packed)", "str_pl": "transparent rain coats (hood packed)" },
+    "delete": { "flags": [ "HOOD" ] },
     "use_action": {
       "type": "transform",
-      "msg": "You unpack the hood.",
+      "msg": "You unpack the %s hood.",
       "target": "kawaii_raincoat",
-      "menu_text": "Toggle hood"
+      "menu_text": "Unpack hood"
      }
   },
   {
     "id": "kawaii_maid_panties",
     "//": "Based on panties. Fancy, no warmth, and different skin.",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str_sp": "white panties" },
     "description": "Pure white panties, very breathable and comfortable even in summer.",
     "weight": "32 g",
@@ -917,17 +1278,15 @@
     "symbol": "[",
     "looks_like": "briefs",
     "color": "white",
-    "covers": [ "leg_l", "leg_r" ],
-    "coverage": 15,
     "warmth": 0,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ]
+    "material_thickness": 0.1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ],
+    "armor": [ { "coverage": 75, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_hip_l", "leg_hip_r" ] } ]
   },
   {
     "id": "kawaii_maid_bra",
     "//": "Based on bra. Fancy, no warmth, and different skin.",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "white bra" },
     "description": "Pure white bra, very breathable and comfortable even in summer.",
     "weight": "32 g",
@@ -938,135 +1297,130 @@
     "symbol": "[",
     "looks_like": "tank_top",
     "color": "white",
-    "covers": [ "torso" ],
-    "coverage": 15,
-    "warmth": 5,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ]
-  },
-  {
-    "id": "kawaii_bikini_bottom_black",
-    "type": "ARMOR",
-    "category": "clothing",
-    "name": "black bikini bottom",
-    "description": "A simple black bikini bottom.",
-    "weight": "32 g",
-    "volume": "250 ml",
-    "price": 1000,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "color": "light_red",
-    "covers": [ "leg_l", "leg_r" ],
-    "coverage": 15,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY" ]
-  },
-  {
-    "id": "kawaii_bikini_top_black",
-    "type": "ARMOR",
-    "category": "clothing",
-    "name": "black bikini top",
-    "description": "A simple black bikini top.",
-    "weight": "32 g",
-    "volume": "250 ml",
-    "price": 1800,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "color": "light_red",
-    "covers": [ "torso" ],
-    "coverage": 10,
-    "material_thickness": 1,
-    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT" ]
+    "warmth": 0,
+    "material_thickness": 0.1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ],
+    "armor": [ { "coverage": 25, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] } ]
   },
   {
     "id": "kawaii_maid_hardcase",
-    "//": "Loosely based on survivor duffel bag with fixed encumbrance and a dedicated weapon compartment.",
+    "//": "Loosely based on survivor_duffel_bag with fixed encumbrance and a dedicated weapon compartment akin to back holster.",
     "type": "ARMOR",
     "name": { "str": "hardcase" },
     "description": "A huge rectangular hardcase. Normally used for carrying large musical instruments, sniper rifles, or sensitive electrical equipment.",
-    "weight": "800 g",
-    "volume": "7500 ml",
-    "price": 12000,
+    "weight": "1000 g",
+    "volume": "7875 ml",
+    "price": 24000,
+    "price_postapoc": 3250,
     "material": [ "plastic", "steel" ],
     "symbol": "[",
+    "looks_like": "back_holster",
     "color": "dark_gray",
-    "covers": [ "torso" ],
-    "coverage": 30,
-    "encumbrance": 15,
-    "storage": "30 L",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "30 L",
+        "max_contains_weight": "60 kg",
+        "max_item_length": "60 cm",
+        "magazine_well": "7500 ml",
+        "moves": 300
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "min_item_volume": "1500 ml",
+        "max_contains_volume": "9 L",
+        "max_contains_weight": "10 kg",
+        "max_item_length": "133 cm",
+        "moves": 150
+      }
+    ],
+    "use_action": { "type": "holster" },
+    "warmth": 10,
     "material_thickness": 2,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stow large gun",
-      "holster_msg": "You stow your %s",
-      "min_volume": "1250 ml",
-      "max_volume": "9000 ml",
-      "draw_cost": 150,
-      "skills": [ "smg", "shotgun", "rifle", "launcher" ]
-    },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "STURDY", "NO_QUICKDRAW" ]
+    "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "NO_QUICKDRAW" ],
+    "armor": [ { "encumbrance": [ 15, 15 ], "coverage": 80, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ]
   },
   {
     "id": "kawaii_maid_hardcase_mini",
-    "//": "Loosely based on survivor rucksack with fixed encumbrance and a dedicated weapon compartment.",
+    "//": "Loosely based on survivor_rucksack with fixed encumbrance and a dedicated weapon compartment.",
     "type": "ARMOR",
     "name": { "str": "small hardcase" },
     "description": "A smaller version of the standard hardcase.",
-    "weight": "650 g",
-    "volume": "5000 ml",
-    "price": 8000,
+    "weight": "800 g",
+    "volume": "10 L",
+    "price": 24000,
+    "price_postapoc": 3000,
     "material": [ "plastic", "leather" ],
     "symbol": "[",
+    "looks_like": "back_holster",
     "color": "dark_gray",
-    "covers": [ "torso" ],
-    "coverage": 15,
-    "encumbrance": 10,
-    "storage": "20 L",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "20 L",
+        "max_contains_weight": "40 kg",
+        "max_item_length": "55 cm",
+        "magazine_well": "6 L",
+        "moves": 300
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "min_item_volume": "1240 ml",
+        "max_contains_volume": "3750 L",
+        "max_contains_weight": "10 kg",
+        "max_item_length": "133 cm",
+        "moves": 150
+      }
+    ],
+    "use_action": { "type": "holster" },
     "material_thickness": 2,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stow gun",
-      "holster_msg": "You stow your %s",
-      "min_volume": "1250 ml",
-      "max_volume": "3750 ml",
-      "draw_cost": 150,
-      "skills": [ "smg", "shotgun", "rifle" ]
-    },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "STURDY" ]
+    "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ],
+    "armor": [ { "encumbrance": [ 10, 10 ], "coverage": 50, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ]
   },
   {
     "id": "kawaii_maid_hardcase_slim",
-    "//": "Loosely based on survivor backpack with fixed encumbrance and a dedicated weapon compartment.",
+    "//": "Loosely based on survivor_pack with fixed encumbrance and a dedicated weapon compartment.",
     "type": "ARMOR",
     "name": { "str": "compact hardcase" },
     "description": "A compact version of the hardcase.",
-    "weight": "400 g",
-    "volume": "2500 ml",
-    "price": 8000,
+    "weight": "600 g",
+    "volume": "5250 ml",
+    "price": 24000,
+    "price_postapoc": 2250,
     "material": [ "plastic", "leather" ],
     "symbol": "[",
+    "looks_like": "back_holster",
     "color": "dark_gray",
-    "covers": [ "torso" ],
-    "coverage": 10,
-    "encumbrance": 6,
-    "storage": "10 L",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "10 L",
+        "max_contains_weight": "32 kg",
+        "max_item_length": "50 cm",
+        "magazine_well": "5 L",
+        "moves": 300
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "min_item_volume": "1250 ml",
+        "max_contains_volume": "2500 L",
+        "max_contains_weight": "10 kg",
+        "max_item_length": "133 cm",
+        "moves": 150
+      }
+    ],
     "material_thickness": 2,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stow small gun",
-      "holster_msg": "You stow your %s",
-      "min_volume": "1250 ml",
-      "max_volume": "2500 ml",
-      "draw_cost": 150,
-      "skills": [ "smg", "shotgun", "rifle" ]
-    },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "STURDY" ]
+    "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ],
+    "armor": [ { "encumbrance": [ 6, 6 ], "coverage": 30, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ]
   },
   {
     "id": "kawaii_maid_megane_01",
-    "//": "Based on standard glasses. Fancy, close layer, and counters both vision impairments.",
+    "//": "Based on glasses_eye. Fancy, close layer, and counters both vision impairments.",
+    "repairs_like": "survivor_goggles",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "pair of maid glasses", "str_pl": "pairs of maid glasses" },
     "description": "A maid wearing these will never miss the smallest speck of dust, nor signs of their Mistress's health.",
     "weight": "30 g",
@@ -1078,36 +1432,33 @@
     "symbol": "[",
     "looks_like": "sunglasses",
     "color": "cyan",
-    "covers": [ "EYES" ],
-    "coverage": 75,
     "material_thickness": 1,
     "environmental_protection": 1,
-    "flags": [ "WATER_FRIENDLY", "FANCY", "FIX_NEARSIGHT", "FIX_FARSIGHT", "FRAGILE", "SKINTIGHT" ]
+    "flags": [ "WATER_FRIENDLY", "FANCY", "FIX_NEARSIGHT", "FIX_FARSIGHT", "FRAGILE", "SKINTIGHT" ],
+    "armor": [ { "coverage": 75, "covers": [ "eyes" ], "rigid_layer_only": true } ]
   },
   {
     "id": "kawaii_hitec_megane",
+    "copy-from": "kawaii_maid_megane_01",
     "//": "Has ballistic glasses protection, survivor goggles perks, is fancy, counters both vision impairments, close layer, with only 75% coverage. These are glasses, not goggles.",
     "type": "ARMOR",
     "name": { "str": "pair of survivor maid glasses", "str_pl": "pairs of survivor maid glasses" },
     "description": "A maid wearing these will never miss the smallest speck of dust, nor signs of their Mistress's health. These have been reinforced with bullet resistant glass for greater protection, the ability to withstand chemical corrosion, and protection against bright flashes.",
     "weight": "90 g",
-    "volume": "250 ml",
-    "price": 250000,
-    "material": [ "kevlar", "plastic" ],
-    "symbol": "[",
-    "color": "cyan",
-    "covers": [ "eyes" ],
-    "coverage": 75,
+    "price": 8500,
+    "price_postapoc": 650,
+    "material": [ "plastic", "nylon" ],
     "material_thickness": 3,
     "environmental_protection": 4,
-    "qualities": [ [ "GLARE", 2 ] ],
-    "flags": [ "WATER_FRIENDLY", "FANCY", "FIX_NEARSIGHT", "FIX_FARSIGHT", "SUN_GLASSES", "FLASH_PROTECTION", "SKINTIGHT" ]
+    "qualities": [ [ "GLARE", 1 ] ],
+    "flags": [ "WATER_FRIENDLY", "FANCY", "FIX_NEARSIGHT", "FIX_FARSIGHT", "STURDY", "SKINTIGHT", "SUN_GLASSES", "FLASH_PROTECTION" ],
+    "armor": [ { "coverage": 75, "covers": [ "eyes" ], "rigid_layer_only": true } ]
   },
   {
     "id": "kawaii_wedding_dress",
-    "//": "Based on the standard wedding dress. Covers arms, encumbrance/warmth/volume/weight slightly higher than a regular dress as less tight-fitting, and has a different skin.",
+    "//": "Based on dress_wedding. Covers arms, encumbrance/warmth/volume/weight slightly higher than a regular dress as less tight-fitting, and has a different skin.",
+    "repairs_like": "haori",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "wedding dress", "str_pl": "wedding dresses" },
     "description": "A pure white wedding dress.",
     "weight": "850 g",
@@ -1119,19 +1470,20 @@
     "symbol": "[",
     "looks_like": "dress_wedding",
     "color": "white",
-    "covers": [ "arm_l", "arm_r", "leg_l", "leg_r", "torso" ],
-    "coverage": 90,
-    "encumbrance": 10,
     "warmth": 10,
-    "material_thickness": 2,
-    "flags": [ "VARSIZE", "SUPER_FANCY" ]
+    "material_thickness": 0.2,
+    "flags": [ "VARSIZE", "SUPER_FANCY" ],
+    "armor": [
+      { "coverage": 90, "covers": [ "torso" ], "encumbrance": 10 },
+      { "covers": [ "leg_l", "leg_r" ], "coverage": 50, "encumbrance": 10 },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 50, "encumbrance": 10 }
+    ]
   },
   {
     "id": "kawaii_wedding_veil_a",
-    "//": "Copy of the standard weding veil. Has a different skin, covers head only, close layer, not oversize.",
+    "//": "Copy of veil_wedding. Has a different skin, covers head only, close layer, not oversize.",
     "repairs_like": "veil_wedding",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "wedding veil" },
     "description": "A lacy white wedding veil.",
     "weight": "78 g",
@@ -1141,45 +1493,27 @@
     "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
-    "looks_like": "veil_wedding",
+    "looks_like": "scarf",
     "color": "white",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 5,
-    "material_thickness": 1,
+    "material_thickness": 0.01,
     "environmental_protection": 1,
-    "flags": [ "SUPER_FANCY", "SKINTIGHT" ]
+    "flags": [ "SUPER_FANCY", "SKINTIGHT" ],
+    "armor": [ { "encumbrance": 5, "coverage": 100, "covers": [ "head" ] } ]
   },
   {
     "id": "kawaii_wedding_veil_b",
+    "copy-from": "kawaii_wedding_veil_a",
     "//": "Copy of the standard weding veil. Has a different skin, covers head only, close layer, not oversize.",
-    "repairs_like": "veil_wedding",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "wedding veil" },
-    "description": "A lacy white wedding veil with additional adornments.",
-    "weight": "78 g",
-    "volume": "750 ml",
-    "price": 8000,
-    "price_postapoc": 10,
-    "to_hit": -1,
-    "material": [ "cotton" ],
-    "symbol": "[",
-    "looks_like": "veil_wedding",
-    "color": "white",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 5,
-    "material_thickness": 1,
-    "environmental_protection": 1,
-    "flags": [ "SUPER_FANCY", "SKINTIGHT" ]
+    "description": "A lacy white wedding veil with additional adornments."
   },
   {
     "id": "kawaii_wedding_gloves",
-    "//": "Copy of extra long white gloves. Fancy.",
+    "//": "Copy of long_glove_white. Fancy.",
     "repairs_like": "long_glove_white",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "pair of wedding gloves", "str_pl": "pairs of wedding gloves" },
     "description": "A pair of pure white gloves to match a wedding dress.",
     "weight": "400 g",
@@ -1191,18 +1525,25 @@
     "symbol": "[",
     "looks_like": "long_glove_white",
     "color": "white",
-    "covers": [ "hand_l", "hand_r", "arm_l", "arm_r" ],
-    "coverage": 60,
-    "warmth": 30,
-    "material_thickness": 2,
-    "flags": [ "VARSIZE", "FANCY" ]
+    "armor": [
+      { "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 2 },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "specifically_covers": [ "arm_elbow_l", "arm_elbow_r", "arm_lower_l", "arm_lower_r" ],
+        "coverage": 100,
+        "encumbrance": 2
+      },
+      { "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_upper_l", "arm_upper_r" ], "coverage": 50 }
+    ],
+    "warmth": 10,
+    "material_thickness": 0.2,
+    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ]
   },
   {
     "id": "kawaii_wedding_shoes",
-    "//": "Copy of dress shoes, but with the white high maid shoes skin.",
+    "//": "Copy of dress_shoes, but with the white high maid shoes skin.",
     "repairs_like": "dress_shoes",
     "type": "ARMOR",
-    "category": "clothing",
     "name": { "str": "pair of wedding shoes", "str_pl": "pairs of wedding shoes" },
     "description": "A pair of beautiful white heels to match a wedding dress.",
     "weight": "870 g",
@@ -1213,13 +1554,34 @@
     "bashing": 1,
     "material": [ "leather" ],
     "symbol": "[",
-    "looks_like": "dress_shoes",
-    "color": "white",
-    "covers": [ "foot_l", "foot_r" ],
-    "coverage": 60,
-    "encumbrance": 15,
+    "looks_like": "sneakers",
+    "color": "dark_gray",
     "warmth": 10,
-    "material_thickness": 2,
-    "flags": [ "VARSIZE", "FANCY" ]
+    "material_thickness": 2.0,
+    "flags": [ "VARSIZE", "FANCY" ],
+    "armor": [
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_heel_r", "foot_heel_l", "foot_arch_r", "foot_arch_l", "foot_toes_r", "foot_toes_l" ],
+        "material": [ { "type": "leather", "covered_by_mat": 100, "thickness": 2 } ],
+        "encumbrance": 15,
+        "coverage": 100
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_ankle_r", "foot_ankle_l" ],
+        "material": [ { "type": "leather", "covered_by_mat": 100, "thickness": 2.0 } ],
+        "coverage": 40
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_sole_r", "foot_sole_l" ],
+        "material": [
+          { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 },
+          { "type": "rubber", "covered_by_mat": 100, "thickness": 4.0 }
+        ],
+        "coverage": 100
+      }
+    ]
   }
 ]