feat(balance): re-add submaterial to survivor suits, use ballistic ar…

…mor overrides (#6116) feat(balance): re-add submartial to survivor suits, use ballistic armor overrides
cataclysmbnteam · Feb 24, 2025 · b99608e · b99608e
1 parent b38e683
commit b99608e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
@@ -526,6 +526,7 @@
     "storage": "10 L",
     "warmth": 15,
     "material_thickness": 6,
+    "resistance": { "bullet": 25 },
     "valid_mods": [ "steel_padded", "alloy_padded" ],
     "environmental_protection": 10,
     "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "RAINPROOF", "STURDY" ]
@@ -596,6 +597,7 @@
     "warmth": 15,
     "material_thickness": 6,
     "environmental_protection": 3,
+    "resistance": { "bullet": 35 },
     "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
   },
   {
@@ -614,23 +616,24 @@
     "copy-from": "lsurvivor_suit",
     "type": "ARMOR",
     "name": { "str": "light superalloy survivor suit" },
-    "description": "A lightweight, hand-built combination armor made from a bulletproof vest and a jumpsuit, all reinforced with superalloy.  It's fairly protective, but less so than a thicker, more comprehensive suit.",
-    "material": [ "kevlar", "superalloy" ],
+    "description": "A lightweight, hand-built combination armor made from a bulletproof vest and a fabric jumpsuit, all reinforced with superalloy.  It's fairly protective, but less so than a thicker, more comprehensive suit.",
+    "material": [ "kevlar", "superalloy", "cotton" ],
     "color": "light_cyan",
     "encumbrance": 23,
-    "material_thickness": 5,
+    "material_thickness": 6,
+    "resistance": { "bullet": 30 },
     "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
   },
   {
     "id": "lsurvivor_suit",
     "type": "ARMOR",
     "name": { "str": "light survivor suit" },
-    "description": "A lightweight, hand-built combination armor made from a cut-down bulletproof vest and a reinforced jumpsuit.  Protects from the elements as well as from harm.",
+    "description": "A lightweight, hand-built combination armor made from a cut-down bulletproof vest and a reinforced fabric jumpsuit.  Protects from the elements as well as from harm.",
     "weight": "5100 g",
     "volume": "10500 ml",
     "price": "1100 USD",
     "price_postapoc": "50 USD",
-    "material": [ "kevlar" ],
+    "material": [ "kevlar", "cotton" ],
     "symbol": "[",
     "looks_like": "survivor_suit",
     "color": "green",
@@ -639,9 +642,10 @@
     "encumbrance": 20,
     "storage": "15 L",
     "warmth": 10,
-    "material_thickness": 4,
+    "material_thickness": 5,
     "valid_mods": [ "steel_padded", "alloy_padded" ],
     "environmental_protection": 3,
+    "resistance": { "bullet": 25 },
     "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
   },
   {
@@ -742,7 +746,7 @@
     "volume": "11500 ml",
     "price": "1500 USD",
     "price_postapoc": "50 USD",
-    "material": [ "kevlar" ],
+    "material": [ "kevlar", "leather" ],
     "symbol": "[",
     "looks_like": "touring_suit",
     "color": "brown",
@@ -751,9 +755,10 @@
     "encumbrance": 25,
     "storage": "15 L",
     "warmth": 15,
-    "material_thickness": 5,
+    "material_thickness": 6,
     "valid_mods": [ "steel_padded", "alloy_padded" ],
     "environmental_protection": 3,
+    "resistance": { "bullet": 30 },
     "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
   },
   {
@@ -818,7 +823,7 @@
     "price_postapoc": "50 USD",
     "to_hit": -3,
     "bashing": 6,
-    "material": [ "kevlar" ],
+    "material": [ "kevlar", "fur" ],
     "symbol": "[",
     "looks_like": "survivor_suit",
     "color": "light_gray",
@@ -827,9 +832,10 @@
     "encumbrance": 30,
     "storage": "6 L",
     "warmth": 75,
-    "material_thickness": 5,
+    "material_thickness": 6,
     "valid_mods": [ "steel_padded", "alloy_padded" ],
     "environmental_protection": 5,
+    "resistance": { "bullet": 30 },
     "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
   },
   {

diff --git a/data/json/items/armor/swimming.json b/data/json/items/armor/swimming.json
@@ -107,6 +107,7 @@
     "warmth": 15,
     "material_thickness": 4,
     "environmental_protection": 10,
+    "resistance": { "bullet": 25 },
     "flags": [ "VARSIZE", "WATER_FRIENDLY", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
   },
   {