Upgrade clothing to use armor_portion_data for coverage.

Convert some tiered items to copy-from the base form, and convert others back to standalone.
-armor_portion_data currently doesn't support copy-from :/
Convert garter belt, garter pouch, and petticoat back to actual armor pieces.
-And make them COMPACT to ensure they don't cause layer penalties.
Fix a few items not using str for names.
Fix a few items still using pairs of individual body parts like leg_l and leg_r instead of legs.
-That bug seems to have been fixed.
Remove POWERARMOR_COMPATIBLE from maid headbands.
Fix leather headband missing encumbrance.
Reduce coverage on maid shoes and boots.
Change sheer stockings material to nylon.

1 files changed, 194 insertions, 114 deletions

diff --git a/armor.json b/armor.json
index d4dce12..70ecb31 100644
--- a/armor.json
+++ b/armor.json
@@ -12,10 +12,11 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "black",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 95,
-    "encumbrance": 7,
-    "max_encumbrance": 10,
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 7, 10 ] },
+      { "covers": [ "arms" ], "coverage": 95, "encumbrance": [ 7, 8 ] },
+      { "covers": [ "legs" ], "coverage": 95, "encumbrance": [ 7, 7 ] }
+    ],
     "storage": "2500 ml",
     "warmth": 20,
     "material_thickness": 2,
@@ -24,7 +25,6 @@
   },
   {
     "id": "kawaii_maid_dress_long_leather",
-    "copy-from": "maid_dress",
     "type": "ARMOR",
     "looks_like": "maid_dress",
     "name": { "str": "tailored victorian maid dress", "str_pl": "tailored victorian maid dresses" },
@@ -34,18 +34,21 @@
     "price": "179 USD",
     "price_postapoc": "15 USD",
     "material": [ "leather", "cotton" ],
-    "coverage": 100,
-    "encumbrance": 12,
-    "max_encumbrance": 16,
+    "symbol": "[",
+    "color": "black",
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 12, 16 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 12, 14 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 12, 12 ] }
+    ],
     "storage": "6 L",
     "warmth": 45,
     "material_thickness": 5,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "FANCY" ]
+    "flags": [ "VARSIZE", "FANCY", "HOOD", "COLLAR", "POCKETS", "WATERPROOF" ]
   },
   {
     "id": "kawaii_maid_dress_long_armor",
-    "copy-from": "maid_dress",
     "//": "Loosely based on medium survivor suit.",
     "type": "ARMOR",
     "looks_like": "maid_dress",
@@ -56,9 +59,13 @@
     "price": "1500 USD",
     "price_postapoc": "50 USD",
     "material": [ "kevlar", "cotton" ],
-    "coverage": 100,
-    "encumbrance": 15,
-    "max_encumbrance": 20,
+    "symbol": "[",
+    "color": "black",
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 15, 20 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 15, 18 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 15, 15 ] }
+    ],
     "storage": "9 L",
     "warmth": 45,
     "material_thickness": 8,
@@ -70,7 +77,7 @@
       "max_volume": "2 L",
       "flags": [ "SHEATH_SWORD" ]
     },
-    "flags": [ "VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ]
+    "flags": [ "VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "SUPER_FANCY", "STURDY" ]
   },
   {
     "id": "maid_dress_french",
@@ -88,10 +95,11 @@
     "symbol": "[",
     "looks_like": "dress",
     "color": "blue",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 75,
-    "encumbrance": 5,
-    "max_encumbrance": 7,
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 75, "encumbrance": [ 5, 7 ] },
+      { "covers": [ "arms" ], "coverage": 25, "encumbrance": [ 5, 6 ] },
+      { "covers": [ "legs" ], "coverage": 25, "encumbrance": [ 5, 5 ] }
+    ],
     "storage": "500 ml",
     "warmth": 5,
     "material_thickness": 1,
@@ -109,10 +117,11 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 75,
-    "encumbrance": 5,
-    "max_encumbrance": 7,
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 85, "encumbrance": [ 5, 7 ] },
+      { "covers": [ "arms" ], "coverage": 50, "encumbrance": [ 5, 6 ] },
+      { "covers": [ "legs" ], "coverage": 50, "encumbrance": [ 5, 5 ] }
+    ],
     "storage": "1500 ml",
     "warmth": 15,
     "material_thickness": 1,
@@ -120,7 +129,6 @@
   },
   {
     "id": "kawaii_maid_dress_ex",
-    "copy-from": "kawaii_maid_dress",
     "type": "ARMOR",
     "name": { "str": "tailored maid dress", "str_pl": "tailored maid dresses" },
     "description": "A black dress with white apron and lace trim, worn by maids. It has been reinforced with leather for better protection.",
@@ -129,17 +137,20 @@
     "price": "179 USD",
     "price_postapoc": "15 USD",
     "material": [ "leather", "cotton" ],
-    "coverage": 100,
-    "encumbrance": 7,
-    "max_encumbrance": 10,
+    "symbol": "[",
+    "color": "dark_gray",
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 85, "encumbrance": [ 7, 10 ] },
+      { "covers": [ "arms" ], "coverage": 50, "encumbrance": [ 7, 8 ] },
+      { "covers": [ "legs" ], "coverage": 50, "encumbrance": [ 7, 5 ] }
+    ],
     "storage": " 5 L",
     "material_thickness": 3,
     "environmental_protection": 1,
-    "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "FANCY" ]
+    "flags": [ "VARSIZE", "FANCY", "POCKETS", "WATERPROOF" ]
   },
   {
     "id": "kawaii_maid_dress_lss",
-    "copy-from": "kawaii_maid_dress",
     "//": "Loosely based on light survivor suit.",
     "type": "ARMOR",
     "name": { "str": "survivor maid dress", "str_pl": "survivor maid dresses" },
@@ -149,9 +160,13 @@
     "price": "1100 USD",
     "price_postapoc": "50 USD",
     "material": [ "kevlar", "cotton" ],
-    "coverage": 100,
-    "encumbrance": 12,
-    "max_encumbrance": 15,
+    "symbol": "[",
+    "color": "dark_gray",
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 85, "encumbrance": [ 12, 15 ] },
+      { "covers": [ "arms" ], "coverage": 50, "encumbrance": [ 12, 14 ] },
+      { "covers": [ "legs" ], "coverage": 50, "encumbrance": [ 12, 12 ] }
+    ],
     "storage": "7500 ml",
     "material_thickness": 5,
     "environmental_protection": 2,
@@ -162,7 +177,7 @@
       "max_volume": "2 L",
       "flags": [ "SHEATH_SWORD" ]
     },
-    "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ]
+    "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "RAINPROOF", "SUPER_FANCY", "STURDY" ]
   },
   {
     "id": "jokyu_fuku",
@@ -177,10 +192,11 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "brown",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 95,
-    "encumbrance": 5,
-    "max_encumbrance": 7,
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 5, 7 ] },
+      { "covers": [ "arms" ], "coverage": 95, "encumbrance": [ 5, 6 ] },
+      { "covers": [ "legs" ], "coverage": 95, "encumbrance": [ 5, 5 ] }
+    ],
     "storage": "500 ml",
     "warmth": 20,
     "material_thickness": 4,
@@ -225,7 +241,7 @@
     "encumbrance": 3,
     "warmth": 15,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "FANCY", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
+    "flags": [ "VARSIZE", "FANCY", "SKINTIGHT" ]
   },
   {
     "id": "kawaii_maid_hat_thermal_off",
@@ -237,8 +253,9 @@
     "price": "25 USD",
     "price_postapoc": "1 USD",
     "material": [ "leather", "cotton" ],
+    "encumbrance": 5,
     "material_thickness": 3,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
+    "extend": { "flags": [ "WATERPROOF" ] }
   },
   {
     "id": "kawaii_maid_hat_lss",
@@ -253,7 +270,7 @@
     "encumbrance": 10,
     "material_thickness": 9,
     "environmental_protection": 3,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "RAINPROOF", "SKINTIGHT", "STURDY", "POWERARMOR_COMPATIBLE" ]
+    "extend": { "flags": [ "WATERPROOF", "RAINPROOF", "STURDY" ] }
   },
   {
     "id": "maid_hat",
@@ -261,7 +278,7 @@
     "repairs_like": "balclava",
     "type": "ARMOR",
     "category": "clothing",
-    "name": { "str": "french maid headband"},
+    "name": { "str": "french maid headband" },
     "description": "A frilly white headpiece.",
     "weight": "10 g",
     "volume": "250 ml",
@@ -293,7 +310,7 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "light_gray",
-    "covers": [ "hand_l", "hand_r" ],
+    "covers": [ "hands" ],
     "coverage": 95,
     "encumbrance": 4,
     "warmth": 15,
@@ -317,7 +334,7 @@
     "encumbrance": 6,
     "material_thickness": 3,
     "environmental_protection": 1,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF" ]
+    "extend": {  "flags": [ "WATERPROOF" ] }
   },
   {
     "id": "maid_gloves_armor",
@@ -336,7 +353,7 @@
     "encumbrance": 8,
     "material_thickness": 5,
     "environmental_protection": 3,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY"  ]
+    "extend": {  "flags": [ "WATERPROOF", "STURDY" ] }
   },
   {
     "id": "maid_gloves_long_cotton",
@@ -353,27 +370,32 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "white",
-    "covers": [ "hand_l", "hand_r", "arm_l", "arm_r" ],
-    "coverage": 95,
-    "encumbrance": 8,
+    "armor_portion_data": [
+      { "covers": [ "arms" ], "coverage": 75, "encumbrance": 8 },
+      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 8 }
+    ],
     "warmth": 50,
     "material_thickness": 2,
     "flags": [ "VARSIZE", "FANCY" ]
   },
   {
     "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": "700 g",
+    "volume": "1 L",
     "price": "25 USD",
     "price_postapoc": "2 USD",
     "to_hit": 1,
     "material": [ "leather", "cotton" ],
-    "coverage": 100,
-    "encumbrance": 10,
+    "symbol": "[",
+    "color": "white",
+    "armor_portion_data": [
+      { "covers": [ "arms" ], "coverage": 75, "encumbrance": 10 },
+      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 10 }
+    ],
     "warmth": 50,
     "material_thickness": 4,
     "environmental_protection": 2,
@@ -381,22 +403,26 @@
   },
   {
     "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": "1000 g",
+    "volume": "1 L",
     "price": "45 USD",
     "price_postapoc": "4 USD",
     "to_hit": 2,
     "material": [ "kevlar", "cotton" ],
-    "coverage": 100,
-    "encumbrance": 12,
+    "symbol": "[",
+    "color": "white",
+    "armor_portion_data": [
+      { "covers": [ "arms" ], "coverage": 75, "encumbrance": 12 },
+      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 12 }
+    ],
     "warmth": 40,
     "material_thickness": 6,
     "environmental_protection": 4,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY"  ]
+    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY" ]
   },
   {
     "id": "kawaii_dress_shoes",
@@ -412,8 +438,8 @@
     "material": [ "leather" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r" ],
-    "coverage": 100,
+    "covers": [ "feet" ],
+    "coverage": 60,
     "encumbrance": 15,
     "warmth": 5,
     "material_thickness": 2,
@@ -431,10 +457,11 @@
     "price": "240 USD",
     "price_postapoc": "60 USD",
     "material": [ "kevlar", "leather" ],
+    "coverage": 75,
     "warmth": 15,
     "material_thickness": 5,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY" ]
+    "extend": { "flags": [ "WATERPROOF", "STURDY" ] }
   },
   {
     "id": "kawaii_boots",
@@ -451,8 +478,8 @@
     "material": [ "leather" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r" ],
-    "coverage": 100,
+    "covers": [ "feet" ],
+    "coverage": 90,
     "warmth": 20,
     "encumbrance": 12,
     "material_thickness": 3,
@@ -475,7 +502,7 @@
     "encumbrance": 16,
     "material_thickness": 7,
     "environmental_protection": 4,
-    "flags": [ "VARSIZE", "FANCY", "WATERPROOF", "STURDY" ]
+    "extend": { "flags": [ "STURDY" ] }
   },
   {
     "id": "kawaii_maid_niso_thick",
@@ -490,29 +517,40 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r", "leg_l", "leg_r" ],
-    "coverage": 75,
-    "encumbrance": 5,
+    "armor_portion_data": [
+      { "covers": [ "legs" ], "coverage": 75, "encumbrance": 5 },
+      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 5 }
+    ],
     "warmth": 15,
     "material_thickness": 1,
     "flags": [ "VARSIZE", "SKINTIGHT", "FANCY", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "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",
-    "encumbrance": 0,
-    "warmth": 0
+    "volume": "250 ml",
+    "price": "5 USD",
+    "price_postapoc": "250 cent",
+    "material": [ "nylon" ],
+    "symbol": "[",
+    "color": "dark_gray",
+    "armor_portion_data": [
+      { "covers": [ "legs" ], "coverage": 75, "encumbrance": 0 },
+      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 0 }
+    ],
+    "warmth": 0,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "kawaii_tights_black",
     "type": "ARMOR",
     "category": "clothing",
-    "name": "black tights",
+    "name": { "str": "pair of black tights", "str_pl": "pairs of black tights" },
     "description": "A pair of warm tights.",
     "weight": "114 g",
     "volume": "250 ml",
@@ -521,20 +559,34 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r", "leg_l", "leg_r" ],
-    "coverage": 95,
-    "encumbrance": 10,
+    "armor_portion_data": [
+      { "covers": [ "legs" ], "coverage": 95, "encumbrance": 10 },
+      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 10 }
+    ],
     "warmth": 40,
     "material_thickness": 1,
     "flags": [ "VARSIZE", "SKINTIGHT", "FANCY", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "kawaii_tights_white",
-    "copy-from": "kawaii_tights_black",
     "type": "ARMOR",
     "category": "clothing",
-    "name": "white tights",
-    "description": "A pair of warm tights."
+    "name": { "str": "pair of whitw tights", "str_pl": "pairs of white tights" },
+    "description": "A pair of warm tights.",
+    "weight": "114 g",
+    "volume": "250 ml",
+    "price": "20 USD",
+    "price_postapoc": "1 USD",
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "color": "dark_gray",
+    "armor_portion_data": [
+      { "covers": [ "legs" ], "coverage": 95, "encumbrance": 10 },
+      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 10 }
+    ],
+    "warmth": 40,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "FANCY", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "kawaii_maid_garter",
@@ -546,9 +598,14 @@
     "volume": "200 ml",
     "price": "5 USD",
     "price_postapoc": "250 cent",
-    "material": [ "cotton" ],
+    "material": [ "nylon" ],
     "symbol": "[",
     "color": "dark_gray",
+    "covers": [ "legs" ],
+    "coverage": 2,
+    "encumbrance": 0,
+    "max_encumbrance": 1,
+    "material_thickness": 0,
     "use_action": {
       "type": "holster",
       "holster_prompt": "Conceal handgun",
@@ -557,7 +614,7 @@
       "draw_cost": 150,
       "skills": [ "pistol" ]
     },
-    "flags": [ "FANCY" ]
+    "flags": [ "SKINTIGHT", "COMPACT", "FANCY", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "kawaii_secretpoach",
@@ -570,9 +627,14 @@
     "volume": "250 ml",
     "price": "30 USD",
     "price_postapoc": "5 USD",
-    "material": [ "nylon" ],
+    "material": [ "cotton" ],
     "symbol": "[",
     "color": "light_gray",
+    "covers": [ "leg_either" ],
+    "coverage": 2,
+    "encumbrance": 0,
+    "max_encumbrance": 1,
+    "material_thickness": 1,
     "storage": "500 ml",
     "use_action": {
       "type": "holster",
@@ -582,7 +644,8 @@
       "max_volume": "250 ml",
       "draw_cost": 150,
       "flags": [ "MAG_COMPACT" ]
-    }
+    },
+    "flags": [ "SKINTIGHT", "COMPACT" ]
   },
   {
     "type": "ARMOR",
@@ -592,11 +655,16 @@
     "description": "A type of frilly undergarment worn under skirts to give them more volume. It could also be used to conceal a knife under your skirt, if needed.",
     "weight": "90 g",
     "volume": "250 ml",
-    "color": "white",
-    "symbol": "[",
     "price": "5 USD",
     "price_postapoc": "10 cent",
     "material": [ "cotton" ],
+    "symbol": "[",
+    "color": "white",
+    "covers": [ "legs" ],
+    "coverage": 5,
+    "encumbrance": 0,
+    "max_encumbrance": 1,
+    "material_thickness": 1,
     "use_action": {
       "type": "holster",
       "holster_prompt": "Conceal knife",
@@ -605,8 +673,7 @@
       "draw_cost": 150,
       "flags": [ "SHEATH_KNIFE" ]
     },
-    "flags": [ "SUPER_FANCY" ],
-    "material_thickness": 1
+    "flags": [ "SKINTIGHT", "COMPACT", "SUPER_FANCY" ]
   },
   {
     "id": "tux",
@@ -621,9 +688,11 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
-    "coverage": 95,
-    "encumbrance": 13,
-    "max_encumbrance": 16,
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 13, 16 ] },
+      { "covers": [ "arms" ], "coverage": 95, "encumbrance": [ 13, 15 ] },
+      { "covers": [ "legs" ], "coverage": 95, "encumbrance": [ 13, 13 ] }
+    ],
     "storage": "2500 ml",
     "warmth": 30,
     "material_thickness": 4,
@@ -632,7 +701,6 @@
   },
   {
     "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.",
@@ -641,15 +709,21 @@
     "price": "250 USD",
     "price_postapoc": "850 cent",
     "material": [ "leather", "cotton" ],
-    "coverage": 100,
+    "symbol": "[",
+    "color": "dark_gray",
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 13, 16 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 13, 15 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 13, 13 ] }
+    ],
     "storage": "5500 ml",
+    "warmth": 30,
     "material_thickness": 5,
     "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.",
@@ -658,8 +732,15 @@
     "price": "1500 USD",
     "price_postapoc": "50 USD",
     "material": [ "kevlar", "cotton" ],
-    "coverage": 100,
+    "symbol": "[",
+    "color": "dark_gray",
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 13, 16 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 13, 15 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 13, 13 ] }
+    ],
     "storage": "5500 ml",
+    "warmth": 30,
     "material_thickness": 5,
     "environmental_protection": 3,
     "use_action": {
@@ -670,7 +751,7 @@
       "multi": 12,
       "flags": [ "SHEATH_KNIFE" ]
     },
-    "flags": [ "VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ]
+    "flags": [ "VARSIZE", "POCKETS", "FANCY", "HOOD", "COLLAR", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ]
   },
   {
     "id": "kawaii_vest",
@@ -788,7 +869,7 @@
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
     "color": "blue",
-    "covers": [ "torso", "arm_l", "arm_r" ,"head" ],
+    "covers": [ "torso", "arms" ,"head" ],
     "coverage": 95,
     "encumbrance": 3,
     "warmth": 5,
@@ -809,7 +890,7 @@
     "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.",
-    "covers": [ "torso", "arm_l", "arm_r" ],
+    "covers": [ "torso", "arms" ],
     "use_action": {
       "type": "transform",
       "msg": "You unpack the %s hood.",
@@ -832,7 +913,7 @@
     "symbol": "[",
     "looks_like": "briefs",
     "color": "white",
-    "covers": [ "leg_l", "leg_r" ],
+    "covers": [ "legs" ],
     "coverage": 15,
     "warmth": 0,
     "material_thickness": 1,
@@ -863,7 +944,7 @@
     "id": "kawaii_bikini_bottom_black",
     "type": "ARMOR",
     "category": "clothing",
-    "name": "black bikini bottom",
+    "name": { "str": "black bikini bottom" },
     "description": "A simple black bikini bottom.",
     "weight": "32 g",
     "volume": "250 ml",
@@ -872,7 +953,7 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "light_red",
-    "covers": [ "leg_l", "leg_r" ],
+    "covers": [ "legs" ],
     "coverage": 15,
     "material_thickness": 1,
     "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY", "POWERARMOR_COMPATIBLE" ]
@@ -881,7 +962,7 @@
     "id": "kawaii_bikini_top_black",
     "type": "ARMOR",
     "category": "clothing",
-    "name": "black bikini top",
+    "name": { "str": "black bikini top" },
     "description": "A simple black bikini top.",
     "weight": "32 g",
     "volume": "250 ml",
@@ -926,22 +1007,19 @@
   },
   {
     "id": "kawaii_maid_hardcase_mini",
+    "copy-from": "kawaii_maid_hardcase",
     "//": "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": "800 g",
     "volume": "6572 ml",
-    "price": "240 USD",
+    "price": "220 USD",
     "price_postapoc": "30 USD",
     "material": [ "plastic", "leather" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "torso" ],
     "coverage": 15,
     "encumbrance": 10,
     "storage": "20 L",
-    "material_thickness": 2,
     "use_action": {
       "type": "holster",
       "holster_prompt": "Stow gun",
@@ -951,26 +1029,23 @@
       "draw_cost": 150,
       "skills": [ "smg", "shotgun", "rifle" ]
     },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "STURDY" ]
+    "delete": { "flags": [ "NO_QUICKDRAW" ] }
   },
   {
     "id": "kawaii_maid_hardcase_slim",
+    "copy-from": "kawaii_maid_hardcase",
     "//": "Loosely based on survivor backpack with fixed encumbrance and a dedicated weapon compartment.",
     "type": "ARMOR",
     "name": { "str": "compact hardcase" },
     "description": "A compact version of the hardcase.",
     "weight": "600 g",
     "volume": "5250 ml",
-    "price": "240 USD",
+    "price": "200 USD",
     "price_postapoc": "2250 cent",
     "material": [ "plastic", "leather" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "torso" ],
     "coverage": 10,
     "encumbrance": 6,
     "storage": "10 L",
-    "material_thickness": 2,
     "use_action": {
       "type": "holster",
       "holster_prompt": "Stow small gun",
@@ -980,7 +1055,7 @@
       "draw_cost": 150,
       "skills": [ "smg", "shotgun", "rifle" ]
     },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "STURDY" ]
+    "delete": { "flags": [ "NO_QUICKDRAW" ] }
   },
   {
     "id": "kawaii_maid_megane_01",
@@ -1018,7 +1093,8 @@
     "material_thickness": 3,
     "environmental_protection": 4,
     "qualities": [ [ "GLARE", 2 ] ],
-    "flags": [ "WATER_FRIENDLY", "FANCY", "FIX_NEARSIGHT", "FIX_FARSIGHT", "SUN_GLASSES", "FLASH_PROTECTION", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
+    "extend": { "flags": [ "SUN_GLASSES", "FLASH_PROTECTION" ] },
+    "delete": { "flags": [ "FRAGILE" ] }
   },
   {
     "id": "kawaii_wedding_dress",
@@ -1036,9 +1112,11 @@
     "symbol": "[",
     "looks_like": "dress_wedding",
     "color": "white",
-    "covers": [ "arm_l", "arm_r", "leg_l", "leg_r", "torso" ],
-    "coverage": 90,
-    "encumbrance": 10,
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 90, "encumbrance": 10 },
+      { "covers": [ "arms" ], "coverage": 50, "encumbrance": 10 },
+      { "covers": [ "legs" ], "coverage": 50, "encumbrance": 10 }
+    ],
     "warmth": 10,
     "material_thickness": 2,
     "flags": [ "VARSIZE", "SUPER_FANCY" ]
@@ -1094,8 +1172,10 @@
     "symbol": "[",
     "looks_like": "long_glove_white",
     "color": "white",
-    "covers": [ "hand_l", "hand_r", "arm_l", "arm_r" ],
-    "coverage": 60,
+    "armor_portion_data": [
+      { "covers": [ "arms" ], "coverage": 60, "encumbrance": 5 },
+      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 5 }
+    ],
     "warmth": 30,
     "material_thickness": 2,
     "flags": [ "VARSIZE", "FANCY" ]
@@ -1118,7 +1198,7 @@
     "symbol": "[",
     "looks_like": "dress_shoes",
     "color": "white",
-    "covers": [ "foot_l", "foot_r" ],
+    "covers": [ "feet" ],
     "coverage": 60,
     "encumbrance": 15,
     "warmth": 10,