Update and overhaul survivor masks (#70666)

* updates * Update data/json/items/tool_armor.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * oiled leather * standard enc and recipes * ok then * polycarb it up * Update utility.json * lint and astyle * Update data/json/items/tool_armor.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/tool_armor.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/tool_armor.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/armor/head.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/armor/head.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/armor/head.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/tool_armor.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/tool_armor.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update plastic.json * Update flags.json * Update flag.cpp --------- Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Jan 9, 2024 · 3fa5f33 · 3fa5f33
1 parent 64aedca
commit 3fa5f33
Show file tree

Hide file tree

Showing 20 changed files with 535 additions and 611 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -2372,14 +2372,20 @@
     "type": "json_flag",
     "info": "This is transparent and <info>won't block light</info> from hitting the wearer."
   },
+  {
+    "id": "UNRESTRICTED",
+    "type": "json_flag",
+    "//": "Ignores 'restricts' in mutation jsons.  Only for baggy, draped, adjustable, strapped etc items.",
+    "info": "This clothing is able to <info>accommodate even mutated anatomy</info>."
+  },
   {
     "id": "BLEEDSLOW",
     "type": "json_flag",
-    "info": "The character bleed slower than normal, losing blood at 2/3rds the normal rate."
+    "info": "The character bleeds slower than normal, losing blood at 2/3rds the normal rate."
   },
   {
     "id": "BLEEDSLOW2",
     "type": "json_flag",
-    "info": "The character bleed even slower than normal, losing blood at 1/3rd the normal rate."
+    "info": "The character bleeds even slower than normal, losing blood at 1/3rd the normal rate."
   }
 ]
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -3295,7 +3295,6 @@
       { "item": "mask_gas", "prob": 24, "charges": [ 0, 100 ] },
       { "item": "mask_filter", "prob": 12, "charges": [ 0, 100 ] },
       [ "mask_bunker", 2 ],
-      [ "mask_wsurvivor", 4 ],
       [ "mask_fsurvivor", 2 ],
       [ "sunglasses", 12 ],
       [ "fitover_sunglasses", 8 ],

diff --git a/data/json/items/armor/bespoke_armor/utility.json b/data/json/items/armor/bespoke_armor/utility.json
@@ -97,15 +97,25 @@
     "price": 7500,
     "price_postapoc": 3000,
     "to_hit": -2,
-    "material": [ "kevlar", "leather" ],
+    "material": [ "hard_plastic_transp", "leather_treated" ],
     "symbol": "[",
     "looks_like": "glasses_bal",
     "color": "dark_gray",
     "warmth": 5,
     "material_thickness": 4,
     "environmental_protection": 15,
     "flags": [ "WATER_FRIENDLY", "SUN_GLASSES", "OVERSIZE", "VARSIZE", "STURDY" ],
-    "armor": [ { "encumbrance": 20, "coverage": 100, "covers": [ "eyes" ], "rigid_layer_only": true } ]
+    "armor": [
+      {
+        "material": [
+          { "type": "leather_treated", "covered_by_mat": 20, "thickness": 2 },
+          { "type": "hard_plastic_transp", "covered_by_mat": 100, "thickness": 4 }
+        ],
+        "covers": [ "eyes" ],
+        "coverage": 100,
+        "encumbrance": 25
+      }
+    ]
   },
   {
     "id": "survivor_vest",

diff --git a/data/json/items/armor/eyewear.json b/data/json/items/armor/eyewear.json
@@ -86,7 +86,7 @@
     "price": 7500,
     "price_postapoc": 500,
     "to_hit": -2,
-    "material": [ "plastic", "nylon" ],
+    "material": [ "hard_plastic_transp", "nylon" ],
     "symbol": "[",
     "looks_like": "glasses_safety",
     "color": "dark_gray",

diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
@@ -1077,7 +1077,7 @@
     "price": 32500,
     "price_postapoc": 750,
     "to_hit": -1,
-    "material": [ "plastic", "epoxy", "plastic_pad" ],
+    "material": [ "plastic", "hard_plastic_transp", "epoxy", "plastic_pad" ],
     "symbol": "[",
     "color": "dark_gray",
     "armor": [
@@ -1104,7 +1104,7 @@
       },
       {
         "material": [
-          { "type": "plastic", "covered_by_mat": 100, "thickness": 2.0 },
+          { "type": "hard_plastic_transp", "covered_by_mat": 100, "thickness": 2.0 },
           { "type": "epoxy", "covered_by_mat": 100, "thickness": 0.5 }
         ],
         "covers": [ "eyes" ],
@@ -1115,7 +1115,7 @@
       },
       {
         "material": [
-          { "type": "plastic", "covered_by_mat": 100, "thickness": 2.0 },
+          { "type": "hard_plastic_transp", "covered_by_mat": 100, "thickness": 2.0 },
           { "type": "epoxy", "covered_by_mat": 100, "thickness": 0.5 }
         ],
         "covers": [ "mouth" ],
@@ -1138,7 +1138,7 @@
       },
       {
         "material": [
-          { "type": "plastic", "covered_by_mat": 100, "thickness": 2.0 },
+          { "type": "hard_plastic_transp", "covered_by_mat": 100, "thickness": 2.0 },
           { "type": "epoxy", "covered_by_mat": 100, "thickness": 0.5 },
           { "type": "plastic_pad", "covered_by_mat": 50, "thickness": 16 }
         ],
@@ -1175,6 +1175,7 @@
     "armor": [
       {
         "material": [
+          { "type": "hard_plastic_transp", "covered_by_mat": 40, "thickness": 2.0 },
           { "type": "plastic", "covered_by_mat": 100, "thickness": 2.0 },
           { "type": "epoxy", "covered_by_mat": 100, "thickness": 0.5 },
           { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 16 }

diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json
@@ -29,6 +29,21 @@
     "color": "light_blue",
     "flags": [ "NO_SALVAGE" ]
   },
+  {
+    "id": "polycarbonate_chunk",
+    "type": "TOOL",
+    "category": "spare_parts",
+    "name": { "str": "polycarbonate chunk" },
+    "description": "A hardy and durable piece of polycarbonate.  You could potentially craft items with it.",
+    "weight": "50 g",
+    "volume": "100 ml",
+    "price": 0,
+    "price_postapoc": 10,
+    "material": [ "hard_plastic_transp" ],
+    "symbol": ",",
+    "color": "light_blue",
+    "flags": [ "NO_SALVAGE" ]
+  },
   {
     "id": "10l_plastic",
     "type": "AMMO",
@@ -163,13 +178,13 @@
     "type": "GENERIC",
     "category": "spare_parts",
     "name": { "str": "rigid plastic sheet" },
-    "description": "A large, rigid sheet of translucent plastic, useful for all manner of things; from construction to art, or even amateur snowboarding.",
+    "description": "A large, rigid sheet of transparent polycarbonate, useful for all manner of things; from construction to art, or even amateur snowboarding.",
     "weight": "14875 g",
     "volume": "12500 ml",
     "longest_side": "122 cm",
     "price": 0,
     "price_postapoc": 25,
-    "material": [ "plastic" ],
+    "material": [ "hard_plastic_transp" ],
     "symbol": ")",
     "color": "light_blue"
   }