1 files changed, 34 insertions, 61 deletions
diff --git a/power_armor_medium.json b/power_armor_medium.json
index 8e2773a..9a6887d 100644
--- a/power_armor_medium.json
+++ b/power_armor_medium.json
@@ -1,70 +1,43 @@
 [
   {
-    "id": "power_armor_basic",
+    "id": "power_armor_on",
+    "copy-from": "power_armor_on",
     "type": "TOOL_ARMOR",
-    "category": "clothing",
-    "name": { "str": "combat exoskeleton" },
-    "description": "These were the second wave of military combat exoskeleton, and got a lot of media attention, with popular Navy commercials featuring them heavily.  It consists of a muscle-boosting exoskeleton frame with overlayed segmented alloy plating.  Despite advancements over the original bulky 'tank suits', the wearer still cannot easily fit through narrow spaces, or sit down comfortably (and it ruins upholstery).  There is an integrated chemical resistant bodyglove that precludes wearing other clothing.  The armor is outfitted with a variety of clips & clamps, allowing it to hold a few mags & grenades, as well as a large rifle.",
-    "weight": "55 kg",
-    "volume": "100 L",
-    "price": 7000000,
-    "price_postapoc": 30000,
-    "to_hit": 1,
-    "bashing": 1,
-    "material": [ "steel", "carbide" ],
-    "symbol": "[",
-    "looks_like": "depowered_armor",
-    "color": "light_gray",
-    "covers": [ "torso", "arms", "hands", "legs", "feet" ],
-    "coverage": 100,
-    "encumbrance": 50,
-    "storage": "20 L",
-    "warmth": 90,
-    "power_armor": true,
-    "material_thickness": 11,
-    "environmental_protection": 16,
-    "ammo": "battery",
-    "use_action": { "type": "transform", "msg": "The %s engages.", "target": "power_armor_basic_on", "active": true },
-    "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
-  },
-  {
-    "id": "power_armor_basic_on",
-    "copy-from": "power_armor_basic",
-    "repairs_like": "power_armor_basic",
-    "looks_like": "power_armor_basic",
-    "type": "TOOL_ARMOR",
-    "name": { "str": "combat exoskeleton (on)", "str_pl": "combat exoskeletons (on)" },
-    "description": "These were the second wave of military combat exoskeleton, and got a lot of media attention, with popular Navy commercials featuring them heavily.  It consists of a muscle-boosting exoskeleton frame with overlayed segmented alloy plating.  Despite advancements over the original bulky 'tank suits', the wearer still cannot easily fit through narrow spaces, or sit down comfortably (and it ruins upholstery).  There is an integrated chemical resistant bodyglove that precludes wearing other clothing.  It is turned on and continually drawing power.  Use it to turn it off.",
-    "weight": "5 kg",
-    "flags": [ "USE_UPS", "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "TRADER_AVOID", "CLIMATE_CONTROL" ],
-    "power_draw": 0,
-    "revert_to": "power_armor_basic",
-    "use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s armor disengages.", "target": "power_armor_basic" }
+    "name": { "str": "combat exoskeleton (on)", "str_pl": "combat exoskeletons (on)" }
   },
   {
-    "id": "power_armor_helmet_basic",
+    "id": "power_armor_helmet",
+    "copy-from": "power_armor_helmet",
     "type": "ARMOR",
     "category": "clothing",
-    "name": { "str": "environmental combat helmet" },
-    "description": "A fully enclosed combat helmet for hazardous environments, this was designed to fit with a powered exoskeleton, using cameras to expand visual range.  In practice, the cameras were unreliable and easily fouled.  The environmental controls function best with direct-skin contact.",
-    "weight": "3628 g",
-    "volume": "5 L",
-    "price": 2500000,
-    "price_postapoc": 7500,
-    "to_hit": 1,
-    "bashing": 1,
-    "material": [ "steel", "carbide" ],
-    "symbol": "[",
-    "looks_like": "depowered_helmet",
-    "color": "light_gray",
-    "covers": [ "head", "eyes", "mouth" ],
-    "coverage": 100,
-    "encumbrance": 50,
-    "warmth": 90,
-    "power_armor": true,
-    "material_thickness": 11,
-    "environmental_protection": 16,
-    "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "WATCH", "WATERPROOF", "STURDY", "PARTIAL_DEAF", "THERMOMETER", "SUN_GLASSES", "SWIM_GOGGLES" ]
+    "flags": [
+      "USE_UPS",
+      "NAT_UPS",
+      "POWERARMOR_EXTERNAL",
+      "WATERPROOF",
+      "STURDY",
+      "SUN_GLASSES",
+      "SWIM_GOGGLES"
+    ]
+  },
+  {
+    "id": "power_armor_helmet_on",
+    "copy-from": "power_armor_helmet_on",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "environmental combat helmet (on)", "str_pl": "environmental combat helmet (on)" },
+    "flags": [
+      "USE_UPS",
+      "NAT_UPS",
+      "POWERARMOR_EXTERNAL",
+      "WATCH",
+      "WATERPROOF",
+      "STURDY",
+      "PARTIAL_DEAF",
+      "THERMOMETER",
+      "SUN_GLASSES",
+      "CLIMATE_CONTROL",
+      "TRADER_AVOID",
+      "SWIM_GOGGLES"
+    ]
   }
 ]