Re-order against base json to ease diffing.

Also fix a few minor bugs.

1 files changed, 108 insertions, 59 deletions

diff --git a/json/items/armor/storage.json b/json/items/armor/storage.json
index 938b644..8d677b0 100644
--- a/json/items/armor/storage.json
+++ b/json/items/armor/storage.json
@@ -1,90 +1,87 @@
 [
-  { 
-    "id": "mbag",
-    "copy-from": "mbag",
-    "type": "ARMOR",
-    "name": { "str": "messenger bag" },
-    "encumbrance": 4,
-    "max_encumbrance": 8,
-    "storage": "15 L",
-    "flags": [ "BELTED", "WATER_FRIENDLY" ]
-  },
-  { 
+  {
     "id": "backpack",
     "copy-from": "backpack",
     "type": "ARMOR",
     "name": { "str": "backpack" },
     "encumbrance": 4,
     "max_encumbrance": 19,
-    "storage": "35500 ml"
+    "storage": "25510 ml"
+  },
+  {
+    "id": "backpack_hiking",
+    "copy-from": "backpack_hiking",
+    "type": "ARMOR",
+    "name": { "str": "hiking backpack" },
+    "volume": "14700 ml",
+    "encumbrance": 10,
+    "max_encumbrance": 40,
+    "storage": "63 L"
   },
-  { 
+  {
     "id": "backpack_leather",
     "copy-from": "backpack_leather",
     "type": "ARMOR",
     "name": { "str": "leather backpack" },
     "encumbrance": 2,
-    "max_encumbrance": 25,
-    "storage": "35500 ml"
-  },
-  { 
-    "id": "duffelbag",
-    "copy-from": "duffelbag",
-    "type": "ARMOR",
-    "name": { "str": "duffel bag" },
-    "encumbrance": 5,
-    "max_encumbrance": 15,
-    "storage": "39 L"
+    "max_encumbrance": 20,
+    "storage": "25 L"
   },
-  { 
-    "id": "molle_pack",
-    "copy-from": "molle_pack",
-    "type": "ARMOR",
-    "name": { "str": "MOLLE pack" },
-    "weight": "1450 g",
-    "volume": "6 L",
-    "encumbrance": 5,
-    "max_encumbrance": 11,
-    "storage": "38 L"
-  },
-  { 
+  {
     "id": "backpack_tactical_large",
     "copy-from": "backpack_tactical_large",
     "type": "ARMOR",
     "name": { "str": "large tactical backpack" },
     "encumbrance": 10,
     "max_encumbrance": 55,
-    "storage": "81 L"
+    "storage": "66 L"
   },
-  { 
-    "id": "legrig",
-    "copy-from": "legrig",
-    "type": "ARMOR",
-    "name": { "str": "pair of drop leg pouches", "str_pl": "pairs of drop leg pouches" },
-    "storage": "5 L",
-    "encumbrance": 2,
-    "max_encumbrance": 3,
-    "flags": [ "WATER_FRIENDLY", "BELTED" ],
-    "//": "Changed to strapped layer since knee pads no longer hard conflict."
-  },
-  { 
+  {
     "id": "daypack",
     "copy-from": "daypack",
     "type": "ARMOR",
     "name": { "str": "daypack" },
-    "storage": "39 L",
+    "storage": "24510 ml",
     "encumbrance": 2,
     "max_encumbrance": 18
   },
-  { 
-    "id": "runner_bag",
-    "copy-from": "runner_bag",
+  {
+    "id": "dive_bag",
+    "copy-from": "dive_bag",
     "type": "ARMOR",
-    "name": { "str": "runner pack" },
-    "weight": "360 g",
-    "storage": "7 L",
+    "name": { "str": "dive bag" },
+    "storage": "30 L",
+    "encumbrance": 3,
+    "max_encumbrance": 24
+  },
+  {
+    "id": "duffelbag",
+    "copy-from": "duffelbag",
+    "type": "ARMOR",
+    "name": { "str": "duffel bag" },
+    "encumbrance": 5,
+    "max_encumbrance": 40,
+    "storage": "35 L"
+  },
+  {
+    "id": "dump_pouch",
+    "copy-from": "dump_pouch",
+    "type": "ARMOR",
+    "name": { "str": "tactical dump pouch", "str_pl": "tactical dump pouches" },
     "encumbrance": 1,
-    "max_encumbrance": 2
+    "max_encumbrance": 3,
+    "storage": "2 L"
+  },
+  {
+    "id": "legrig",
+    "copy-from": "legrig",
+    "type": "ARMOR",
+    "name": { "str": "pair of drop leg pouches", "str_pl": "pairs of drop leg pouches" },
+    "storage": "4500 ml",
+    "encumbrance": 1,
+    "max_encumbrance": 4,
+    "flags": [ "WATER_FRIENDLY", "BELTED" ],
+    "//": "Changed to strapped layer since knee pads no longer hard conflict."
   },
   {
     "id": "armrig",
@@ -108,13 +105,65 @@
     "flags": [ "VARSIZE", "WATER_FRIENDLY", "BELTED" ],
     "//": "Psuedo-ported from dda."
   },
-  { 
+  {
+    "id": "mbag",
+    "copy-from": "mbag",
+    "type": "ARMOR",
+    "name": { "str": "messenger bag" },
+    "encumbrance": 4,
+    "max_encumbrance": 19,
+    "storage": "15 L",
+    "flags": [ "BELTED", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "molle_pack",
+    "copy-from": "molle_pack",
+    "type": "ARMOR",
+    "name": { "str": "MOLLE pack" },
+    "weight": "1450 g",
+    "volume": "6 L",
+    "encumbrance": 5,
+    "max_encumbrance": 19,
+    "storage": "23 L"
+  },
+  {
+    "id": "rucksack",
+    "copy-from": "rucksack",
+    "type": "ARMOR",
+    "name": { "str": "military rucksack" },
+    "volume": "11 L",
+    "encumbrance": 10,
+    "max_encumbrance": 50,
+    "storage": "54 L"
+  },
+  {
+    "id": "runner_bag",
+    "copy-from": "runner_bag",
+    "type": "ARMOR",
+    "name": { "str": "runner pack" },
+    "weight": "360 g",
+    "storage": "7 L",
+    "encumbrance": 1,
+    "max_encumbrance": 5
+  },
+  {
+    "id": "travelpack",
+    "copy-from": "travelpack",
+    "type": "ARMOR",
+    "name": { "str": "travelpack" },
+    "volume": "5 L",
+    "storage": "31510 ml",
+    "encumbrance": 3,
+    "max_encumbrance": 25
+  },
+  {
     "id": "vest",
     "copy-from": "vest",
     "type": "ARMOR",
     "name": { "str": "utility vest" },
+    "storage": "3 L",
     "encumbrance": 2,
-    "max_encumbrance": 5,
+    "max_encumbrance": 4,
     "extend": { "flags": [ "BELTED" ] },
     "//": "Changed to strapped layer because this is not a shirt."
   }