Update for the major overhaul included in 2022-07-06-2051

-The mod largely just fixes item names and adds swim goggles and sound dampening to helmets now.

7 files changed, 158 insertions, 260 deletions

diff --git a/modinfo.json b/modinfo.json
index dc93f80..e4620bf 100644
--- a/modinfo.json
+++ b/modinfo.json
@@ -4,7 +4,7 @@
     "ident": "usable_power_armor",
     "name": "BN - Usable Power Armor",
     "authors": ["jc_gargma"],
-    "description": "Port most of the DDA power armor changes to BN. Also reduces the weight when activated.",
+    "description": "Fix several typos and flag inconsistencies in the exoskeleton equipment.",
     "category": "rebalance",
     "dependencies": [ "dda" ]
   }
diff --git a/power_armor_frame.json b/power_armor_frame.json
index 9d91bcc..edfeec5 100644
--- a/power_armor_frame.json
+++ b/power_armor_frame.json
@@ -1,34 +1,51 @@
 [
   {
     "id": "power_armor_frame",
+    "copy-from": "power_armor_frame",
     "type": "ARMOR",
     "category": "clothing",
-    "name": { "str": "combat exoskeleton hauling frame" },
-    "description": "A heavy duty hauling frame designed to interface with military exoskeletons.",
-    "weight": "1640 g",
-    "volume": "45 L",
-    "price": 1000000,
-    "price_postapoc": 10000,
-    "to_hit": 1,
-    "bashing": 1,
-    "material": [ "steel" ],
-    "symbol": "[",
-    "looks_like": "backpack_tactical_large",
-    "color": "light_gray",
-    "coverage": 100,
-    "encumbrance": 40,
-    "storage": "6 L",
-    "power_armor": true,
-    "material_thickness": 10,
-    "flags": [ "WATERPROOF", "STURDY", "BELTED" ],
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Holster Gun",
-      "holster_msg": "You holster your %s",
-      "min_volume": "1250 ml",
-      "max_volume": "12000 ml",
-      "multi": 2,
-      "skills": [ "smg", "shotgun", "rifle", "launcher" ]
-    }
+    "name": { "str": "combat exoskeleton hauling frame" }
+  },
+  {
+    "id": "power_armor_back_holster",
+    "copy-from": "power_armor_back_holster",
+    "type": "ARMOR",
+    "category": "clothing",
+    "name": { "str": "combat exoskeleton back holster" }
+  },
+  {
+    "id": "power_armor_holster",
+    "copy-from": "power_armor_holster",
+    "type": "ARMOR",
+    "category": "clothing",
+    "name": { "str": "combat exoskeleton holster" }
+  },
+  {
+    "id": "power_armor_chest_rig",
+    "copy-from": "power_armor_chest_rig",
+    "type": "ARMOR",
+    "category": "clothing",
+    "name": { "str": "combat exoskeleton chest rig" }
+  },
+  {
+    "id": "power_armor_back_scabbard",
+    "copy-from": "power_armor_back_scabbard",
+    "type": "ARMOR",
+    "category": "clothing",
+    "name": { "str": "combat exoskeleton back scabbard" }
+  },
+  {
+    "id": "power_armor_scabbard",
+    "copy-from": "power_armor_scabbard",
+    "type": "ARMOR",
+    "category": "clothing",
+    "name": { "str": "combat exoskeleton scabbard" }
+  },
+  {
+    "id": "power_armor_sheath",
+    "copy-from": "power_armor_sheath",
+    "type": "ARMOR",
+    "category": "clothing",
+    "name": { "str": "combat exoskeleton sheath" }
   }
 ]
diff --git a/power_armor_heavy.json b/power_armor_heavy.json
index 746b032..65dfb95 100644
--- a/power_armor_heavy.json
+++ b/power_armor_heavy.json
@@ -1,71 +1,43 @@
 [
   {
-    "id": "power_armor_heavy",
-    "type": "TOOL_ARMOR",
-    "category": "clothing",
-    "name": { "str": "heavy combat exoskeleton" },
-    "description": "Colloquially known as a 'tank suit' in the media, these bulky exoskeletons, covered in thick segmented armor plates, were tested in military service a few years back and determined to be too heavy and expensive for regular use.  Now that it's in your hands, though, you have a massive suit of power armor capable of resisting almost any small arms fire and most other forms of attack.  On the other hand, it doubles your effective weight, and it's almost impossible not to bump into things.  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.",
-    "//": "This should probably changed to a pseudo-vehicle like the civilian exoskeleton",
-    "weight": "75 kg",
-    "volume": "130 L",
-    "price": 11500000,
-    "price_postapoc": 40000,
-    "to_hit": 1,
-    "bashing": 1,
-    "material": [ "steel", "hardsteel", "carbide" ],
-    "symbol": "[",
-    "looks_like": "power_armor_basic",
-    "color": "dark_gray",
-    "covers": [ "torso", "arms", "hands", "legs", "feet" ],
-    "coverage": 100,
-    "encumbrance": 60,
-    "storage": "20 L",
-    "warmth": 60,
-    "power_armor": true,
-    "material_thickness": 12,
-    "environmental_protection": 16,
-    "ammo": "battery",
-    "use_action": { "type": "transform", "msg": "The %s engages.", "target": "power_armor_heavy_on", "active": true },
-    "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
-  },
-  {
     "id": "power_armor_heavy_on",
-    "copy-from": "power_armor_heavy",
-    "repairs_like": "power_armor_heavy",
-    "looks_like": "power_armor_heavy",
+    "copy-from": "power_armor_heavy_on",
     "type": "TOOL_ARMOR",
-    "name": { "str": "heavy combat exoskeleton (on)", "str_pl": "heavy combat exoskeletons (on)" },
-    "description": "Colloquially known as a 'tank suit' in the media, these bulky exoskeletons, covered in thick segmented armor plates, were tested in military service a few years back and determined to be too heavy and expensive for regular use.  Now that it's in your hands, though, you have a massive suit of power armor capable of resisting almost any small arms fire and most other forms of attack.  On the other hand, it doubles your effective weight, and it's almost impossible not to bump into things.  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_heavy",
-    "use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s armor disengages.", "target": "power_armor_heavy" }
+    "name": { "str": "heavy combat exoskeleton (on)", "str_pl": "heavy combat exoskeletons (on)" }
   },
   {
     "id": "power_armor_helmet_heavy",
+    "copy-from": "power_armor_helmet_heavy",
     "type": "ARMOR",
     "category": "clothing",
-    "name": { "str": "heavy environmental combat helmet" },
-    "description": "An extremely heavy-duty fully enclosed combat helmet for hazardous environments, this was designed to fit with a powered exoskeleton.  In the field, soldiers reported that the protection was not worth the awkward size and limited visuals.  The environmental controls function best with direct-skin contact.",
-    "weight": "5442 g",
-    "volume": "7 L",
-    "price": 3750000,
-    "price_postapoc": 10000,
-    "to_hit": 1,
-    "bashing": 1,
-    "material": [ "steel", "hardsteel", "carbide" ],
-    "symbol": "[",
-    "looks_like": "power_armor_helmet_basic",
-    "color": "dark_gray",
-    "covers": [ "head", "eyes", "mouth" ],
-    "coverage": 100,
-    "encumbrance": 60,
-    "warmth": 60,
-    "power_armor": true,
-    "material_thickness": 12,
-    "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_heavy_on",
+    "copy-from": "power_armor_helmet_heavy_on",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "heavy environmental combat helmet (on)", "str_pl": "heavy 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"
+    ]
   }
 ]
diff --git a/power_armor_light.json b/power_armor_light.json
index bb4223b..33f5997 100644
--- a/power_armor_light.json
+++ b/power_armor_light.json
@@ -1,70 +1,50 @@
 [
   {
     "id": "power_armor_light",
+    "copy-from": "power_armor_light",
     "type": "TOOL_ARMOR",
     "category": "clothing",
-    "name": { "str": "field combat exoskeleton" },
-    "description": "The final iteration of military power armor before the fall of civilization, this type - a powered exoskeleton with high-tech segmented plating - was designed for actual widespread combat use and was seen on the front lines during the last days of the Cataclysm.  Like the heavier suits, it is resistant to most modern weaponry, but it is light and maneuverable, and can fit into normal vehicles and doorways without fuss, a huge advantage over predecessors.  Unfortunately, the world ended before it could roll out in significant numbers.  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": "12670 g",
-    "volume": "15 L",
-    "price": 11500000,
-    "price_postapoc": 40000,
-    "to_hit": 1,
-    "bashing": 1,
-    "material": [ "superalloy", "carbide" ],
-    "symbol": "[",
-    "looks_like": "depowered_armor",
-    "color": "dark_gray",
-    "covers": [ "torso", "arms", "hands", "legs", "feet" ],
-    "coverage": 100,
-    "encumbrance": 40,
-    "storage": "20 L",
-    "warmth": 60,
-    "power_armor": true,
-    "material_thickness": 9,
-    "environmental_protection": 16,
-    "ammo": "battery",
-    "use_action": { "type": "transform", "msg": "The %s engages.", "target": "power_armor_light_on", "active": true },
-    "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
+    "material": [ "superalloy", "carbide" ]
   },
   {
     "id": "power_armor_light_on",
-    "copy-from": "power_armor_light",
-    "repairs_like": "power_armor_light",
-    "looks_like": "power_armor_light",
+    "copy-from": "power_armor_light_on",
     "type": "TOOL_ARMOR",
     "name": { "str": "field combat exoskeleton (on)", "str_pl": "field combat exoskeletons (on)" },
-    "description": "The final iteration of military power armor before the fall of civilization, this type - a powered exoskeleton with high-tech segmented plating - was designed for actual widespread combat use and was seen on the front lines during the last days of the Cataclysm.  Like the heavier suits, it is resistant to most modern weaponry, but it is light and maneuverable, and can fit into normal vehicles and doorways without fuss, a huge advantage over predecessors.  Unfortunately, the world ended before it could roll out in significant numbers.  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_light",
-    "use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s armor disengages.", "target": "power_armor_light" }
   },
   {
     "id": "power_armor_helmet_light",
+    "copy-from": "power_armor_helmet_light",
     "type": "ARMOR",
     "category": "clothing",
-    "name": { "str": "light environmental combat helmet" },
-    "description": "This full-enclosure helmet was designed based on commercial diving equipment, in response to complaints that earlier designs were impossible to use in combat.  While still a little more restrictive than regular combat headgear - and frustrating should your nose itch - this one received far better reviews from soldiers.  Sadly, civilization ended before they could roll out in significant numbers.  The environmental controls function best with direct-skin contact.",
-    "weight": "1814 g",
-    "volume": "4 L",
-    "price": 3750000,
-    "price_postapoc": 10000,
-    "to_hit": 1,
-    "bashing": 1,
-    "material": [ "superalloy", "carbide" ],
-    "symbol": "[",
-    "looks_like": "power_armor_helmet_basic",
-    "color": "dark_gray",
-    "covers": [ "head", "eyes", "mouth" ],
-    "coverage": 100,
-    "encumbrance": 40,
-    "warmth": 60,
-    "power_armor": true,
-    "material_thickness": 9,
-    "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_light_on",
+    "copy-from": "power_armor_helmet_light_on",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "light environmental combat helmet (on)", "str_pl": "light 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"
+    ]
   }
 ]
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"
+    ]
   }
 ]
diff --git a/power_armor_salvaged.json b/power_armor_salvaged.json
index 82e4362..522d22d 100644
--- a/power_armor_salvaged.json
+++ b/power_armor_salvaged.json
@@ -1,53 +1,22 @@
 [
   {
     "id": "depowered_armor",
+    "copy-from": "depowered_armor",
     "type": "ARMOR",
     "category": "clothing",
-    "name": { "str": "salvaged combat exoskeleton" },
-    "//": "These are much cheaper than powered suits, because they're extremely heavy and impractical.  The good stuff is gone!",
-    "description": "This used to be a powered exoskeleton with a set of heavy armor plates, made wearable by the assist of the servos.  Now it's just the armor plating and a stripped down chassis: as one might expect, it's a lot harder to wear.",
-    "weight": "12214 g",
-    "volume": "25 L",
-    "price": 70000,
-    "price_postapoc": 15000,
-    "to_hit": 1,
-    "bashing": 1,
-    "material": [ "steel", "carbide" ],
-    "symbol": "[",
-    "looks_like": "power_armor_basic",
-    "color": "light_gray",
-    "covers": [ "torso", "arms", "hands", "legs", "feet" ],
-    "coverage": 95,
-    "encumbrance": 40,
-    "storage": "20 L",
-    "warmth": 50,
-    "material_thickness": 8,
-    "environmental_protection": 6,
-    "flags": [ "WATERPROOF", "STURDY" ]
+    "name": { "str": "salvaged combat exoskeleton" }
   },
   {
     "id": "depowered_helmet",
+    "copy-from": "depowered_helmet",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "salvaged environmental combat helmet" },
-    "description": "This used to be a military-grade full-head helmet with advanced optics and environmental filters.  It looks like it was decommissioned or otherwise stripped for parts; now it's a very expensive hat.  It's still quite durable, but quite hard to see out of.",
-    "weight": "2416 g",
-    "volume": "5 L",
-    "price": 30000,
-    "price_postapoc": 5000,
-    "to_hit": 1,
-    "bashing": 1,
-    "material": [ "steel", "carbide" ],
-    "symbol": "[",
-    "looks_like": "power_armor_helmet_basic",
-    "color": "light_gray",
-    "covers": [ "head", "eyes", "mouth" ],
-    "coverage": 95,
-    "encumbrance": 40,
-    "warmth": 50,
-    "material_thickness": 8,
-    "environmental_protection": 6,
-    "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "WATERPROOF", "STURDY", "SUN_GLASSES" ]
+    "flags": [
+      "WATERPROOF",
+      "STURDY",
+      "SUN_GLASSES",
+      "SWIM_GOGGLES"
+    ]
   }
 ]
diff --git a/readme.txt b/readme.txt
index a9d04ea..3db70fa 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,23 +1,10 @@
-Port power armor improvements from DDA to BN.
+Tweak the BN power armor. (Previously Port power armor improvements from DDA to BN.)
 
-Rename the salvaged power armor to salvaged combat exoskeleton.
-Rename the salvaged power armor helmet to salvaged environmental combat helmet.
-Rename the power armor hauling frame to combat exoskeleton hauling frame.
-
-Set the storage of suits to 20 L to simulate the equipment pockets added in DDA.
--BN does not support the same item being both push-to-activate and a holster.
-
-Set power draw to 0.
--They still consume 3 kJ per second as BN depletes the UPS via the source code.
+Rename several items still using the old term power armor to use the newer term combat exoskeleton.
+-And rename the salvaged power armor helmet to salvaged environmental combat helmet.
 
 Add Swim Goggles flag to helmets.
--But not the salvaged one.
-
-Reduce the weight of the suits to 5 kg when active.
--This way the medium and heavy suits can be feasibly worn by characters beyond Debug Hercules and STR+Weight CBM Cyborgs.
 
-Set the hauling frame volume to 45 L.
--Like the suits it is very bulky to carry, but not to wear.
+Add Partial Deaf flag to helmets while active.
 
-Reduce the hauling frame storage by 24 L and add two 12 L gun holsters.
--This gives the hauling frame combat value to counterbalance the generic storage buff of the suits.
+Fix the light exoskeleton suit still being made of plastic when all others were updated to carbide.