Clean up the mess of flags.

4 files changed, 40 insertions, 103 deletions

diff --git a/power_armor_heavy.json b/power_armor_heavy.json
index a36ffff..7a240a0 100644
--- a/power_armor_heavy.json
+++ b/power_armor_heavy.json
@@ -16,7 +16,6 @@
     "name": { "str": "heavy combat exoskeleton (on)", "str_pl": "heavy combat exoskeletons (on)" },
     "weight": "75420 g",
     "weight_capacity_bonus": "75420 g",
-    "power_draw": 2250000,
     "extend": { "flags": [ "RAINPROOF" ] }
   },
   {
@@ -26,17 +25,8 @@
     "category": "clothing",
     "name": { "str": "heavy environmental combat helmet", "str_pl": "heavy environmental combat helmet" },
     "weight": "7542 g",
-    "volume": "13 L",
-    "flags": [
-      "USE_UPS",
-      "NAT_UPS",
-      "POWERARMOR_EXTERNAL",
-      "WATERPROOF",
-      "RAINPROOF",
-      "STURDY",
-      "SUN_GLASSES",
-      "SWIM_GOGGLES"
-    ]
+    "extend": { "flags": [ "RAINPROOF", "SWIM_GOGGLES" ] },
+    "delete": { "flags": [ "PARTIAL_DEAF" ] }
   },
   {
     "id": "power_armor_helmet_heavy_on",
@@ -46,22 +36,16 @@
     "name": { "str": "heavy environmental combat helmet (on)", "str_pl": "heavy environmental combat helmet (on)" },
     "weight": "7542 g",
     "weight_capacity_bonus": "7542 g",
-    "volume": "13 L",
-    "power_draw": 250000,
-    "flags": [
-      "USE_UPS",
-      "NAT_UPS",
-      "POWERARMOR_EXTERNAL",
-      "WATCH",
-      "WATERPROOF",
-      "RAINPROOF",
-      "STURDY",
-      "PARTIAL_DEAF",
-      "THERMOMETER",
-      "SUN_GLASSES",
-      "CLIMATE_CONTROL",
-      "TRADER_AVOID",
-      "SWIM_GOGGLES"
-    ]
+    "extend": {
+      "flags": [
+        "WATCH",
+        "THERMOMETER",
+        "CLIMATE_CONTROL",
+        "TRADER_AVOID",
+        "RAINPROOF",
+        "SWIM_GOGGLES",
+        "PARTIAL_DEAF"
+      ]
+    }
   }
 ]
diff --git a/power_armor_light.json b/power_armor_light.json
index 2a78dd5..e5fc8d5 100644
--- a/power_armor_light.json
+++ b/power_armor_light.json
@@ -6,7 +6,6 @@
     "category": "clothing",
     "name": { "str": "field combat exoskeleton", "str_pl": "field combat exoskeletons" },
     "weight": "25670 g",
-    "volume": "30 L",
     "extend": { "flags": [ "RAINPROOF" ] }
   },
   {
@@ -17,9 +16,7 @@
     "name": { "str": "field combat exoskeleton (on)", "str_pl": "field combat exoskeletons (on)" },
     "weight": "25670 g",
     "weight_capacity_bonus": "25670 g",
-    "volume": "30 L",
     "encumbrance": 1,
-    "power_draw": 750000,
     "extend": { "flags": [ "RAINPROOF" ] }
   },
   {
@@ -29,17 +26,7 @@
     "category": "clothing",
     "name": { "str": "light environmental combat helmet", "str_pl": "light environmental combat helmet" },
     "weight": "2514 g",
-    "volume": "3 L",
-    "flags": [
-      "USE_UPS",
-      "NAT_UPS",
-      "POWERARMOR_EXTERNAL",
-      "WATERPROOF",
-      "RAINPROOF",
-      "STURDY",
-      "SUN_GLASSES",
-      "SWIM_GOGGLES"
-    ]
+    "extend": { "flags": [ "RAINPROOF", "SWIM_GOGGLES" ] }
   },
   {
     "id": "power_armor_helmet_light_on",
@@ -49,23 +36,17 @@
     "name": { "str": "light environmental combat helmet (on)", "str_pl": "light environmental combat helmet (on)" },
     "weight": "2514 g",
     "weight_capacity_bonus": "2514 g",
-    "volume": "3 L",
     "encumbrance": 1,
-    "power_draw": 750000,
-    "flags": [
-      "USE_UPS",
-      "NAT_UPS",
-      "POWERARMOR_EXTERNAL",
-      "WATCH",
-      "WATERPROOF",
-      "RAINPROOF",
-      "STURDY",
-      "PARTIAL_DEAF",
-      "THERMOMETER",
-      "SUN_GLASSES",
-      "CLIMATE_CONTROL",
-      "TRADER_AVOID",
-      "SWIM_GOGGLES"
-    ]
+    "extend": {
+      "flags": [
+        "WATCH",
+        "THERMOMETER",
+        "CLIMATE_CONTROL",
+        "TRADER_AVOID",
+        "RAINPROOF",
+        "SWIM_GOGGLES",
+        "PARTIAL_DEAF"
+      ]
+    }
   }
 ]
diff --git a/power_armor_medium.json b/power_armor_medium.json
index 84b5f0b..12d58e0 100644
--- a/power_armor_medium.json
+++ b/power_armor_medium.json
@@ -6,8 +6,6 @@
     "category": "clothing",
     "name": { "str": "combat exoskeleton", "str_pl": "combat exoskeletons" },
     "weight": "55280 g",
-    "storage": "4 L",
-    "warmth": 60,
     "extend": { "flags": [ "RAINPROOF" ] }
   },
   {
@@ -18,8 +16,6 @@
     "name": { "str": "combat exoskeleton (on)", "str_pl": "combat exoskeletons (on)" },
     "weight": "55280 g",
     "weight_capacity_bonus": "55280 g",
-    "storage": "4 L",
-    "warmth": 60,
     "extend": { "flags": [ "RAINPROOF" ] }
   },
   {
@@ -29,18 +25,8 @@
     "category": "clothing",
     "name": { "str": "environmental combat helmet", "str_pl": "environmental combat helmet" },
     "weight": "5528 g",
-    "volume": "10 L",
-    "warmth": 60,
-    "flags": [
-      "USE_UPS",
-      "NAT_UPS",
-      "POWERARMOR_EXTERNAL",
-      "WATERPROOF",
-      "RAINPROOF",
-      "STURDY",
-      "SUN_GLASSES",
-      "SWIM_GOGGLES"
-    ]
+    "extend": { "flags": [ "RAINPROOF", "SWIM_GOGGLES" ] },
+    "delete": { "flags": [ "PARTIAL_DEAF" ] }
   },
   {
     "id": "power_armor_helmet_basic_on",
@@ -50,22 +36,16 @@
     "name": { "str": "environmental combat helmet (on)", "str_pl": "environmental combat helmet (on)" },
     "weight": "5528 g",
     "weight_capacity_bonus": "5528 g",
-    "volume": "10 L",
-    "warmth": 60,
-    "flags": [
-      "USE_UPS",
-      "NAT_UPS",
-      "POWERARMOR_EXTERNAL",
-      "WATCH",
-      "WATERPROOF",
-      "RAINPROOF",
-      "STURDY",
-      "PARTIAL_DEAF",
-      "THERMOMETER",
-      "SUN_GLASSES",
-      "CLIMATE_CONTROL",
-      "TRADER_AVOID",
-      "SWIM_GOGGLES"
-    ]
+    "extend": {
+      "flags": [
+        "WATCH",
+        "THERMOMETER",
+        "CLIMATE_CONTROL",
+        "TRADER_AVOID",
+        "RAINPROOF",
+        "SWIM_GOGGLES",
+        "PARTIAL_DEAF"
+      ]
+    }
   }
 ]
diff --git a/power_armor_salvaged.json b/power_armor_salvaged.json
index 4dda831..72b1aae 100644
--- a/power_armor_salvaged.json
+++ b/power_armor_salvaged.json
@@ -5,9 +5,7 @@
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "salvaged combat exoskeleton" },
-    "weight": "12214 g",
-    "encumbrance": 35,
-    "storage": "4 L"
+    "weight": "12214 g"
   },
   {
     "id": "depowered_helmet",
@@ -16,12 +14,6 @@
     "category": "clothing",
     "name": { "str": "salvaged environmental combat helmet" },
     "weight": "1216 g",
-    "volume": "2500 ml",
-    "flags": [
-      "WATERPROOF",
-      "STURDY",
-      "SUN_GLASSES",
-      "SWIM_GOGGLES"
-    ]
+    "extend": { "flags": [ "SWIM_GOGGLES" ] }
   }
 ]