More additions and fixes.

6 files changed, 237 insertions, 9 deletions

diff --git a/json/items/armor/gloves.json b/json/items/armor/gloves.json
index 5d96658..83f4d3e 100644
--- a/json/items/armor/gloves.json
+++ b/json/items/armor/gloves.json
@@ -6,5 +6,39 @@
     "name": { "str": "pair of fingerless survivor gloves", "str_pl": "pairs of fingerless survivor gloves" },
     "encumbrance": 2,
     "//": "Reduce the encumbrance to be more comparable to the difference between leather and fingerless leather gloves."
+  },
+  {
+    "id": "gloves_rubber",
+    "copy-from": "gloves_rubber",
+    "type": "ARMOR",
+    "name": { "str": "pair of rubber gloves", "str_pl": "pairs of rubber gloves" },
+    "encumbrance": 4,
+    "//": "Massive reduction in encumbrance."
+  },
+  {
+    "id": "gloves_wool",
+    "copy-from": "gloves_wool",
+    "type": "ARMOR",
+    "name": { "str": "pair of wool gloves", "str_pl": "pairs of wool gloves" },
+    "weight": "100 g"
+  },
+  {
+    "id": "gloves_wool_fingerless",
+    "copy-from": "gloves_wool_fingerless",
+    "type": "ARMOR",
+    "name": { "str": "pair of fingerless wool gloves", "str_pl": "pairs of fingerless wool gloves" },
+    "weight": "60 g"
+  },
+  {
+    "id": "long_glove_white",
+    "copy-from": "long_glove_white",
+    "type": "ARMOR",
+    "name": { "str": "pair of extra long white gloves", "str_pl": "pairs of extra long white gloves" },
+    "armor_portion_data": [
+      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 2 },
+      { "covers": [ "arms" ], "coverage": 75, "encumbrance": 2 }
+    ],
+    "warmth": 10,
+    "flags": [ "VARSIZE", "SKINTIGHT" ]
   }
 ]
diff --git a/json/items/armor/hats.json b/json/items/armor/hats.json
new file mode 100644
index 0000000..7fe888f
--- /dev/null
+++ b/json/items/armor/hats.json
@@ -0,0 +1,16 @@
+[
+  {
+    "id": "hat_hard",
+    "copy-from": "hat_hard",
+    "type": "ARMOR",
+    "name": { "str": "hard hat" },
+    "weight": "430 g"
+  },
+  {
+    "id": "hat_hard_hooded",
+    "copy-from": "hat_hard_hooded",
+    "type": "ARMOR",
+    "name": { "str": "summer hard hat" },
+    "weight": "470 g"
+  }
+]
diff --git a/json/items/armor/helmets.json b/json/items/armor/helmets.json
index 564a7eb..8192542 100644
--- a/json/items/armor/helmets.json
+++ b/json/items/armor/helmets.json
@@ -38,6 +38,54 @@
     "//2": "Also buff the thickness to make it a viable option compared to the army helmet."
   },
   {
+    "id": "helmet_ball",
+    "copy-from": "helmet_ball",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "baseball helmet" },
+    "weight": "615 g"
+  },
+  {
+    "id": "helmet_bike",
+    "copy-from": "helmet_bike",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "bike helmet" },
+    "weight": "400 g"
+  },
+  {
+    "id": "helmet_football",
+    "copy-from": "helmet_football",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "football helmet" },
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 95, "encumbrance": 50 },
+      { "covers": [ "eyes" ], "coverage": 70, "encumbrance": 5 },
+      { "covers": [ "mouth" ], "coverage": 85, "encumbrance": 0 }
+    ]
+  },
+  {
+    "id": "helmet_larmor",
+    "copy-from": "helmet_larmor",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "leather armor helmet" },
+    "weight": "658 g"
+  },
+  {
+    "id": "helmet_motor",
+    "copy-from": "helmet_motor",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "motorcycle helmet" },
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": 25 },
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 5 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 15 }
+    ]
+  },
+  {
     "id": "helmet_survivor",
     "type": "ARMOR",
     "name": { "str": "survivor helmet" },
diff --git a/json/items/armor/holster.json b/json/items/armor/holster.json
index f54aeba..e7c08f1 100644
--- a/json/items/armor/holster.json
+++ b/json/items/armor/holster.json
@@ -1,5 +1,53 @@
 [
   {
+    "id": "back_holster",
+    "copy-from": "back_holster",
+    "type": "ARMOR",
+    "name": { "str": "back holster" },
+    "encumbrance": 3,
+    "max_encumbrance": 15
+  },
+  {
+    "id": "bootstrap",
+    "copy-from": "bootstrap",
+    "type": "ARMOR",
+    "name": { "str": "ankle holster" },
+    "encumbrance": 3,
+    "max_encumbrance": 4
+  },
+  {
+    "id": "wristholster",
+    "copy-from": "wristholster",
+    "type": "ARMOR",
+    "name": { "str": "wrist holster" },
+    "encumbrance": 3,
+    "max_encumbrance": 4
+  },
+  {
+    "id": "holster",
+    "copy-from": "holster",
+    "type": "ARMOR",
+    "name": { "str": "holster" },
+    "encumbrance": 3,
+    "max_encumbrance": 4
+  },
+  {
+    "id": "sholster",
+    "copy-from": "sholster",
+    "type": "ARMOR",
+    "name": { "str": "fast draw holster" },
+    "encumbrance": 1,
+    "max_encumbrance": 2
+  },
+  {
+    "id": "shoulder_holster",
+    "copy-from": "shoulder_holster",
+    "type": "ARMOR",
+    "name": { "str": "shoulder holster" },
+    "encumbrance": 1,
+    "max_encumbrance": 2
+  },
+  {
     "id": "survivor_vest",
     "copy-from": "survivor_vest",
     "type": "ARMOR",
@@ -16,8 +64,8 @@
     "type": "ARMOR",
     "name": { "str": "large holster" },
     "rigid": false,
-    "encumbrance": 1,
-    "max_encumbrance": 4,
+    "encumbrance": 2,
+    "max_encumbrance": 7,
     "//": "Reduce the encumbrance when empty."
   }
 ]
diff --git a/json/items/armor/legs_armor.json b/json/items/armor/legs_armor.json
index 6a4a72a..59e75dc 100644
--- a/json/items/armor/legs_armor.json
+++ b/json/items/armor/legs_armor.json
@@ -1,5 +1,14 @@
 [
   {
+    "id": "bunker_pants",
+    "copy-from": "bunker_pants",
+    "type": "ARMOR",
+    "name": { "str_sp": "turnout trousers" },
+    "storage": "7100 ml",
+    "encumbrance": 24,
+    "max_encumbrance": 30
+  },
+  {
     "id": "knee_pads",
     "copy-from": "knee_pads",
     "type": "ARMOR",
@@ -13,8 +22,7 @@
     "type": "ARMOR",
     "name": { "str": "pair of hard leg guards", "str_pl": "pairs of hard leg guards" },
     "coverage": 90,
-    "encumbrance": 4,
-    "extend": { "flags": [ "STURDY" ] }
+    "encumbrance": 4
   },
   {
     "id": "lsurvivor_pants",
@@ -28,6 +36,15 @@
     "max_encumbrance": 16
   },
   {
+    "id": "motorbike_pants",
+    "copy-from": "motorbike_pants",
+    "type": "ARMOR",
+    "name": { "str": "pair of motorcycle jeans", "str_pl": "pairs of motorcycle jeans" },
+    "storage": "4660 ml",
+    "encumbrance": 10,
+    "max_encumbrance": 14
+  },
+  {
     "id": "pants_survivor",
     "copy-from": "pants_survivor",
     "type": "ARMOR",
diff --git a/json/items/armor/legs_clothes.json b/json/items/armor/legs_clothes.json
index 938c41a..5bb8cae 100644
--- a/json/items/armor/legs_clothes.json
+++ b/json/items/armor/legs_clothes.json
@@ -7,7 +7,17 @@
     "description": "A pair of blue jeans with four deep pockets.",
     "encumbrance": 7,
     "max_encumbrance": 11,
-    "storage": "4500 ml"
+    "storage": "4660 ml"
+  },
+  {
+    "id": "jeans_red",
+    "copy-from": "jeans_red",
+    "type": "ARMOR",
+    "name": { "str_sp": "red jeans" },
+    "description": "A pair of tight-fitting candy-apple-red jeans with four deep pockets.",
+    "encumbrance": 7,
+    "max_encumbrance": 11,
+    "storage": "4660 ml"
   },
   {
     "id": "pants",
@@ -16,7 +26,7 @@
     "name": { "str_sp": "pants" },
     "encumbrance": 7,
     "max_encumbrance": 11,
-    "storage": "4500 ml"
+    "storage": "4660 ml"
   },
   {
     "id": "pants_army",
@@ -25,7 +35,7 @@
     "name": { "str_sp": "army pants" },
     "encumbrance": 3,
     "max_encumbrance": 7,
-    "storage": "7 L"
+    "storage": "7160 ml"
   },
   {
     "id": "pants_cargo",
@@ -34,7 +44,7 @@
     "name": { "str_sp": "cargo pants" },
     "encumbrance": 2,
     "max_encumbrance": 6,
-    "storage": "7 L",
+    "storage": "7160 ml",
     "coverage": 100
   },
   {
@@ -47,12 +57,67 @@
     "storage": "1600 ml"
   },
   {
+    "id": "pants_ski",
+    "copy-from": "pants_ski",
+    "type": "ARMOR",
+    "name": { "str_sp": "ski pants" },
+    "encumbrance": 6,
+    "max_encumbrance": 10,
+    "storage": "4660 ml"
+  },
+  {
+    "id": "shorts",
+    "copy-from": "shorts",
+    "type": "ARMOR",
+    "name": { "str_sp": "shorts" },
+    "encumbrance": 2,
+    "max_encumbrance": 5,
+    "coverage": 35,
+    "storage": "4660 ml"
+  },
+  {
+    "id": "shorts_cargo",
+    "copy-from": "shorts_cargo",
+    "type": "ARMOR",
+    "name": { "str_sp": "cargo shorts" },
+    "encumbrance": 2,
+    "max_encumbrance": 7,
+    "coverage": 35,
+    "storage": "7160 ml"
+  },
+  {
+    "id": "shorts_denim",
+    "copy-from": "shorts_denim",
+    "type": "ARMOR",
+    "name": { "str_sp": "denim shorts" },
+    "encumbrance": 1,
+    "max_encumbrance": 3,
+    "coverage": 35,
+    "storage": "2160 ml"
+  },
+  {
+    "id": "skirt",
+    "copy-from": "skirt",
+    "type": "ARMOR",
+    "name": { "str": "skirt" },
+    "max_encumbrance": 0,
+    "coverage": 40,
+    "storage": "250 ml"
+  },
+  {
+    "id": "skirt_leather",
+    "copy-from": "skirt_leather",
+    "type": "ARMOR",
+    "name": { "str": "leather skirt" },
+    "coverage": 25
+  },
+  {
     "id": "winter_pants_army",
     "copy-from": "winter_pants_army",
     "type": "ARMOR",
     "name": { "str_sp": "army winter pants" },
     "encumbrance": 11,
     "max_encumbrance": 22,
-    "storage": "7 L"
+    "storage": "7160 ml"
   }
 ]