Rebase several items off the items they are loose copies of

1 files changed, 89 insertions, 46 deletions

diff --git a/armor.json b/armor.json
index 8e79b03..8655951 100644
--- a/armor.json
+++ b/armor.json
@@ -74,6 +74,8 @@
   },
   {
     "id": "maid_dress_french",
+    "note": "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" },
@@ -81,10 +83,12 @@
     "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" ],
+    "covers": [ "TORSO", "ARMS", "LEGS" ],
     "coverage": 75,
     "encumbrance": 7,
     "storage": "500 ml",
@@ -259,16 +263,20 @@
   },
   {
     "id": "maid_hat",
+    "note": "Copy of the vanilla maid headband, but renamed, super fancy, and with warmth to match the dress.",
+    "repairs_like": "balclava",
     "type": "ARMOR",
     "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" ],
+    "covers": [ "HEAD" ],
     "coverage": 25,
     "encumbrance": 10,
     "warmth": 5,
@@ -849,16 +857,19 @@
   },
   {
     "id": "kawaii_maid_panties",
+    "note": "Based on panties. Fancy, no warmth, and different skin.",
     "type": "ARMOR",
-    "name": { "str": "white panties" },
+    "name": { "str_sp": "white panties" },
     "description": "Pure white panties, very breathable and comfortable even in summer.",
     "weight": "32 g",
     "volume": "250 ml",
     "price": 1000,
+    "price_postapoc": 50,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "briefs",
     "color": "white",
-    "covers": [ "leg_l", "leg_r" ],
+    "covers": [ "LEGS" ],
     "coverage": 15,
     "warmth": 0,
     "material_thickness": 1,
@@ -866,18 +877,21 @@
   },
   {
     "id": "kawaii_maid_bra",
+    "note": "Based on bra. Fancy, no warmth, and different skin.",
     "type": "ARMOR",
     "name": { "str": "white bra" },
     "description": "Pure white bra, very breathable and comfortable even in summer.",
     "weight": "32 g",
     "volume": "250 ml",
     "price": 1000,
+    "price_postapoc": 50,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "tank_top",
     "color": "white",
-    "covers": [ "torso" ],
+    "covers": [ "TORSO" ],
     "coverage": 15,
-    "warmth": 0,
+    "warmth": 5,
     "material_thickness": 1,
     "flags": [ "VARSIZE", "SKINTIGHT", "FANCY" ]
   },
@@ -915,6 +929,7 @@
   },
   {
     "id": "kawaii_maid_hardcase",
+    "note": "Loosely based on survivor duffel bag with fixed encumbrance and a dedicated weapon compartment.",
     "type": "ARMOR",
     "name": { "str": "hardcase" },
     "description": "A huge rectangular hardcase. Normally used for carrying large musical instruments, sniper rifles, or sensitive electrical equipment.",
@@ -940,6 +955,7 @@
   },
   {
     "id": "kawaii_maid_hardcase_mini",
+    "note": "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.",
@@ -964,6 +980,7 @@
   },
   {
     "id": "kawaii_maid_hardcase_slim",
+    "note": "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.",
@@ -988,23 +1005,28 @@
   },
   {
     "id": "kawaii_maid_megane_01",
+    "note": "Based on standard glasses. Fancy, close layer, and counters both vision impairments.",
     "type": "ARMOR",
     "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",
     "volume": "250 ml",
     "price": 7900,
+    "price_postapoc": 500,
+    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
+    "looks_like": "sunglasses",
     "color": "cyan",
-    "covers": [ "eyes" ],
+    "covers": [ "EYES" ],
     "coverage": 75,
     "material_thickness": 1,
     "environmental_protection": 1,
-    "flags": [ "WATER_FRIENDLY", "FANCY", "FIX_NEARSIGHT", "FIX_FARSIGHT", "SKINTIGHT" ]
+    "flags": [ "WATER_FRIENDLY", "FANCY", "FIX_NEARSIGHT", "FIX_FARSIGHT", "FRAGILE", "SKINTIGHT" ]
   },
   {
     "id": "kawaii_hitec_megane",
+    "note": "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",
     "category": "armor",
     "name": { "str": "pair of survivor maid glasses", "str_pl": "pairs of survivor maid glasses" },
@@ -1024,94 +1046,115 @@
   },
   {
     "id": "kawaii_wedding_dress",
+    "note": "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.",
     "type": "ARMOR",
     "name": { "str": "wedding dress", "str_pl": "wedding dresses" },
     "description": "A pure white wedding dress.",
-    "weight": "150 g",
-    "volume": "2500 ml",
-    "price": 5000,
+    "weight": "850 g",
+    "volume": "4500 L",
+    "price": 45000,
+    "price_postapoc": 50,
+    "to_hit": -5,
     "material": [ "cotton" ],
     "symbol": "[",
-    "color": "blue",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 85,
-    "encumbrance": 7,
-    "storage": "0 ml",
+    "looks_like": "dress_wedding",
+    "color": "white",
+    "covers": [ "ARMS", "LEGS", "TORSO" ],
+    "coverage": 90,
+    "encumbrance": 10,
     "warmth": 10,
-    "material_thickness": 1,
+    "material_thickness": 2,
     "flags": [ "VARSIZE", "SUPER_FANCY" ]
   },
   {
     "id": "kawaii_wedding_veil_a",
+    "note": "Copy of the standard weding veil. Has a different skin, covers head only, close layer, not oversize.",
+    "repairs_like": "veil_wedding",
     "type": "ARMOR",
     "name": { "str": "wedding veil" },
-    "description": "A beautiful but simple wedding veil.",
+    "description": "A lacy white wedding veil.",
     "weight": "78 g",
-    "volume": "250 ml",
-    "price": 5000,
+    "volume": "750 ml",
+    "price": 8000,
+    "price_postapoc": 10,
+    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "veil_wedding",
     "color": "white",
-    "covers": [ "head" ],
-    "coverage": 70,
+    "covers": [ "HEAD" ],
+    "coverage": 100,
     "encumbrance": 5,
-    "warmth": 15,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "FANCY" ]
+    "environmental_protection": 1,
+    "flags": [ "SUPER_FANCY", "SKINTIGHT" ]
   },
   {
     "id": "kawaii_wedding_veil_b",
+    "note": "Copy of the standard weding veil. Has a different skin, covers head only, close layer, not oversize.",
+    "repairs_like": "veil_wedding",
     "type": "ARMOR",
     "name": { "str": "wedding veil" },
-    "description": "A beautiful wedding veil with additional adornments.",
+    "description": "A lacy white wedding veil with additional adornments..",
     "weight": "78 g",
-    "volume": "250 ml",
-    "price": 5000,
+    "volume": "750 ml",
+    "price": 8000,
+    "price_postapoc": 10,
+    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
+    "looks_like": "veil_wedding",
     "color": "white",
-    "covers": [ "head" ],
-    "coverage": 70,
+    "covers": [ "HEAD" ],
+    "coverage": 100,
     "encumbrance": 5,
-    "warmth": 15,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "FANCY" ]
+    "environmental_protection": 1,
+    "flags": [ "SUPER_FANCY", "SKINTIGHT" ]
   },
   {
     "id": "kawaii_wedding_gloves",
+    "note": "Copy of extra long white gloves. Fancy.",
+    "repairs_like": "long_glove_white",
     "type": "ARMOR",
-    "looks_like": "long_glove_white",
     "name": { "str": "pair of wedding gloves", "str_pl": "pairs of wedding gloves" },
-    "description": "A pair of beautiful white gloves to match a wedding dress.",
-    "weight": "118 g",
-    "volume": "250 ml",
+    "description": "A pair of pure white gloves to match a wedding dress.",
+    "weight": "400 g",
+    "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": 4,
-    "warmth": 15,
-    "material_thickness": 1,
+    "looks_like": "long_glove_white",
+    "color": "white",
+    "covers": [ "HANDS", "ARMS" ],
+    "coverage": 60,
+    "warmth": 30,
+    "material_thickness": 2,
     "flags": [ "VARSIZE", "FANCY" ]
   },
   {
     "id": "kawaii_wedding_shoes",
+    "note": "Copy of dress shoes, but with the white high maid shoes skin.",
+    "repairs_like": "dress_shoes",
     "type": "ARMOR",
     "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": "500 g",
-    "volume": "1250 ml",
+    "weight": "870 g",
+    "volume": "1500 ml",
     "price": 12000,
+    "price_postapoc": 250,
+    "to_hit": 1,
+    "bashing": 1,
     "material": [ "leather" ],
     "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "foot_l", "foot_r" ],
+    "looks_like": "dress_shoes",
+    "color": "white",
+    "covers": [ "FEET" ],
     "coverage": 60,
     "encumbrance": 15,
-    "warmth": 5,
+    "warmth": 10,
     "material_thickness": 2,
     "flags": [ "VARSIZE", "FANCY" ]
   }