Merge pull request #40321 from jbytheway/restore_variable_encumbrance

Restore variable encumbrance
CleverRaven · May 12, 2020 · 19e90be · 19e90be
2 parents fd1c463 + 491c34c
commit 19e90be
Show file tree

Hide file tree

Showing 28 changed files with 595 additions and 178 deletions.
diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json
diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
@@ -19,6 +19,7 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
+        "holster": true,
         "min_item_volume": "1500 ml",
         "max_contains_volume": "9 L",
         "max_contains_weight": "10 kg",
@@ -43,7 +44,8 @@
     "color": "brown",
     "covers": [ "FOOT_EITHER" ],
     "coverage": 5,
-    "encumbrance": 4,
+    "encumbrance": 3,
+    "max_encumbrance": 4,
     "material_thickness": 1,
     "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ],
     "pocket_data": [
@@ -72,12 +74,14 @@
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 5,
-    "encumbrance": 7,
+    "encumbrance": 3,
+    "max_encumbrance": 7,
     "material_thickness": 1,
     "flags": [ "OVERSIZE", "WAIST" ],
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
+        "holster": true,
         "min_item_volume": "500 ml",
         "max_contains_volume": "5 L",
         "max_contains_weight": "5 kg",
@@ -106,6 +110,7 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
+        "holster": true,
         "min_item_volume": "300 ml",
         "max_contains_volume": "800 ml",
         "max_contains_weight": "2 kg",
@@ -122,10 +127,12 @@
     "name": { "str": "fast draw holster" },
     "description": "A comfortable quick draw holster for small guns.  Activate to holster/draw a gun.",
     "price_postapoc": 500,
-    "encumbrance": 2,
+    "encumbrance": 1,
+    "max_encumbrance": 2,
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
+        "holster": true,
         "min_item_volume": "100 ml",
         "max_contains_volume": "400 ml",
         "max_contains_weight": "2 kg",
@@ -150,6 +157,7 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
+        "holster": true,
         "min_item_volume": "100 ml",
         "max_contains_volume": "400 ml",
         "max_contains_weight": "1 kg",
@@ -174,11 +182,13 @@
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 20,
-    "encumbrance": 2,
+    "encumbrance": 1,
+    "max_encumbrance": 2,
     "material_thickness": 2,
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
+        "holster": true,
         "min_item_volume": "1250 ml",
         "max_contains_volume": "3750 ml",
         "max_contains_weight": "2 kg",
@@ -208,6 +218,7 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
+        "holster": true,
         "min_item_volume": "750 ml",
         "max_contains_volume": "1250 ml",
         "max_contains_weight": "5 kg",

diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
@@ -41,7 +41,8 @@
     "color": "dark_gray",
     "covers": [ "LEGS" ],
     "coverage": 100,
-    "encumbrance": 30,
+    "encumbrance": 24,
+    "max_encumbrance": 30,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -112,7 +113,8 @@
     "color": "white",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 15,
+    "encumbrance": 13,
+    "max_encumbrance": 15,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 }
@@ -291,7 +293,8 @@
     "color": "green",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 16,
+    "encumbrance": 8,
+    "max_encumbrance": 16,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 },
@@ -343,7 +346,8 @@
     "color": "green",
     "covers": [ "LEGS" ],
     "coverage": 100,
-    "encumbrance": 20,
+    "encumbrance": 10,
+    "max_encumbrance": 20,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 },

diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json
@@ -61,7 +61,8 @@
     "color": "green",
     "covers": [ "TORSO", "LEGS", "FEET" ],
     "coverage": 100,
-    "encumbrance": 25,
+    "encumbrance": 19,
+    "max_encumbrance": 25,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -145,7 +146,8 @@
     "color": "blue",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 16,
+    "encumbrance": 12,
+    "max_encumbrance": 16,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -173,7 +175,8 @@
     "color": "red",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 16,
+    "encumbrance": 12,
+    "max_encumbrance": 16,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -353,7 +356,8 @@
     "color": "brown",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 11,
+    "encumbrance": 7,
+    "max_encumbrance": 11,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -380,7 +384,8 @@
     "color": "green",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 18,
+    "encumbrance": 9,
+    "max_encumbrance": 18,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "3 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "3 kg", "moves": 80 },
@@ -408,7 +413,8 @@
     "color": "light_gray",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 16,
+    "encumbrance": 8,
+    "max_encumbrance": 16,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "3 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "3 kg", "moves": 80 },
@@ -439,7 +445,8 @@
     "color": "dark_gray",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 5,
+    "encumbrance": 2,
+    "max_encumbrance": 5,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -466,7 +473,8 @@
     "color": "brown",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 20,
+    "encumbrance": 16,
+    "max_encumbrance": 20,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -505,7 +513,8 @@
     "color": "dark_gray",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 17,
+    "encumbrance": 15,
+    "max_encumbrance": 17,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 }
@@ -531,7 +540,8 @@
     "color": "blue",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 10,
+    "encumbrance": 6,
+    "max_encumbrance": 10,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -586,7 +596,8 @@
     "color": "brown",
     "covers": [ "LEGS" ],
     "coverage": 40,
-    "encumbrance": 5,
+    "encumbrance": 2,
+    "max_encumbrance": 5,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -613,7 +624,8 @@
     "color": "light_gray",
     "covers": [ "LEGS" ],
     "coverage": 40,
-    "encumbrance": 5,
+    "encumbrance": 2,
+    "max_encumbrance": 5,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -642,7 +654,8 @@
     "color": "light_blue",
     "covers": [ "LEGS" ],
     "coverage": 40,
-    "encumbrance": 2,
+    "encumbrance": 1,
+    "max_encumbrance": 2,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 }
@@ -710,7 +723,8 @@
     "color": "white",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 5,
+    "encumbrance": 2,
+    "max_encumbrance": 5,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
@@ -738,7 +752,8 @@
     "color": "light_gray",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 5,
+    "encumbrance": 2,
+    "max_encumbrance": 5,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "3 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "3 kg", "moves": 80 },
@@ -769,7 +784,8 @@
     "color": "white",
     "covers": [ "LEGS" ],
     "coverage": 95,
-    "encumbrance": 22,
+    "encumbrance": 11,
+    "max_encumbrance": 22,
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "350 ml", "max_contains_weight": "1 kg", "moves": 80 },

diff --git a/data/json/items/armor/power_armor.json b/data/json/items/armor/power_armor.json
@@ -19,7 +19,15 @@
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 95,
     "encumbrance": 40,
-    "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "15 kg", "moves": 200 } ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_contains_volume": "2500 ml",
+        "max_contains_weight": "15 kg",
+        "moves": 200
+      }
+    ],
     "warmth": 50,
     "material_thickness": 8,
     "environmental_protection": 6,
@@ -69,7 +77,15 @@
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
     "encumbrance": 50,
-    "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "15 kg", "moves": 200 } ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_contains_volume": "2500 ml",
+        "max_contains_weight": "15 kg",
+        "moves": 200
+      }
+    ],
     "warmth": 90,
     "power_armor": true,
     "material_thickness": 14,
@@ -95,7 +111,15 @@
     "color": "light_gray",
     "coverage": 100,
     "encumbrance": 40,
-    "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "30 L", "max_contains_weight": "150 kg", "moves": 300 } ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_contains_volume": "30 L",
+        "max_contains_weight": "150 kg",
+        "moves": 300
+      }
+    ],
     "power_armor": true,
     "material_thickness": 10,
     "flags": [ "WATERPROOF", "STURDY", "BELTED" ]
@@ -120,7 +144,15 @@
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
     "encumbrance": 60,
-    "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_contains_volume": "4 L",
+        "max_contains_weight": "30 kg",
+        "moves": 200
+      }
+    ],
     "warmth": 60,
     "power_armor": true,
     "material_thickness": 16,
@@ -225,7 +257,15 @@
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
     "encumbrance": 40,
-    "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_contains_volume": "4 L",
+        "max_contains_weight": "30 kg",
+        "moves": 200
+      }
+    ],
     "warmth": 60,
     "power_armor": true,
     "material_thickness": 8,