Add and fix many vanilla items.

Also port the garter belt and garter knife sheath from dda.

1 files changed, 155 insertions, 13 deletions

diff --git a/json/items/armor/suits_protection.json b/json/items/armor/suits_protection.json
index a28800c..e3a8955 100644
--- a/json/items/armor/suits_protection.json
+++ b/json/items/armor/suits_protection.json
@@ -1,13 +1,70 @@
 [
   {
+    "id": "aep_suit",
+    "copy-from": "aep_suit",
+    "type": "ARMOR",
+    "name": { "str": "AEP suit" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": 20 },
+      { "covers": [ "arms", "legs" ], "coverage": 100, "encumbrance": 17 }
+    ]
+  },
+  {
+    "id": "anbc_suit",
+    "copy-from": "anbc_suit",
+    "type": "ARMOR",
+    "name": { "str": "ANBC suit" },
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": 35 },
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": 35 },
+      { "covers": [ "arms", "legs" ], "coverage": 100, "encumbrance": 28 },
+      { "covers": [ "hands", "feet" ], "coverage": 100, "encumbrance": 28 }
+    ]
+  },
+  {
+    "id": "armor_blarmor",
+    "copy-from": "armor_blarmor",
+    "type": "ARMOR",
+    "name": { "str": "boiled leather armor" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": 22 },
+      { "covers": [ "arms" ], "coverage": 90, "encumbrance": 18 },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": 18 }
+    ],
+    "storage": "0 ml"
+  },
+  {
     "id": "armor_larmor",
     "copy-from": "armor_larmor",
     "type": "ARMOR",
     "name": { "str": "leather body armor" },
     "armor_portion_data": [
-      { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 16, 16 ] },
-      { "covers": [ "arms" ], "coverage": 90, "encumbrance": [ 14, 14 ] },
-      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 14, 14 ] }
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": 16 },
+      { "covers": [ "arms" ], "coverage": 90, "encumbrance": 14 },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": 14 }
+    ],
+    "storage": "0 ml"
+  },
+  {
+    "id": "armor_nomad",
+    "copy-from": "armor_larmor",
+    "type": "ARMOR",
+    "name": { "str": "nomad gear" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 15, 20 ] },
+      { "covers": [ "arms" ], "coverage": 90, "encumbrance": 15 },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 15, 18 ] }
+    ]
+  },
+  {
+    "id": "armor_nomad_light",
+    "copy-from": "armor_nomad_light",
+    "type": "ARMOR",
+    "name": { "str": "light nomad gear" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 80, "encumbrance": [ 12, 16 ] },
+      { "covers": [ "arms" ], "coverage": 75, "encumbrance": 12 },
+      { "covers": [ "legs" ], "coverage": 70, "encumbrance": [ 12, 14 ] }
     ]
   },
   {
@@ -28,6 +85,42 @@
     "//": "Rebalance this based on dda's concept of it being a strapped on set of armor pads. Essentially a step up in quality from the individual hard plastic armor pieces."
   },
   {
+    "id": "armor_scavenger",
+    "copy-from": "armor_scavenger",
+    "type": "ARMOR",
+    "name": { "str": "scavenger gear" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 18, 30 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 18, 18 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 18, 24 ] }
+    ]
+  },
+  {
+    "id": "entry_suit",
+    "copy-from": "entry_suit",
+    "type": "ARMOR",
+    "name": { "str": "entry suit" },
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": 40 },
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": 50 },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": 40 },
+      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 40 },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": 40 },
+      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 40 }
+    ]
+  },
+  {
+    "id": "fsurvivor_suit",
+    "copy-from": "fsurvivor_suit",
+    "type": "ARMOR",
+    "name": { "str": "survivor firesuit" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 16, 30 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 16, 16 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 16, 20 ] }
+    ]
+  },
+  {
     "id": "hsurvivor_suit",
     "copy-from": "hsurvivor_suit",
     "type": "ARMOR",
@@ -35,8 +128,8 @@
     "material": [ "kevlar", "steel", "leather" ],
     "armor_portion_data": [
       { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 17, 31 ] },
-      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 17, 21 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 17, 17 ] }
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 17, 17 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 17, 21 ] }
     ]
   },
   {
@@ -47,8 +140,8 @@
     "material": [ "kevlar", "superalloy", "leather" ],
     "armor_portion_data": [
       { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 15, 25 ] },
-      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 15, 20 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 15, 15 ] }
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 15, 15 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 15, 20 ] }
     ]
   },
   {
@@ -59,13 +152,39 @@
     "material": [ "kevlar", "cotton" ],
     "armor_portion_data": [
       { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] },
-      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 7, 10 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 7, 10 ] }
     ],
     "storage": "7 L",
     "//": "Reduced the carrying volume from 7.5 to 7 litres."
   },
   {
+    "id": "robofac_enviro_suit",
+    "copy-from": "robofac_enviro_suit",
+    "type": "ARMOR",
+    "name": { "str": "Hub 01 environmental suit" },
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
+      { "covers": [ "hands" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 7, 10 ] },
+      { "covers": [ "feet" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+    ]
+  },
+  {
+    "id": "stillsuit",
+    "copy-from": "stillsuit",
+    "type": "ARMOR",
+    "name": { "str": "WS-47G moisture retention suit" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": 18 },
+      { "covers": [ "arms" ], "coverage": 95, "encumbrance": 18 },
+      { "covers": [ "legs" ], "coverage": 95, "encumbrance": 18 },
+      { "covers": [ "feet" ], "coverage": 95, "encumbrance": 18 }
+    ]
+  },
+  {
     "id": "survivor_suit",
     "copy-from": "survivor_suit",
     "type": "ARMOR",
@@ -73,11 +192,34 @@
     "material": [ "kevlar", "leather" ],
     "armor_portion_data": [
       { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 12, 20 ] },
-      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 12, 17 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 12, 12 ] }
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 12, 12 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 12, 17 ] }
+    ]
+  },
+  {
+    "id": "swat_armor",
+    "copy-from": "swat_armor",
+    "type": "ARMOR",
+    "name": { "str": "SWAT armor" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 20, 25 ] },
+      { "covers": [ "arms" ], "coverage": 95, "encumbrance": 20 },
+      { "covers": [ "legs" ], "coverage": 95, "encumbrance": [ 20, 22 ] }
     ]
   },
   {
+    "id": "touring_suit",
+    "copy-from": "touring_suit",
+    "type": "ARMOR",
+    "name": { "str": "leather touring suit" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": 25 },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": 25 },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": 25 }
+    ],
+    "storage": "1600 ml"
+  },
+  {
     "id": "wsurvivor_suit",
     "copy-from": "wsurvivor_suit",
     "type": "ARMOR",
@@ -85,8 +227,8 @@
     "material": [ "kevlar", "fur" ],
     "armor_portion_data": [
       { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 17, 31 ] },
-      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 17, 21 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 17, 17 ] }
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 17, 17 ] },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 17, 21 ] }
     ]
   }
 ]