Merge pull request #57093 from bombasticSlacks/rigies

More Rigid Fixes
CleverRaven · Apr 24, 2022 · 07dda6c · 07dda6c
2 parents cc329ef + d30e1f5
commit 07dda6c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/data/json/items/armor/bespoke_armor/custom_headgear.json b/data/json/items/armor/bespoke_armor/custom_headgear.json
@@ -219,7 +219,7 @@
     "warmth": 15,
     "material_thickness": 3,
     "environmental_protection": 10,
-    "flags": [ "VARSIZE", "WATER_FRIENDLY", "STURDY", "OUTER", "HELMET_COMPAT" ],
+    "flags": [ "VARSIZE", "WATER_FRIENDLY", "STURDY", "OUTER", "HELMET_COMPAT", "SOFT" ],
     "armor": [ { "encumbrance": 25, "coverage": 100, "covers": [ "head" ] } ]
   },
   {

diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
@@ -1516,7 +1516,7 @@
     "looks_like": "socks",
     "color": "light_blue",
     "material_thickness": 0.01,
-    "flags": [ "WATERPROOF", "OVERSIZE" ],
+    "flags": [ "WATERPROOF", "OVERSIZE", "SOFT" ],
     "armor": [ { "encumbrance": 3, "coverage": 70, "covers": [ "foot_l", "foot_r" ] } ]
   },
   {

diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json
@@ -114,7 +114,7 @@
     "looks_like": "hat_cotton",
     "color": "dark_gray",
     "material_thickness": 0.1,
-    "flags": [ "OVERSIZE", "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS" ],
+    "flags": [ "OVERSIZE", "WATER_FRIENDLY", "ALLOWS_NATURAL_ATTACKS", "SOFT" ],
     "armor": [ { "coverage": 40, "covers": [ "head" ] } ]
   },
   {
@@ -560,7 +560,7 @@
     "symbol": "[",
     "looks_like": "hat_cotton",
     "color": "yellow",
-    "flags": [ "PSYSHIELD_PARTIAL", "SKINTIGHT", "TRADER_AVOID" ],
+    "flags": [ "PSYSHIELD_PARTIAL", "SKINTIGHT", "TRADER_AVOID", "SOFT" ],
     "armor": [ { "coverage": 90, "covers": [ "head" ] } ]
   },
   {

diff --git a/data/json/items/generic/bedding.json b/data/json/items/generic/bedding.json
@@ -238,7 +238,7 @@
     "warmth": 30,
     "material_thickness": 1,
     "environmental_protection": 1,
-    "flags": [ "OVERSIZE", "OUTER" ],
+    "flags": [ "OVERSIZE", "OUTER", "SOFT" ],
     "armor": [
       {
         "encumbrance": 80,

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -168,8 +168,8 @@
     "warmth": 0,
     "material_thickness": 1,
     "environmental_protection": 1,
-    "flags": [ "BLIND" ],
-    "armor": [ { "encumbrance": 10, "coverage": 95, "covers": [ "eyes" ] } ]
+    "flags": [ "BLIND", "SKINTIGHT" ],
+    "armor": [ { "encumbrance": 10, "coverage": 95, "covers": [ "eyes" ], "rigid_layer_only": true } ]
   },
   {
     "id": "ear_plugs",

diff --git a/data/json/materials.json b/data/json/materials.json
@@ -1505,6 +1505,7 @@
     "fire_resist": 0,
     "elec_resist": 2,
     "chip_resist": 0,
+    "soft": true,
     "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
     "bash_dmg_verb": "ripped",
     "cut_dmg_verb": "cut",