From f42c78fadeef4579714b399e541917c406081f72 Mon Sep 17 00:00:00 2001
From: Kamejeir <99511880+Kamejeir@users.noreply.github.com>
Date: Sun, 19 May 2024 22:28:53 +0200
Subject: [PATCH] Ski mask is now a tube scarf

---
 data/json/items/tool_armor.json | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
index 9bdea887f2485..caef4ec632677 100644
--- a/data/json/items/tool_armor.json
+++ b/data/json/items/tool_armor.json
@@ -2988,47 +2988,61 @@
     "color": "dark_gray",
     "use_action": {
       "type": "transform",
-      "menu_text": "Loosen",
+      "menu_text": "Wear as collar",
       "msg": "You adjust your ski mask for less warmth.",
       "target": "mask_ski_loose"
     },
     "symbol": "[",
-    "description": "A warm wool mask that protects the head and face from the cold.  It has a full face opening that can be adjusted to set how much is exposed.",
+    "description": "A warm wool mask that protects the head and face from the cold.  It covers most of your head and mouth, and can be adjusted to hang around your throat instead.",
     "price": "18 USD",
     "price_postapoc": "2 USD 50 cent",
     "material": [ "wool" ],
     "volume": "250 ml",
-    "warmth": 45,
+    "warmth": 25,
     "flags": [ "VARSIZE", "SKINTIGHT" ],
     "material_thickness": 1,
     "environmental_protection": 2,
-    "armor": [ { "encumbrance": 10, "coverage": 80, "covers": [ "head", "mouth" ] } ]
+    "armor": [
+      {
+        "encumbrance": 6,
+        "coverage": 100,
+        "covers": [ "head" ],
+        "//:": "not forehead or nape",
+        "specifically_covers": [ "head_crown", "head_ear_r", "head_ear_l", "head_throat" ]
+      },
+      {
+        "encumbrance": 10,
+        "coverage": 100,
+        "covers": [ "mouth" ],
+        "specifically_covers": [ "mouth_lips", "mouth_cheeks", "mouth_chin" ]
+      }
+    ]
   },
   {
     "type": "TOOL_ARMOR",
     "id": "mask_ski_loose",
-    "name": { "str": "ski mask (open)", "str_pl": "ski masks (open)" },
+    "name": { "str": "ski mask (collar)", "str_pl": "ski masks (collar)" },
     "category": "clothing",
     "weight": "86 g",
     "color": "dark_gray",
     "use_action": {
       "type": "transform",
-      "menu_text": "Tighten",
+      "menu_text": "Wear around head",
       "msg": "You adjust your ski mask for more warmth.",
       "target": "mask_ski"
     },
     "revert_to": "mask_ski",
     "symbol": "[",
-    "description": "A warm wool mask that protects the head and face from the cold.  It has a full face opening that can be adjusted to set how much is exposed.",
+    "description": "A warm wool mask that protects the head and face from the cold.  It is wrapped around your throat, and can be adjusted to cover your mouth and more of your head.",
     "price": "18 USD",
     "price_postapoc": "2 USD 50 cent",
     "material": [ "wool" ],
     "volume": "250 ml",
     "warmth": 25,
-    "flags": [ "VARSIZE", "SKINTIGHT" ],
+    "flags": [ "VARSIZE", "SKINTIGHT", "COLLAR" ],
     "material_thickness": 1,
     "environmental_protection": 1,
-    "armor": [ { "encumbrance": 10, "coverage": 60, "covers": [ "head", "mouth" ] } ]
+    "armor": [ { "encumbrance": 4, "coverage": 20, "covers": [ "head" ], "specifically_covers": [ "head_nape", "head_throat" ] } ]
   },
   {
     "type": "TOOL_ARMOR",