From 341501301327c4c4cc42d929e7b4d71cdcfb9c2a Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 4 Jun 2020 05:11:42 -0700
Subject: Add new weapons to martial art Fix volumes and crafting times for 0.E
 Fix drop tables for 0.E

---
 armor.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'armor.json')

diff --git a/armor.json b/armor.json
index 9941e5e..3c09a2a 100644
--- a/armor.json
+++ b/armor.json
@@ -14,7 +14,7 @@
     "covers" : ["TORSO", "ARMS", "LEGS"],
     "coverage" : 95,
     "encumbrance" : 10,
-    "storage" : 10,
+    "storage" : "2500 ml",
     "warmth" : 20,
     "material_thickness" : 4,
     "environmental_protection" : 1,
@@ -35,7 +35,7 @@
     "covers": [ "LEGS", "TORSO", "ARMS" ],
     "coverage": 100,
     "encumbrance": 16,
-    "storage": 80,
+    "storage": "20 L",
     "warmth": 40,
     "material_thickness": 5,
     "environmental_protection": 1,
@@ -56,7 +56,7 @@
     "covers": [ "LEGS", "TORSO", "ARMS" ],
     "coverage": 100,
     "encumbrance": 20,
-    "storage": 80,
+    "storage": "20 L",
     "warmth": 40,
     "material_thickness": 8,
     "environmental_protection": 10,
@@ -64,7 +64,7 @@
       "type": "holster",
       "holster_prompt": "Sheath sword",
       "holster_msg": "You sheath your %s",
-      "max_volume": 8,
+      "max_volume": "2 L",
       "flags": [ "SHEATH_SWORD" ]
     },
     "flags" : ["VARSIZE", "HOOD", "COLLAR", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY"]
@@ -84,7 +84,7 @@
     "covers" : ["TORSO", "ARMS", "LEGS"],
     "coverage" : 75,
     "encumbrance" : 7,
-    "storage" : 2,
+    "storage" : "500 ml",
     "warmth" : 5,
     "material_thickness" : 1,
     "flags" : ["VARSIZE", "SUPER_FANCY"]
@@ -103,7 +103,7 @@
     "covers": [ "TORSO", "ARMS", "LEGS" ],
     "coverage": 75,
     "encumbrance": 7,
-    "storage": 10,
+    "storage": "2500 ml",
     "warmth": 15,
     "material_thickness": 1,
     "flags": [ "VARSIZE", "FANCY" ]
@@ -122,7 +122,7 @@
     "covers": [ "TORSO", "ARMS", "LEGS" ],
     "coverage": 95,
     "encumbrance": 10,
-    "storage": 80,
+    "storage": " 20 L",
     "warmth": 15,
     "material_thickness": 5,
     "environmental_protection": 1,
@@ -143,7 +143,7 @@
     "covers": [ "LEGS", "TORSO", "ARMS" ],
     "coverage": 100,
     "encumbrance": 15,
-    "storage": 80,
+    "storage": "20 L",
     "warmth": 15,
     "material_thickness": 5,
     "environmental_protection": 10,
@@ -151,7 +151,7 @@
       "type": "holster",
       "holster_prompt": "Sheath sword",
       "holster_msg": "You sheath your %s",
-      "max_volume": 8,
+      "max_volume": "2 L",
       "flags": [ "SHEATH_SWORD" ]
     },
     "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "RAINPROOF", "STURDY", "SUPER_FANCY" ]
@@ -165,7 +165,7 @@
     "volume" : "5000 ml",
     "color" : "brown",
     "covers" : ["TORSO", "ARMS", "LEGS"],
-    "storage" : 2,
+    "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,
@@ -545,7 +545,7 @@
     "volume" : "5500 ml",
     "color" : "dark_gray",
     "covers" : ["LEGS", "TORSO", "ARMS"],
-    "storage" : 10,
+    "storage" : "2500 ml",
     "symbol" : "[",
     "price" : 21000,
     "material" : ["cotton"],
@@ -566,7 +566,7 @@
     "volume" : "11250 ml",
     "color" : "dark_gray",
     "covers" : ["LEGS", "TORSO", "ARMS"],
-    "storage" : 22,
+    "storage" : "5500 ml",
     "symbol" : "[",
     "price" : 110000,
     "material": [ "kevlar", "cotton" ],
@@ -593,7 +593,7 @@
     "covers": [ "TORSO" ],
     "coverage": 60,
     "encumbrance": 5,
-    "storage": 12,
+    "storage": "3 L",
     "warmth": 5,
     "material_thickness": 2,
     "flags": [ "VARSIZE", "WAIST" ]
@@ -612,7 +612,7 @@
     "covers": [ "TORSO" ],
     "coverage": 85,
     "encumbrance": 5,
-    "storage": 12,
+    "storage": "3 L",
     "warmth": 5,
     "material_thickness": 5,
     "use_action": {
@@ -837,7 +837,7 @@
     "covers": [ "TORSO" ],
     "coverage": 30,
     "encumbrance": 20,
-    "storage": 150,
+    "storage": "37500 ml",
     "material_thickness": 2,
     "use_action": {
         "type": "holster",
@@ -861,7 +861,7 @@
     "covers": [ "TORSO" ],
     "coverage": 15,
     "encumbrance": 15,
-    "storage": 100,
+    "storage": "25 L",
     "material_thickness": 2,
     "use_action": {
         "type": "holster",
@@ -885,7 +885,7 @@
     "covers": [ "TORSO" ],
     "coverage": 10,
     "encumbrance": 6,
-    "storage": 50,
+    "storage": "12500 ml",
     "material_thickness": 2,
     "use_action": {
         "type": "holster",
@@ -909,7 +909,7 @@
     "covers": [ "LEG_EITHER" ],
     "coverage": 5,
     "encumbrance": 1,
-    "storage": 10,
+    "storage": "2500 ml",
     "material_thickness": 2,
     "use_action": {
       "type": "holster",
-- 
cgit v1.2.1