Rebalance the kitchen maid weapons to be less overpowered.

1 files changed, 34 insertions, 28 deletions

diff --git a/melee.json b/melee.json
index a4803d1..7510a39 100644
--- a/melee.json
+++ b/melee.json
@@ -1,46 +1,51 @@
 [
   {
     "id": "vorpal_kitchen_knife",
-    "looks_like": "knife_butcher",
+    "note": "Loosely based on the combat knife, but with cutting damage.",
+    "looks_like": "knife_chef",
     "type": "TOOL",
     "category": "weapons",
     "name": { "str": "maid's kitchen knife" },
     "description": "It is a kitchen knife suitable for combat. It slices through enemies of your Mistress just as easily as it would food.",
-    "weight": "450 g",
-    "volume": "250 ml",
+    "weight": "558 g",
+    "volume": "500 ml",
     "price": 9000,
+    "price_postapoc": 1000,
     "to_hit": 1,
     "bashing": 4,
-    "cutting": 28,
+    "cutting": 16,
     "material": [ "steel", "wood" ],
-    "symbol": "/",
+    "symbol": ";",
     "color": "light_gray",
-    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 30 ],[ "CUT_FINE", 3 ] ],
-    "techniques": [ "RAPID", "WBLOCK_1" ],
+    "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ],  [ "BUTCHER", 20 ] ],
+    "techniques": [ "RAPID" ],
     "flags": [ "DURABLE_MELEE", "SHEATH_KNIFE" ]
   },
   {
     "id": "slaying_pan",
-    "looks_like": "pan",
+    "note": "Loosely based on the steel frying pan.",
+    "looks_like": "steel_pan",
     "type":"TOOL",
     "category": "weapons",
     "name": { "str": "maid's frying pan" },
     "description": "It is a frying pan suitable for combat. It can make short work of threats to your Mistress just as easily as it does food.",
-    "weight": "1000 g",
-    "volume": "1750 ml",
-    "price": 9000,
+    "weight": "750 g",
+    "volume": "1 L",
+    "price": 5500,
+    "price_postapoc": 20,
     "to_hit": 2,
-    "bashing": 26,
-    "cutting": 8,
+    "bashing": 18,
     "material": [ "steel", "wood" ],
     "symbol": ")",
     "color": "dark_gray",
-    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
-    "techniques": [ "RAPID", "BRUTAL", "WBLOCK_2" ],
+    "container_data": { "contains": "2 L", "watertight": true },
+    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
+    "techniques": [ "BRUTAL", "WBLOCK_2" ],
     "flags": [ "DURABLE_MELEE" ]
   },
   {
     "id": "brutal_broom",
+    "note": "Loosely based on the naginata.",
     "looks_like": "broom",
     "type":"GENERIC",
     "category": "weapons",
@@ -49,18 +54,19 @@
     "weight": "1200 g",
     "volume": "1500 ml",
     "price": 9000,
-    "to_hit": 2,
+    "price_postapoc": 1000,
     "bashing": 4,
     "cutting": 20,
     "material": [ "steel", "wood" ],
     "symbol": "/",
     "color": "light_gray",
-    "techniques": [ "BRUTAL", "WBLOCK_1" ],
-    "flags": [ "STAB", "REACH_ATTACK" ]
+    "techniques": [ "WIDE", "WBLOCK_1" ],
+    "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ]
   },
   {
     "id": "spiked_whip",
-    "looks_like": "bullwhip_razor",
+    "note": "Loosely based on the bullwhip. Has piercing spikes on the end, but is a single whip unlike the scourge. Think shinobi and not dominatrix.",
+    "looks_like": "bullwhip",
     "type":"GENERIC",
     "category": "weapons",
     "name": { "str": "maid's whip" },
@@ -68,14 +74,14 @@
     "weight": "1300 g",
     "volume": "1750 ml",
     "price": 9000,
-    "to_hit": 2,
-    "bashing": 20,
-    "cutting": 8,
+    "price_postapoc": 1000,
+    "bashing": 9,
+    "cutting": 4,
     "material": [ "steel", "leather" ],
-    "symbol": ")",
+    "symbol": "/",
     "color": "light_gray",
     "techniques": [ "WHIP_DISARM" ],
-    "flags": [ "DURABLE_MELEE", "REACH_ATTACK" ]
+    "flags": [ "STAB", "DURABLE_MELEE", "REACH_ATTACK", "REACH3", "WHIP", "NONCONDUCTIVE" ]
   },
   {
     "id": "shikomi_kasa",
@@ -106,7 +112,7 @@
     "looks_like": "wakizashi",
     "type":"GENERIC",
     "category": "weapons",
-    "name": { "str": "maid's umbrella (unsheathed)" },
+    "name": { "str": "maid's umbrella (unsheathed)", "str_pl": "maid's umbrellas (unsheathed)" },
     "description": "The kind of fancy umbrella you imagine sharing with your Mistress on rainy days. The hidden blade is currently drawn.",
     "weight": "1000 g",
     "volume": "1500 ml",
@@ -154,7 +160,7 @@
     "looks_like": "katana",
     "type":"GENERIC",
     "category": "weapons",
-    "name": { "str": "maid's shirasaya (unsheathed)" },
+    "name": { "str": "maid's shirasaya (unsheathed)", "str_pl": "maid's shirasayas (unsheathed)" },
     "description": "A matching wooden handle and scabbard, consealing full length katana blade. It appears as a solid wooden stick to those unfamiliar with it, due to how well the handle and scabbard fit together. It reminds you of how well you and your Mistress fit together.",
     "weight": "1350 g",
     "volume": "2 L",
@@ -178,7 +184,7 @@
     "looks_like": "bagh_nakha",
     "type": "GENERIC",
     "category": "weapons",
-    "name": { "str": "maid's claws" },
+    "name": { "str": "maid's claws", "str_pl": "maid's claws"  },
     "description": "It is a sharp claw for fighting combat. Fit tightly to your arms, allows you to fight with unarmed techniques.",
     "weight": "1000 g",
     "volume": "250 ml",
@@ -219,7 +225,7 @@
     "name": { "str": "maid's ladle" },
     "description": "A weapon used by a maid when she's seriously angry. Scary!",
     "weight": "2000 g",
-    "volume": "2000 ml",
+    "volume": "1000 ml",
     "price": 9000,
     "to_hit": 2,
     "bashing": 24,