Rebalance encumbrance for equipment with storage space.

Fix many item prices.
Convert note to // for compatibility.
Clean up the japanese maid dress entry.
Fix unarmored maid gloves from having 100% coverage.
Fix typo in holster_prompt.
Reduce transparent rain coat encumbrance to balance against the lack of storage space and inability to safely set VARSIZE on transforming items.
Fix black bikini having no weight or volume.

1 files changed, 109 insertions, 69 deletions

diff --git a/armor.json b/armor.json
index a0b9998..e0d8a87 100644
--- a/armor.json
+++ b/armor.json
@@ -8,12 +8,14 @@
     "weight": "800 g",
     "volume": "4250 ml",
     "price": 5000,
+    "price_postapoc": 50,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "black",
     "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
     "coverage": 95,
-    "encumbrance": 10,
+    "encumbrance": 7,
+    "max_encumbrance": 10,
     "storage": "2500 ml",
     "warmth": 20,
     "material_thickness": 2,
@@ -28,13 +30,15 @@
     "description": "A classic maid outfit with a white apron, frills and a black one piece. It has been reinforced with leather for greater protection.",
     "weight": "5100 g",
     "volume": "10250 ml",
-    "price": 800000,
+    "price": 17900,
+    "price_postapoc": 1500,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
     "color": "black",
     "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
     "coverage": 100,
-    "encumbrance": 16,
+    "encumbrance": 12,
+    "max_encumbrance": 16,
     "storage": "6 L",
     "warmth": 45,
     "material_thickness": 5,
@@ -43,20 +47,22 @@
   },
   {
     "id": "kawaii_maid_dress_long_armor",
-    "note": "Loosely based on medium survivor suit.",
+    "//": "Loosely based on medium survivor suit.",
     "type": "ARMOR",
     "looks_like": "maid_dress",
     "name": { "str": "survivor victorian maid dress", "str_pl": "survivor victorian maid dresses" },
     "description": "A classic maid outfit with a white apron, frills and a black one piece. It has been reinforced with kevlar for greater protection and has an integrated scabbard for storing a sword.",
     "weight": "5100 g",
     "volume": "10250 ml",
-    "price": 800000,
+    "price": 150000,
+    "price_postapoc": 5000,
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
     "color": "black",
     "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
     "coverage": 100,
-    "encumbrance": 20,
+    "encumbrance": 15,
+    "max_encumbrance": 20,
     "storage": "9 L",
     "warmth": 45,
     "material_thickness": 8,
@@ -72,7 +78,7 @@
   },
   {
     "id": "maid_dress_french",
-    "note": "Copy of the vanilla french maid dress. Super fancy, renamed, using a different item ID, and counts as clothing.",
+    "//": "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",
@@ -88,7 +94,8 @@
     "color": "blue",
     "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
     "coverage": 75,
-    "encumbrance": 7,
+    "encumbrance": 5,
+    "max_encumbrance": 7,
     "storage": "500 ml",
     "warmth": 5,
     "material_thickness": 1,
@@ -101,13 +108,15 @@
     "description": "A black dress with white apron and lace trim, worn by maids.",
     "weight": "150 g",
     "volume": "1000 ml",
-    "price": 50000,
+    "price": 5000,
+    "price_postapoc": 50,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "blue",
     "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
     "coverage": 75,
-    "encumbrance": 7,
+    "encumbrance": 5,
+    "max_encumbrance": 7,
     "storage": "1500 ml",
     "warmth": 15,
     "material_thickness": 1,
@@ -120,13 +129,15 @@
     "description": "A black dress with white apron and lace trim, worn by maids. It has been reinforced with leather for better protection.",
     "weight": "5830 g",
     "volume": "7500 ml",
-    "price": 50000,
+    "price": 17900,
+    "price_postapoc": 1500,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
     "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
     "coverage": 100,
-    "encumbrance": 10,
+    "encumbrance": 7,
+    "max_encumbrance": 10,
     "storage": " 5 L",
     "warmth": 15,
     "material_thickness": 3,
@@ -135,19 +146,21 @@
   },
   {
     "id": "kawaii_maid_dress_lss",
-    "note": "Loosely based on light survivor suit.",
+    "//": "Loosely based on light survivor suit.",
     "type": "ARMOR",
     "name": { "str": "survivor maid dress", "str_pl": "survivor maid dresses" },
     "description": "A black dress with white apron and lace trim, worn by maids. It has been reinforced with kevlar for greater protection and has an integrated scabbard for storing a sword.",
     "weight": "5100 g",
     "volume": "10250 ml",
-    "price": 800000,
+    "price": 110000,
+    "price_postapoc": 5000,
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
     "color": "green",
     "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
     "coverage": 100,
-    "encumbrance": 15,
+    "encumbrance": 12,
+    "max_encumbrance": 15,
     "storage": "7500 ml",
     "warmth": 15,
     "material_thickness": 5,
@@ -166,25 +179,27 @@
     "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",
-    "symbol": "[",
-    "description": "Women's servant clothes worn in Japanese cafes a long time ago. Essentially a white apron over a kimono.",
-    "price": 5000,
-    "material": [ "cotton" ],
     "warmth": 20,
+    "material_thickness": 4,
     "environmental_protection": 1,
-    "encumbrance": 8,
-    "flags": [ "VARSIZE", "FANCY" ],
-    "coverage": 95,
-    "material_thickness": 4
+    "flags": [ "VARSIZE", "FANCY" ]
   },
   {
     "id": "kawaii_hat_cotton",
-    "note": "Loosely based on cotton hat.",
+    "//": "Loosely based on cotton hat.",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "maid hat" },
@@ -259,7 +274,7 @@
   },
   {
     "id": "maid_hat",
-    "note": "Copy of the vanilla maid headband, but renamed, super fancy, and with warmth to match the dress.",
+    "//": "Copy of the vanilla maid headband, but renamed, super fancy, and with warmth to match the dress.",
     "repairs_like": "balclava",
     "type": "ARMOR",
     "category": "clothing",
@@ -358,7 +373,7 @@
     "symbol": "[",
     "color": "light_blue",
     "covers": [ "hand_l", "hand_r" ],
-    "coverage": 100,
+    "coverage": 95,
     "encumbrance": 8,
     "warmth": 50,
     "material_thickness": 2,
@@ -408,7 +423,7 @@
   },
   {
     "id": "kawaii_dress_shoes",
-    "note": "Loosely based on dress shoes.",
+    "//": "Loosely based on dress shoes.",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "pair of maid shoes", "str_pl": "pairs of maid shoes" },
@@ -416,6 +431,7 @@
     "weight": "500 g",
     "volume": "1250 ml",
     "price": 12000,
+    "price_postapoc": 250,
     "material": [ "leather" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -428,14 +444,15 @@
   },
   {
     "id": "kawaii_shoes_hi",
-    "note": "Loosely based on medium survivor boots.",
+    "//": "Loosely based on medium survivor boots.",
     "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",
-    "price": 55000,
+    "price": 24000,
+    "price_postapoc": 6000,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -449,14 +466,15 @@
   },
   {
     "id": "kawaii_boots",
-    "note": "Loosely based on leather boots.",
+    "//": "Loosely based on leather 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",
-    "price": 25000,
+    "price": 10000,
+    "price_postapoc": 750,
     "material": [ "leather" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -470,14 +488,15 @@
   },
   {
     "id": "kawaii_boots_hi",
-    "note": "Loosely based on medium survivor boots.",
+    "//": "Loosely based on medium survivor 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",
-    "price": 85000,
+    "price": 24000,
+    "price_postapoc": 6000,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -498,6 +517,7 @@
     "weight": "90 g",
     "volume": "250 ml",
     "price": 500,
+    "price_postapoc": 250,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -517,6 +537,7 @@
     "weight": "40 g",
     "volume": "250 ml",
     "price": 500,
+    "price_postapoc": 250,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -536,6 +557,7 @@
     "weight": "40 g",
     "volume": "250 ml",
     "price": 500,
+    "price_postapoc": 250,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -555,6 +577,7 @@
     "weight": "40 g",
     "volume": "250 ml",
     "price": 500,
+    "price_postapoc": 250,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -574,6 +597,7 @@
     "weight": "10 g",
     "volume": "250 ml",
     "price": 1500,
+    "price_postapoc": 250,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -589,21 +613,22 @@
   },
   {
     "id": "kawaii_secretpoach",
-    "note": "Loosely based on deep concealment holster.",
+    "//": "Loosely based on deep concealment holster.",
     "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.",
     "weight": "250 g",
     "volume": "250 ml",
-    "price": 3000,
+    "price": 2000,
+    "price_postapoc": 1000,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
     "storage": "500 ml",
     "use_action": {
       "type": "holster",
-      "holster_prompt": "Coneal magazine",
+      "holster_prompt": "Conceal magazine",
       "holster_msg": "You coneal your %s.",
       "multi": 2,
       "max_volume": "250 ml",
@@ -622,6 +647,7 @@
     "color": "white",
     "symbol": "[",
     "price": 500,
+    "price_postapoc": 10,
     "material": [ "cotton" ],
     "use_action": {
       "type": "holster",
@@ -643,12 +669,14 @@
     "weight": "1587 g",
     "volume": "5500 ml",
     "price": 21000,
+    "price_postapoc": 750,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
     "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
     "coverage": 95,
-    "encumbrance": 12,
+    "encumbrance": 13,
+    "max_encumbrance": 16,
     "storage": "2500 ml",
     "warmth": 30,
     "material_thickness": 4,
@@ -662,13 +690,15 @@
     "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": 110000,
+    "price": 17900,
+    "price_postapoc": 1500,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
     "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
     "coverage": 100,
-    "encumbrance": 15,
+    "encumbrance": 13,
+    "max_encumbrance": 16,
     "storage": "5500 ml",
     "warmth": 30,
     "material_thickness": 5,
@@ -682,13 +712,15 @@
     "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.",
     "weight": "3050 g",
     "volume": "11250 ml",
-    "price": 110000,
+    "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": 15,
+    "encumbrance": 13,
+    "max_encumbrance": 16,
     "storage": "5500 ml",
     "warmth": 30,
     "material_thickness": 5,
@@ -705,20 +737,22 @@
   },
   {
     "id": "kawaii_vest",
-    "note": "Loosely based on utility 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": "1000 ml",
+    "volume": "1 L",
     "price": 3900,
+    "price_postapoc": 500,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "light_gray",
     "covers": [ "torso" ],
     "coverage": 20,
-    "encumbrance": 5,
+    "encumbrance": 2,
+    "max_encumbrance": 5,
     "storage": "3 L",
     "warmth": 5,
     "material_thickness": 2,
@@ -726,7 +760,7 @@
   },
   {
     "id": "kawaii_vest_tac",
-    "note": "Loosely based on tac vest.",
+    "//": "Loosely based on tac vest.",
     "type": "ARMOR",
     "category": "clothing",
     "looks_like": "kawaii_vest",
@@ -734,13 +768,15 @@
     "description": "A modified tac vest meant to carry your gear and ammunition, worn by maids.",
     "weight": "600 g",
     "volume": "1250 ml",
-    "price": 120000,
+    "price": 7400,
+    "price_postapoc": 2000,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "light_gray",
     "covers": [ "torso" ],
     "coverage": 20,
-    "encumbrance": 5,
+    "encumbrance": 2,
+    "max_encumbrance": 5,
     "storage": "3 L",
     "warmth": 5,
     "material_thickness": 2,
@@ -764,7 +800,8 @@
     "color": "light_gray",
     "name": { "str": "fashionable scarf", "str_pl": "fashionable scarves" },
     "description": "A stylish light cloth scarf, worn over the mouth for warmth.",
-    "price": 1500,
+    "price": 3800,
+    "price_postapoc": 50,
     "material": [ "cotton" ],
     "weight": "120 g",
     "volume": "1000 ml",
@@ -791,7 +828,8 @@
     "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": 1500,
+    "price": 3800,
+    "price_postapoc": 50,
     "material": [ "cotton" ],
     "weight": "120 g",
     "volume": "1000 ml",
@@ -818,13 +856,14 @@
     "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": 5000,
+    "price": 7900,
+    "price_postapoc": 50,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
     "color": "blue",
     "covers": [ "torso", "arm_l", "arm_r" ,"head" ],
     "coverage": 95,
-    "encumbrance": 7,
+    "encumbrance": 3,
     "warmth": 5,
     "material_thickness": 2,
     "environmental_protection": 3,
@@ -844,13 +883,14 @@
     "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": 5000,
+    "price": 7900,
+    "price_postapoc": 50,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
     "color": "blue",
     "covers": [ "torso", "arm_l", "arm_r" ],
     "coverage": 95,
-    "encumbrance": 7,
+    "encumbrance": 3,
     "warmth": 5,
     "material_thickness": 2,
     "environmental_protection": 3,
@@ -864,7 +904,7 @@
   },
   {
     "id": "kawaii_maid_panties",
-    "note": "Based on panties. Fancy, no warmth, and different skin.",
+    "//": "Based on panties. Fancy, no warmth, and different skin.",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str_sp": "white panties" },
@@ -885,7 +925,7 @@
   },
   {
     "id": "kawaii_maid_bra",
-    "note": "Based on bra. Fancy, no warmth, and different skin.",
+    "//": "Based on bra. Fancy, no warmth, and different skin.",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "white bra" },
@@ -910,8 +950,8 @@
     "category": "clothing",
     "name": "black bikini bottom",
     "description": "A simple black bikini bottom.",
-    "weight": 32,
-    "volume": 1,
+    "weight": "32 g",
+    "volume": "250 ml",
     "price": 1000,
     "material": [ "cotton" ],
     "symbol": "[",
@@ -927,8 +967,8 @@
     "category": "clothing",
     "name": "black bikini top",
     "description": "A simple black bikini top.",
-    "weight": 32,
-    "volume": 0,
+    "weight": "32 g",
+    "volume": "250 ml",
     "price": 1800,
     "material": [ "cotton" ],
     "symbol": "[",
@@ -940,7 +980,7 @@
   },
   {
     "id": "kawaii_maid_hardcase",
-    "note": "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.",
     "type": "ARMOR",
     "name": { "str": "hardcase" },
     "description": "A huge rectangular hardcase. Normally used for carrying large musical instruments, sniper rifles, or sensitive electrical equipment.",
@@ -968,7 +1008,7 @@
   },
   {
     "id": "kawaii_maid_hardcase_mini",
-    "note": "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.",
@@ -996,7 +1036,7 @@
   },
   {
     "id": "kawaii_maid_hardcase_slim",
-    "note": "Loosely based on survivor backpack with fixed encumbrance and a dedicated weapon compartment.",
+    "//": "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.",
@@ -1024,7 +1064,7 @@
   },
   {
     "id": "kawaii_maid_megane_01",
-    "note": "Based on standard glasses. Fancy, close layer, and counters both vision impairments.",
+    "//": "Based on standard glasses. Fancy, close layer, and counters both vision impairments.",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "pair of maid glasses", "str_pl": "pairs of maid glasses" },
@@ -1046,7 +1086,7 @@
   },
   {
     "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.",
+    "//": "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.",
@@ -1065,7 +1105,7 @@
   },
   {
     "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.",
+    "//": "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",
     "category": "clothing",
     "name": { "str": "wedding dress", "str_pl": "wedding dresses" },
@@ -1088,7 +1128,7 @@
   },
   {
     "id": "kawaii_wedding_veil_a",
-    "note": "Copy of the standard weding veil. Has a different skin, covers head only, close layer, not oversize.",
+    "//": "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",
@@ -1112,7 +1152,7 @@
   },
   {
     "id": "kawaii_wedding_veil_b",
-    "note": "Copy of the standard weding veil. Has a different skin, covers head only, close layer, not oversize.",
+    "//": "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",
@@ -1136,7 +1176,7 @@
   },
   {
     "id": "kawaii_wedding_gloves",
-    "note": "Copy of extra long white gloves. Fancy.",
+    "//": "Copy of extra long white gloves. Fancy.",
     "repairs_like": "long_glove_white",
     "type": "ARMOR",
     "category": "clothing",
@@ -1159,7 +1199,7 @@
   },
   {
     "id": "kawaii_wedding_shoes",
-    "note": "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",