feat(balance): add POWERARMOR_COMPATIBLE flag to most SKINTIGHT a…

…nd `RESTRICT_HANDS` items (#3797) * Commit for remote * Finish up the thing * Thing per feedback * Update items.json * Update tools.json
cataclysmbnteam · Dec 6, 2023 · 04b463a · 04b463a
1 parent f3e65f5
commit 04b463a
Show file tree

Hide file tree

Showing 24 changed files with 208 additions and 121 deletions.
diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
@@ -1165,7 +1165,7 @@
     "warmth": 30,
     "material_thickness": 2,
     "environmental_protection": 1,
-    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "roller_shoes_off",
@@ -1269,7 +1269,7 @@
     "warmth": 5,
     "material_thickness": 2,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY" ]
+    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "socks",
@@ -1288,7 +1288,7 @@
     "coverage": 100,
     "warmth": 5,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "socks_ankle",
@@ -1306,7 +1306,7 @@
     "covers": [ "feet" ],
     "coverage": 80,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "socks_bag",
@@ -1344,7 +1344,7 @@
     "covers": [ "feet" ],
     "coverage": 80,
     "warmth": 2,
-    "flags": [ "SKINTIGHT" ]
+    "flags": [ "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "socks_wool",
@@ -1364,7 +1364,7 @@
     "encumbrance": 5,
     "warmth": 30,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "stockings",
@@ -1384,7 +1384,7 @@
     "encumbrance": 5,
     "warmth": 10,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "stockings_wool",
@@ -1437,7 +1437,7 @@
     "coverage": 100,
     "warmth": 5,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "tabi_gi",
@@ -1457,7 +1457,7 @@
     "coverage": 100,
     "warmth": 5,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "sandal_armor",

diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
@@ -463,7 +463,7 @@
     "encumbrance": 1,
     "warmth": 15,
     "material_thickness": 1,
-    "flags": [ "WATER_FRIENDLY", "SKINTIGHT" ]
+    "flags": [ "WATER_FRIENDLY", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "gloves_liner_wool",
@@ -927,7 +927,7 @@
     "warmth": 5,
     "material_thickness": 2,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY" ]
+    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "sockmitts",

diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json
@@ -546,7 +546,7 @@
     "color": "yellow",
     "covers": [ "head" ],
     "coverage": 90,
-    "flags": [ "PSYSHIELD_PARTIAL", "SKINTIGHT", "TRADER_AVOID" ]
+    "flags": [ "PSYSHIELD_PARTIAL", "SKINTIGHT", "TRADER_AVOID", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "tophat",

diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
@@ -403,7 +403,7 @@
     "coverage": 100,
     "warmth": 30,
     "material_thickness": 2,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "cap_arming",

diff --git a/data/json/items/armor/hoods.json b/data/json/items/armor/hoods.json
@@ -198,6 +198,6 @@
     "warmth": 5,
     "material_thickness": 3,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY" ]
+    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY", "POWERARMOR_COMPATIBLE" ]
   }
 ]
diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json
@@ -92,7 +92,7 @@
     "color": "yellow",
     "covers": [ "mouth" ],
     "encumbrance": 10,
-    "flags": [ "SUPER_FANCY", "SKINTIGHT" ]
+    "flags": [ "SUPER_FANCY", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "garnet_dental_grill",
@@ -111,7 +111,7 @@
     "color": "red",
     "covers": [ "mouth" ],
     "encumbrance": 10,
-    "flags": [ "FANCY", "SKINTIGHT" ]
+    "flags": [ "FANCY", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "amethyst_dental_grill",
@@ -238,7 +238,16 @@
     "covers": [ "hand_either" ],
     "coverage": 5,
     "use_action": "WEATHER_TOOL",
-    "flags": [ "WATCH", "ALARMCLOCK", "WATER_FRIENDLY", "THERMOMETER", "BELTED", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE" ]
+    "flags": [
+      "WATCH",
+      "ALARMCLOCK",
+      "WATER_FRIENDLY",
+      "THERMOMETER",
+      "BELTED",
+      "ALLOWS_NATURAL_ATTACKS",
+      "OVERSIZE",
+      "POWERARMOR_COMPATIBLE"
+    ]
   },
   {
     "id": "collarpin",
@@ -766,7 +775,7 @@
     "symbol": "[",
     "color": "yellow",
     "covers": [ "mouth" ],
-    "flags": [ "FANCY", "SKINTIGHT" ]
+    "flags": [ "FANCY", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "gold_ear",
@@ -867,7 +876,7 @@
     "color": "yellow",
     "covers": [ "hand_either" ],
     "coverage": 5,
-    "flags": [ "WATCH", "FANCY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE" ]
+    "flags": [ "WATCH", "FANCY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "tieclip",
@@ -897,7 +906,16 @@
     "color": "light_gray",
     "covers": [ "hand_either" ],
     "coverage": 10,
-    "flags": [ "WATCH", "FANCY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY", "OVERSIZE" ]
+    "flags": [
+      "WATCH",
+      "FANCY",
+      "BELTED",
+      "FRAGILE",
+      "ALLOWS_NATURAL_ATTACKS",
+      "WATER_FRIENDLY",
+      "OVERSIZE",
+      "POWERARMOR_COMPATIBLE"
+    ]
   },
   {
     "id": "silver_bracelet",
@@ -943,7 +961,16 @@
     "color": "yellow",
     "covers": [ "hand_either" ],
     "coverage": 10,
-    "flags": [ "WATCH", "SUPER_FANCY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY", "OVERSIZE" ]
+    "flags": [
+      "WATCH",
+      "SUPER_FANCY",
+      "BELTED",
+      "FRAGILE",
+      "ALLOWS_NATURAL_ATTACKS",
+      "WATER_FRIENDLY",
+      "OVERSIZE",
+      "POWERARMOR_COMPATIBLE"
+    ]
   },
   {
     "id": "small_relic",
@@ -1033,7 +1060,7 @@
     "color": "white",
     "covers": [ "hand_either" ],
     "coverage": 5,
-    "flags": [ "WATCH", "SUPER_FANCY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE" ]
+    "flags": [ "WATCH", "SUPER_FANCY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "platinum_bracelet",
@@ -1064,7 +1091,7 @@
     "symbol": "[",
     "color": "white",
     "covers": [ "mouth" ],
-    "flags": [ "SUPER_FANCY", "SKINTIGHT" ]
+    "flags": [ "SUPER_FANCY", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "platinum_ear",
@@ -1293,7 +1320,16 @@
     "color": "dark_gray",
     "covers": [ "hand_either" ],
     "coverage": 5,
-    "flags": [ "WATCH", "ALARMCLOCK", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY", "OVERSIZE" ]
+    "flags": [
+      "WATCH",
+      "ALARMCLOCK",
+      "BELTED",
+      "FRAGILE",
+      "ALLOWS_NATURAL_ATTACKS",
+      "WATER_FRIENDLY",
+      "OVERSIZE",
+      "POWERARMOR_COMPATIBLE"
+    ]
   },
   {
     "id": "rad_badge",

diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json
@@ -81,7 +81,7 @@
     "covers": [ "legs" ],
     "coverage": 15,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "hot_pants_fur",
@@ -100,7 +100,7 @@
     "coverage": 15,
     "warmth": 10,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "hot_pants_leather",
@@ -119,7 +119,7 @@
     "coverage": 15,
     "warmth": 5,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "jeans",
@@ -225,7 +225,7 @@
     "coverage": 100,
     "warmth": 20,
     "material_thickness": 1,
-    "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "loincloth",

diff --git a/data/json/items/armor/masks.json b/data/json/items/armor/masks.json
@@ -17,7 +17,7 @@
     "encumbrance": 5,
     "warmth": 30,
     "material_thickness": 2,
-    "flags": [ "VARSIZE", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ]
   },
   {
     "id": "bandana",

diff --git a/data/json/items/armor/power_armor.json b/data/json/items/armor/power_armor.json
@@ -52,7 +52,7 @@
     "id": "power_armor_basic",
     "type": "TOOL_ARMOR",
     "name": { "str": "power armor", "str_pl": "suits of power armor" },
-    "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', it's still highly cumbersome when inactive.  There is an integrated chemical resistant bodyglove that precludes wearing other clothing.",
+    "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', it's still highly cumbersome when inactive.  An integrated chemical resistant bodyglove precludes wearing other clothing, aside from most undergarments or handheld equipment like shields.",
     "weight": "55 kg",
     "volume": "100 L",
     "price": "70 kUSD",
@@ -90,7 +90,7 @@
     "looks_like": "power_armor_basic",
     "type": "TOOL_ARMOR",
     "name": { "str": "power armor (active)", "str_pl": "suits of power armor (active)" },
-    "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', it's still highly cumbersome when inactive.  There is an integrated chemical resistant bodyglove that precludes wearing other clothing.  It is currently turned on, activate it to turn it off.",
+    "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', it's still highly cumbersome when inactive.  An integrated chemical resistant bodyglove precludes wearing other clothing, aside from most undergarments or handheld equipment like shields.  It is currently turned on, activate it to turn it off.",
     "extend": { "flags": [ "CLIMATE_CONTROL", "HEAVY_WEAPON_SUPPORT", "TRADER_AVOID" ] },
     "power_draw": 1500000,
     "revert_to": "power_armor_basic",
@@ -111,7 +111,7 @@
     "id": "power_armor_heavy",
     "type": "TOOL_ARMOR",
     "name": { "str": "heavy power armor", "str_pl": "suits of heavy power armor" },
-    "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.",
+    "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.  An integrated chemical resistant bodyglove precludes wearing other clothing, aside from most undergarments or handheld equipment like shields.",
     "weight": "75 kg",
     "volume": "130 L",
     "price": "115 kUSD",
@@ -149,7 +149,7 @@
     "looks_like": "power_armor_heavy",
     "type": "TOOL_ARMOR",
     "name": { "str": "heavy power armor (active)", "str_pl": "suits of heavy power armor (active)" },
-    "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 currently turned on, activate it to turn it off.",
+    "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.  An integrated chemical resistant bodyglove precludes wearing other clothing, aside from most undergarments or handheld equipment like shields.  It is currently turned on, activate it to turn it off.",
     "extend": { "flags": [ "CLIMATE_CONTROL", "HEAVY_WEAPON_SUPPORT", "TRADER_AVOID" ] },
     "power_draw": 2250000,
     "revert_to": "power_armor_heavy",
@@ -170,7 +170,7 @@
     "id": "power_armor_light",
     "type": "TOOL_ARMOR",
     "name": { "str": "light power armor", "str_pl": "suits of light power armor" },
-    "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 much more light and maneuverable.  Unfortunately, the world ended before it could roll out in significant numbers.  There is an integrated chemical resistant bodyglove that precludes wearing other clothing.",
+    "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 much more light and maneuverable.  Unfortunately, the world ended before it could roll out in significant numbers.  An integrated chemical resistant bodyglove precludes wearing other clothing, aside from most undergarments or handheld equipment like shields.",
     "weight": "25 kg",
     "volume": "30 L",
     "price": "115 kUSD",
@@ -207,7 +207,7 @@
     "looks_like": "power_armor_light",
     "type": "TOOL_ARMOR",
     "name": { "str": "light power armor (active)", "str_pl": "suits of light power armor (active)" },
-    "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 much more light and maneuverable.  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 currently turned on, activate it to turn it off.",
+    "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 much more light and maneuverable.  Unfortunately, the world ended before it could roll out in significant numbers.  An integrated chemical resistant bodyglove precludes wearing other clothing, aside from most undergarments or handheld equipment like shields.  It is currently turned on, activate it to turn it off.",
     "extend": { "flags": [ "CLIMATE_CONTROL", "HEAVY_WEAPON_SUPPORT", "TRADER_AVOID" ] },
     "power_draw": 750000,
     "revert_to": "power_armor_light",