Backport fixes/optimizations found when porting to DDA.

9 files changed, 166 insertions, 284 deletions

diff --git a/ammo.json b/ammo.json
index 1711425..3029a5f 100644
--- a/ammo.json
+++ b/ammo.json
@@ -1,45 +1,51 @@
 [
   {
+    "id": "throwing_knife",
     "type": "GENERIC",
+    "category": "weapons",
+    "price": 5200,
+    "price_postapoc": 500,
+    "name": { "str": "throwing knife", "str_pl": "throwing knives" },
+    "symbol": ";",
+    "color": "light_gray",
+    "description": "A thin and flat knife made for throwing.  Its ineffective cutting edge and odd shape makes it unsuitable for use as a tool.",
+    "material": [ "steel" ],
+    "volume": "250 ml",
+    "weight": "268 g",
+    "to_hit": -2,
+    "bashing": 1,
+    "cutting": 10,
+    "thrown_damage": [ { "damage_type": "stab", "amount": 14 } ],
+    "flags": [ "SHEATH_KNIFE" ]
+  },
+  {
     "id": "assassins_throwing_dagger",
+    "copy-from": "throwing_knife",
+    "type": "GENERIC",
     "category": "weapons",
-    "price": "90 USD",
+    "price": 9000,
+    "price_postapoc": 900,
     "name": { "str": "assassin's throwing knife" },
     "symbol": "/",
     "color": "light_gray",
     "description": "A nimble blade meant for ranged assassination, but makes an improvised cutlery tool in a pinch. It's very lightweight and silent and can be used on both zombies and games involving apples.",
     "material": [ "steel", "leather" ],
-    "volume": "250 ml",
     "weight": "350 g",
     "cutting": 21,
     "to_hit": 2,
-    "flags": [ "SHEATH_KNIFE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 10 ] ],
     "thrown_damage": [ { "damage_type": "stab", "amount": 25 } ]
   },
   {
-    "type": "GENERIC",
-    "id": "throwing_knife",
-    "category": "weapons",
+    "id": "makeshift_throwing_knife",
     "copy-from": "throwing_knife",
-    "name": { "str": "throwing knife", "str_pl": "throwing knives" },
-    "flags": [ "SHEATH_KNIFE" ]
-  },
-  {
     "type": "GENERIC",
-    "id": "makeshift_throwing_knife",
     "category": "weapons",
-    "price": "52 USD",
     "name": { "str": "makeshift throwing knife" },
-    "symbol": ";",
-    "color": "light_gray",
     "description": "A crude and simple throwing knife made from a sharpened piece of salvaged steel with cloth wrapped around it. It's better than throwing rocks, at least.",
-    "material": [ "steel" ],
-    "volume": "250 ml",
     "weight": "150 g",
     "bashing": 0,
     "cutting": 7,
-    "flags": [ "SHEATH_KNIFE" ],
     "thrown_damage": [ { "damage_type": "stab", "amount": 10 } ]
   }
 ]
diff --git a/armor.json b/armor.json
index ac82b67..de94c7c 100644
--- a/armor.json
+++ b/armor.json
@@ -24,6 +24,7 @@
   },
   {
     "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" },
@@ -33,9 +34,6 @@
     "price": 17900,
     "price_postapoc": 1500,
     "material": [ "leather", "cotton" ],
-    "symbol": "[",
-    "color": "black",
-    "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
     "coverage": 100,
     "encumbrance": 12,
     "max_encumbrance": 16,
@@ -47,6 +45,7 @@
   },
   {
     "id": "kawaii_maid_dress_long_armor",
+    "copy-from": "maid_dress",
     "//": "Loosely based on medium survivor suit.",
     "type": "ARMOR",
     "looks_like": "maid_dress",
@@ -57,9 +56,6 @@
     "price": 150000,
     "price_postapoc": 5000,
     "material": [ "kevlar", "cotton" ],
-    "symbol": "[",
-    "color": "black",
-    "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
     "coverage": 100,
     "encumbrance": 15,
     "max_encumbrance": 20,
@@ -112,7 +108,7 @@
     "price_postapoc": 50,
     "material": [ "cotton" ],
     "symbol": "[",
-    "color": "blue",
+    "color": "dark_gray",
     "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
     "coverage": 75,
     "encumbrance": 5,
@@ -124,6 +120,7 @@
   },
   {
     "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.",
@@ -132,20 +129,17 @@
     "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": 7,
     "max_encumbrance": 10,
     "storage": " 5 L",
-    "warmth": 15,
     "material_thickness": 3,
     "environmental_protection": 1,
     "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "FANCY" ]
   },
   {
     "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" },
@@ -155,14 +149,10 @@
     "price": 110000,
     "price_postapoc": 5000,
     "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",
-    "warmth": 15,
     "material_thickness": 5,
     "environmental_protection": 2,
     "use_action": {
@@ -222,9 +212,10 @@
     "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",
@@ -237,37 +228,28 @@
   },
   {
     "id": "kawaii_maid_hat_thermal_off",
+    "copy-from": "kawaii_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" ]
   },
   {
     "id": "kawaii_maid_hat_lss",
+    "copy-from": "kawaii_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" ]
@@ -302,13 +284,14 @@
     "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",
+    "color": "light_gray",
     "covers": [ "hand_l", "hand_r" ],
     "coverage": 95,
     "encumbrance": 4,
@@ -316,49 +299,45 @@
     "material_thickness": 1,
     "flags": [ "VARSIZE", "FANCY" ]
   },
-    {
+  {
     "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,
+    "price": 1200,
+    "price_postapoc": 100,
     "to_hit": 1,
     "material": [ "cotton", "leather" ],
-    "symbol": "[",
-    "color": "light_blue",
-    "covers": [ "hand_l", "hand_r" ],
     "coverage": 100,
     "encumbrance": 6,
-    "warmth": 15,
     "material_thickness": 3,
     "environmental_protection": 1,
     "flags": [ "VARSIZE", "FANCY", "WATERPROOF" ]
   },
-    {
+  {
     "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"  ]
   },
-    {
+  {
     "id": "maid_gloves_long_cotton",
     "type": "ARMOR",
     "category": "clothing",
@@ -366,33 +345,32 @@
     "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" ],
+    "color": "white",
+    "covers": [ "hand_l", "hand_r", "arm_l", "arm_r" ],
     "coverage": 95,
     "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": "150 g",
-    "volume": "500 ml",
-    "price": 12000,
+    "weight": "700 g",
+    "price": 2500,
+    "price_postapoc": 200,
     "to_hit": 1,
     "material": [ "leather", "cotton" ],
-    "symbol": "[",
-    "color": "light_blue",
-    "covers": [ "hand_l", "hand_r" ],
     "coverage": 100,
     "encumbrance": 10,
     "warmth": 50,
@@ -400,20 +378,18 @@
     "environmental_protection": 2,
     "flags": [ "VARSIZE", "FANCY", "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,
@@ -428,15 +404,15 @@
     "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,
     "material": [ "leather" ],
     "symbol": "[",
     "color": "dark_gray",
     "covers": [ "foot_l", "foot_r" ],
-    "coverage": 60,
+    "coverage": 100,
     "encumbrance": 15,
     "warmth": 5,
     "material_thickness": 2,
@@ -444,22 +420,17 @@
   },
   {
     "id": "kawaii_shoes_hi",
+    "copy-from": "kawaii_dress_shoes",
     "//": "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",
+    "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" ]
@@ -471,15 +442,15 @@
     "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" ],
     "symbol": "[",
     "color": "dark_gray",
     "covers": [ "foot_l", "foot_r" ],
-    "coverage": 90,
+    "coverage": 100,
     "warmth": 20,
     "encumbrance": 12,
     "material_thickness": 3,
@@ -488,20 +459,16 @@
   },
   {
     "id": "kawaii_boots_hi",
+    "copy-from": "kawaii_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",
+    "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,
@@ -530,23 +497,14 @@
   },
   {
     "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" ]
+    "warmth": 0
   },
   {
     "id": "kawaii_tights_black",
@@ -554,10 +512,10 @@
     "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": "[",
     "color": "dark_gray",
@@ -570,33 +528,21 @@
   },
   {
     "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",
     "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 under your skirt, if needed.",
+    "weight": "80 g",
+    "volume": "200 ml",
+    "price": 500,
     "price_postapoc": 250,
     "material": [ "cotton" ],
     "symbol": "[",
@@ -620,11 +566,11 @@
     "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",
+    "color": "light_gray",
     "storage": "500 ml",
     "use_action": {
       "type": "holster",
@@ -673,7 +619,6 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray",
-    "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r" ],
     "coverage": 95,
     "encumbrance": 13,
     "max_encumbrance": 16,
@@ -685,28 +630,24 @@
   },
   {
     "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,
     "environmental_protection": 2,
     "flags": [ "VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "FANCY" ]
   },
   {
     "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,14 +656,8 @@
     "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,
     "environmental_protection": 3,
     "use_action": {
@@ -800,8 +735,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": 3800,
-    "price_postapoc": 50,
+    "price": 7500,
+    "price_postapoc": 150,
     "material": [ "cotton" ],
     "weight": "120 g",
     "volume": "1000 ml",
@@ -815,37 +750,26 @@
     "material_thickness": 1,
     "use_action": {
       "type": "transform",
-      "msg": "You loosen the scarf.",
+      "msg": "You loosen your %s.",
       "target": "kawaii_scarf_loose",
-      "menu_text": "Adjust scarf"
+      "menu_text": "Loosen"
     }
   },
   {
     "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.",
+      "msg": "You wrap your %s a bit tighter.",
       "target": "kawaii_scarf",
-      "menu_text": "Adjust scarf"
+      "menu_text": "Wrap tighter"
     }
   },
   {
@@ -867,39 +791,27 @@
     "warmth": 5,
     "material_thickness": 2,
     "environmental_protection": 3,
-    "flags": [ "HOOD", "POCKETS", "WATERPROOF", "RAINPROOF", "OUTER", "FANCY" ],
+    "flags": [ "POCKETS", "WATERPROOF", "RAINPROOF", "OUTER", "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" ],
     "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"
      }
   },
   {
@@ -984,9 +896,10 @@
     "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": "[",
     "color": "dark_gray",
@@ -1012,9 +925,10 @@
     "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": "6572 ml",
+    "price": 24000,
+    "price_postapoc": 3000,
     "material": [ "plastic", "leather" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -1040,9 +954,10 @@
     "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": "[",
     "color": "dark_gray",
@@ -1078,7 +993,7 @@
     "symbol": "[",
     "looks_like": "sunglasses",
     "color": "cyan",
-    "covers": [ "EYES" ],
+    "covers": [ "eyes" ],
     "coverage": 75,
     "material_thickness": 1,
     "environmental_protection": 1,
@@ -1086,18 +1001,15 @@
   },
   {
     "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,
+    "price": 8500,
+    "price_postapoc": 650,
     "material": [ "kevlar", "plastic" ],
-    "symbol": "[",
-    "color": "cyan",
-    "covers": [ "eyes" ],
-    "coverage": 75,
     "material_thickness": 3,
     "environmental_protection": 4,
     "qualities": [ [ "GLARE", 2 ] ],
@@ -1152,27 +1064,13 @@
   },
   {
     "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",
diff --git a/book.json b/book.json
index 4b9171d..e29a8c4 100644
--- a/book.json
+++ b/book.json
@@ -1,5 +1,20 @@
 [
   {
+    "id": "manual_maid",
+    "type": "GENERIC",
+    "category": "books",
+    "symbol": "?",
+    "color": "green",
+    "name": { "str": "A Maid's Memoirs" },
+    "description": "A collection of letters written by various maids, detailing the things they do for their Mistresses.",
+    "price": "200 USD",
+    "material": [ "paper" ],
+    "weight": "150 g",
+    "volume": "250 ml",
+    "use_action": "MA_MANUAL",
+    "book_data": { "max_level": 0, "intelligence": 5, "time": 10, "fun": 0, "skill": "none", "required_level": 0, "chapters": 5 }
+  },
+  {
     "id": "book_shoggoth",
     "type": "BOOK",
     "category": "books",
diff --git a/martial_arts_manuals.json b/martial_arts_manuals.json
deleted file mode 100644
index ec57367..0000000
--- a/martial_arts_manuals.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "id": "manual_maid",
-    "type": "GENERIC",
-    "category": "books",
-    "symbol": "?",
-    "color": "green",
-    "name": { "str": "A Maid's Memoirs" },
-    "description": "A collection of letters written by various maids, detailing the things they do for their Mistresses.",
-    "price": "200 USD",
-    "material": [ "paper" ],
-    "weight": "150 g",
-    "volume": "250 ml",
-    "use_action": "MA_MANUAL",
-    "book_data": { "max_level": 0, "intelligence": 5, "time": 10, "fun": 0, "skill": "none", "required_level": 0, "chapters": 5 }
-  }
-]
diff --git a/materials.json b/materials.json
deleted file mode 100644
index 36246e1..0000000
--- a/materials.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-  {
-    "type": "material",
-    "ident": "maid",
-    "name": "maid",
-    "bash_resist": 1000,
-    "cut_resist": 1000,
-    "bash_dmg_verb": "chipped",
-    "cut_dmg_verb": "scratched",
-    "dmg_adj": [ "marked", "chipped", "cracked", "shattered" ],
-    "acid_resist": 1000,
-    "elec_resist": 1000,
-    "fire_resist": 1000,
-    "bullet_resist": 1000,
-    "chip_resist": 1000,
-    "density": 1000
-  }
-]
diff --git a/mutations.json b/mutations.json
index 4c7eac4..32bc82e 100644
--- a/mutations.json
+++ b/mutations.json
@@ -31,11 +31,5 @@
     "valid": false,
     "purifiable": false,
     "profession": true
-  },
-  {
-    "type": "mutation",
-    "id": "FELINE_EARS",
-    "copy-from": "FELINE_EARS",
-    "points": 0
   }
 ]
diff --git a/professions.json b/professions.json
index 1351d6f..54d4cf2 100644
--- a/professions.json
+++ b/professions.json
@@ -147,7 +147,8 @@
       "female": "Catgirl Maid"
     },
     "description": "When the cataclysm came, you suddenly grew cat ears and a tail! Now you only need your Mistress to give you a collar.",
-    "points": 2,
+    "//": "The minus 3 points is to counterbalance to cost of the mandatory mutations.",
+    "points":-3,
     "traits": [
       "PROF_NEKOMIMI",
       "FELINE_EARS",
diff --git a/scenario.json b/scenario.json
index 3145b4e..a1d43d1 100644
--- a/scenario.json
+++ b/scenario.json
@@ -1,4 +1,5 @@
-{
+[
+  {
     "type": "scenario",
     "ident": "maid_mansion",
     "name": "Mansion",
@@ -14,4 +15,5 @@
         "battle_maid"
     ],
     "flags": [ "LONE_START", "CITY_START" ]
-}
+  }
+]
diff --git a/tools.json b/tools.json
index a70a44e..2599323 100644
--- a/tools.json
+++ b/tools.json
@@ -9,7 +9,7 @@
     "symbol": ")",
     "color": "dark_gray",
     "price": "50 USD",
-    "material": [ "maid" ],
+    "material": [ "flesh" ],
     "volume": "250 ml",
     "category": "tools"
   },
@@ -23,7 +23,7 @@
     "symbol": "M",
     "color": "dark_gray",
     "price": "50 USD",
-    "material": [ "glass", "maid" ],
+    "material": [ "glass", "flesh" ],
     "volume": "250 ml",
     "use_action": {
       "type": "delayed_transform",
@@ -43,7 +43,7 @@
     "name": { "str": "growing shoggoth maid" },
     "description": "The meat inside this flask glows with iridescent colors. It's lightly shivering.",
     "price": "600 USD",
-    "material": [ "glass", "maid" ],
+    "material": [ "glass", "flesh" ],
     "weight": "1200 g",
     "volume": "250 ml",
     "use_action": {
@@ -63,7 +63,7 @@
     "symbol": "m",
     "color": "white",
     "price": "50 USD",
-    "material": [ "maid" ],
+    "material": [ "flesh" ],
     "volume": "250 ml",
     "use_action": {
       "type": "delayed_transform",
@@ -83,7 +83,7 @@
     "name": { "str": "Revitalized Cute Maid" },
     "description": "'What's up? Why haven't you put me on the ground yet? Ah, you want me to stay tiny for a little while longer? Ehh... I suppose it can't be helped.'",
     "price": "600 USD",
-    "material": [ "maid" ],
+    "material": [ "flesh" ],
     "weight": "1200 g",
     "volume": "250 ml",
     "use_action": {
@@ -155,7 +155,7 @@
     "symbol": "m",
     "color": "white",
     "price": "50 USD",
-    "material": [ "maid" ],
+    "material": [ "flesh" ],
     "volume": "250 ml",
     "use_action": {
       "type": "delayed_transform",
@@ -175,7 +175,7 @@
     "name": { "str": "Revitalized Little Maid" },
     "description": "Your little maid seems to have made a complete recovery.",
     "price": "600 USD",
-    "material": [ "maid" ],
+    "material": [ "flesh" ],
     "weight": "1200 g",
     "volume": "250 ml",
     "use_action": {
@@ -187,23 +187,22 @@
   },
   {
     "id": "maid_mess_kit",
-    "sub": "hotplate",
     "type": "TOOL",
-    "symbol": ";",
-    "color": "brown",
     "name": { "str": "maid's cookware kit" },
     "description": "A set of secret maid cookware.",
-    "price": "20 USD",
-    "material": [ "steel" ],
-    "techniques": [ "BRUTAL", "WBLOCK_1" ],
-    "flags": [ "DURABLE_MELEE", "ALLOWS_REMOTE_USE" ],
     "weight": "1000 g",
     "volume": "1250 ml",
+    "price": 2000,
+    "price_postapoc": 400,
+    "to_hit": 1,
     "cutting": 18,
     "bashing": 18,
-    "to_hit": 1,
+    "material": [ "steel" ],
+    "symbol": ";",
+    "color": "brown",
+    "ammo": [ "battery" ],
+    "sub": "hotplate",
     "charges_per_use": 1,
-    "ammo": "battery",
     "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ], [ "CUT", 1 ], [ "BUTCHER", 25 ] ],
     "use_action": [ "HOTPLATE", "HEAT_FOOD" ],
     "magazines": [
@@ -212,6 +211,8 @@
           [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
       ]
     ],
-    "magazine_well": "500 ml"
+    "magazine_well": "500 ml",
+    "techniques": [ "BRUTAL", "WBLOCK_1" ],
+    "flags": [ "DURABLE_MELEE", "ALLOWS_REMOTE_USE" ]
   }
 ]