Hard hats love (#58020)

* Hard hats variants * Vitals covered and changed weight * Spawns * Mods * Correct mistakes * Json lint * Update dictionary.txt * Update hats.json * Update hats.json * Orange does not exists
CleverRaven · May 31, 2022 · 9e22069 · 9e22069
1 parent b28db36
commit 9e22069
Show file tree

Hide file tree

Showing 7 changed files with 276 additions and 28 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -544,7 +544,9 @@
       { "item": "hat_hard", "prob": 60 },
       { "item": "hat_hard_hooded", "prob": 15 },
       { "item": "miner_hat", "prob": 10, "charges": [ 0, 100 ] },
-      { "item": "wearable_light", "prob": 15, "charges": [ 0, 100 ] }
+      { "item": "wearable_light", "prob": 15, "charges": [ 0, 100 ] },
+      { "item": "hat_hard", "variant": "flag_hat_hard", "prob": 70, "event": "independence_day" },
+      { "item": "hat_hard_hooded", "variant": "flag_hat_hard", "prob": 20, "event": "independence_day" }
     ]
   },
   {
@@ -2770,10 +2772,10 @@
     "id": "fireman_head",
     "items": [
       [ "firehelmet", 60 ],
-      [ "hat_knit", 10 ],
+      [ "hat_knit", 5 ],
       [ "nomex_hood", 40 ],
-      [ "hat_hard", 5 ],
-      [ "hat_hard_hooded", 3 ],
+      { "item": "hat_hard", "variant": "red_hat_hard", "prob": 15 },
+      { "item": "hat_hard_hooded", "variant": "red_hat_hard", "prob": 6 },
       [ "hat_noise_cancelling", 5 ]
     ]
   },

diff --git a/data/json/itemgroups/Clothing_Gear/costumes.json b/data/json/itemgroups/Clothing_Gear/costumes.json
@@ -178,6 +178,12 @@
       { "item": "santa_hat", "prob": 25 },
       { "item": "hat_sombrero", "prob": 20 },
       { "item": "cowboy_hat", "prob": 20 },
+      { "item": "hat_hard", "prob": 10 },
+      { "item": "hat_hard_hooded", "prob": 1 },
+      { "item": "hat_hard", "variant": "skull_hat_hard", "prob": 10 },
+      { "item": "hat_hard_hooded", "variant": "skull_hat_hard", "prob": 1 },
+      { "item": "hat_hard", "variant": "steampunk_hat_hard", "prob": 10 },
+      { "item": "hat_hard_hooded", "variant": "steampunk_hat_hard", "prob": 1 },
       { "item": "clown_wig", "prob": 15 },
       { "item": "tricorne", "prob": 5 },
       { "item": "wizard_hat_costume", "prob": 25 },
@@ -363,7 +369,9 @@
       { "item": "american_flag", "prob": 25 },
       { "group": "costume_independence_undergarments_women", "prob": 25 },
       { "item": "rashguard", "variant": "flag_rashguard_shirt", "prob": 15 },
-      { "item": "mask_dust", "variant": "flag_mask_dust", "prob": 15 }
+      { "item": "mask_dust", "variant": "flag_mask_dust", "prob": 15 },
+      { "item": "hat_hard", "variant": "flag_hat_hard", "prob": 10 },
+      { "item": "hat_hard_hooded", "variant": "flag_hat_hard", "prob": 1 }
     ]
   },
   {

diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json
@@ -363,8 +363,8 @@
     "id": "hat_hard",
     "type": "ARMOR",
     "name": { "str": "hard hat" },
-    "description": "A hard plastic hat worn in construction sites.  Excellent protection from cuts and percussion.",
-    "weight": "796 g",
+    "description": "A hard plastic hat worn in construction or industrial sites.  Excellent protection from cuts and percussion.",
+    "weight": "430 g",
     "volume": "2500 ml",
     "price": 1200,
     "price_postapoc": 250,
@@ -378,15 +378,136 @@
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "WATERPROOF", "PADDED" ],
-    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 80, "covers": [ "head" ] } ]
+    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 80, "cover_vitals": 90, "covers": [ "head" ] } ],
+    "variant_type": "generic",
+    "variants": [
+      {
+        "id": "yellow_hat_hard",
+        "name": { "str": "yellow hard hat" },
+        "description": "It's colored yellow, commonly used by general, unspecialized workers like laborers and operators of heavy machinery.",
+        "weight": 110,
+        "append": true
+      },
+      {
+        "id": "orange_hat_hard",
+        "name": { "str": "orange hard hat" },
+        "description": "It's colored orange, commonly used by road construction workers and new hires or site visitors.",
+        "color": "light_red",
+        "weight": 110,
+        "append": true
+      },
+      {
+        "id": "white_hat_hard",
+        "name": { "str": "white hard hat" },
+        "description": "It's colored white, commonly used by anyone in a supervisory position, including managers, architects, engineers and foremen.",
+        "color": "white",
+        "weight": 25,
+        "append": true
+      },
+      {
+        "id": "brown_hat_hard",
+        "name": { "str": "brown hard hat" },
+        "description": "It's colored brown, commonly used by workers using applications involving high heat such as welders.",
+        "color": "brown",
+        "weight": 15,
+        "append": true
+      },
+      {
+        "id": "blue_hat_hard",
+        "name": { "str": "blue hard hat" },
+        "description": "It's colored blue, commonly used by medical workers and electricians, as well as employees in a technical advisory role.",
+        "color": "blue",
+        "weight": 15,
+        "append": true
+      },
+      {
+        "id": "green_hat_hard",
+        "name": { "str": "green hard hat" },
+        "description": "It's colored green, commonly used by safety officers or inspectors.",
+        "color": "green",
+        "weight": 10,
+        "append": true
+      },
+      {
+        "id": "red_hat_hard",
+        "name": { "str": "red hard hat" },
+        "description": "It's colored red, commonly used by emergency workers and firefighters.",
+        "color": "red",
+        "weight": 10,
+        "append": true
+      },
+      {
+        "id": "pink_hat_hard",
+        "name": { "str": "pink hard hat" },
+        "description": "It's colored pink, commonly used by female workers or issued as punishment to regular workers that forgot or lost their hard hat.",
+        "color": "pink",
+        "weight": 8,
+        "append": true
+      },
+      {
+        "id": "grey_hat_hard",
+        "name": { "str": "grey hard hat" },
+        "description": "It's colored grey, commonly used by visitors to any worksite.",
+        "color": "light_gray",
+        "weight": 5,
+        "append": true
+      },
+      {
+        "id": "black_hat_hard",
+        "name": { "str": "black hard hat" },
+        "description": "It's colored black like the first real hard hats in history.",
+        "color": "dark_gray",
+        "weight": 4,
+        "append": true
+      },
+      {
+        "id": "cartoon_hat_hard",
+        "name": { "str": "cartoon hard hat" },
+        "description": "It has cartoon characters stickers all over it.",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "camo_hat_hard",
+        "name": { "str": "camo hard hat" },
+        "description": "It's painted in camouflage dye.",
+        "color": "green",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "skull_hat_hard",
+        "name": { "str": "skull hard hat" },
+        "description": "It's colored white and has skull decorations.",
+        "color": "white",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "flag_hat_hard",
+        "name": { "str": "flag hard hat" },
+        "description": "It's embroidered with the pattern of an American flag.  Protects your head with the power of freedom.",
+        "color": "light_red",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "steampunk_hat_hard",
+        "name": { "str": "steampunk hard hat" },
+        "description": "It's colored black, with industrial gears decorations and a steampunk design.",
+        "color": "dark_gray",
+        "weight": 1,
+        "append": true
+      }
+    ]
   },
   {
     "id": "hat_hard_hooded",
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "hooded hard hat" },
-    "description": "A hard plastic hat worn in construction sites, with a cloth tucked in under it to serve as a makeshift hood.  Makes it a bit more comfortable to wear, and better protects the neck from sun and rain.",
-    "weight": "876 g",
+    "description": "A hard plastic hat worn in construction or industrial sites, with a cloth tucked in under it to serve as a makeshift hood.  Makes it a bit more comfortable to wear, and better protects the neck from sun and rain.",
+    "weight": "470 g",
     "volume": "2750 ml",
     "price": 1200,
     "price_postapoc": 300,
@@ -400,7 +521,128 @@
     "techniques": [ "WBLOCK_1" ],
     "environmental_protection": 2,
     "flags": [ "WATERPROOF", "PADDED" ],
-    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 80, "covers": [ "head" ] } ]
+    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 80, "cover_vitals": 90, "covers": [ "head" ] } ],
+    "variant_type": "generic",
+    "variants": [
+      {
+        "id": "yellow_hat_hard",
+        "name": { "str": "yellow hooded hard hat" },
+        "description": "It's colored yellow, commonly used by general, unspecialized workers like laborers and operators of heavy machinery.",
+        "weight": 110,
+        "append": true
+      },
+      {
+        "id": "orange_hat_hard",
+        "name": { "str": "orange hooded hard hat" },
+        "description": "It's colored orange, commonly used by road construction workers and new hires or site visitors.",
+        "color": "light_red",
+        "weight": 110,
+        "append": true
+      },
+      {
+        "id": "white_hat_hard",
+        "name": { "str": "white hooded hard hat" },
+        "description": "It's colored white, commonly used by anyone in a supervisory position, including managers, architects, engineers and foremen.",
+        "color": "white",
+        "weight": 25,
+        "append": true
+      },
+      {
+        "id": "brown_hat_hard",
+        "name": { "str": "brown hooded hard hat" },
+        "description": "It's colored brown, commonly used by workers using applications involving high heat such as welders.",
+        "color": "brown",
+        "weight": 15,
+        "append": true
+      },
+      {
+        "id": "blue_hat_hard",
+        "name": { "str": "blue hooded hard hat" },
+        "description": "It's colored blue, commonly used by medical workers and electricians, as well as employees in a technical advisory role.",
+        "color": "blue",
+        "weight": 15,
+        "append": true
+      },
+      {
+        "id": "green_hat_hard",
+        "name": { "str": "green hooded hard hat" },
+        "description": "It's colored green, commonly used by safety officers or inspectors.",
+        "color": "green",
+        "weight": 10,
+        "append": true
+      },
+      {
+        "id": "red_hat_hard",
+        "name": { "str": "red hooded hard hat" },
+        "description": "It's colored red, commonly used by emergency workers and firefighters.",
+        "color": "red",
+        "weight": 10,
+        "append": true
+      },
+      {
+        "id": "pink_hat_hard",
+        "name": { "str": "pink hooded hard hat" },
+        "description": "It's colored pink, commonly used by female workers or issued as punishment to regular workers that forgot or lost their hard hat.",
+        "color": "pink",
+        "weight": 8,
+        "append": true
+      },
+      {
+        "id": "grey_hat_hard",
+        "name": { "str": "grey hooded hard hat" },
+        "description": "It's colored grey, commonly used by visitors to any worksite.",
+        "color": "light_gray",
+        "weight": 5,
+        "append": true
+      },
+      {
+        "id": "black_hat_hard",
+        "name": { "str": "black hooded hard hat" },
+        "description": "It's colored black like the first real hard hats in history.",
+        "color": "dark_gray",
+        "weight": 4,
+        "append": true
+      },
+      {
+        "id": "cartoon_hat_hard",
+        "name": { "str": "cartoon hooded hard hat" },
+        "description": "It has cartoon characters stickers all over it.",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "camo_hat_hard",
+        "name": { "str": "camo hooded hard hat" },
+        "description": "It's painted in camouflage dye.",
+        "color": "green",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "skull_hat_hard",
+        "name": { "str": "skull hooded hard hat" },
+        "description": "It's colored white and has skull decorations.",
+        "color": "white",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "flag_hat_hard",
+        "name": { "str": "flag hooded hard hat" },
+        "description": "It's embroidered with the pattern of an American flag.  Protects your head with the power of freedom.",
+        "color": "light_red",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "steampunk_hat_hard",
+        "name": { "str": "steampunk hooded hard hat" },
+        "description": "It's colored black, with industrial gears decorations and a steampunk design.",
+        "color": "dark_gray",
+        "weight": 1,
+        "append": true
+      }
+    ]
   },
   {
     "id": "hat_hunting",

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -3822,19 +3822,9 @@
     "points": 3,
     "items": {
       "both": {
-        "items": [
-          "socks",
-          "boots_steel",
-          "gloves_work",
-          "jumpsuit",
-          "canteen",
-          "tool_belt",
-          "mbag",
-          "briefcase",
-          "wristwatch",
-          "hat_hard"
-        ],
+        "items": [ "socks", "boots_steel", "gloves_work", "jumpsuit", "canteen", "tool_belt", "mbag", "briefcase", "wristwatch" ],
         "entries": [
+          { "item": "hat_hard", "variant": "yellow_hat_hard" },
           { "group": "charged_matches" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "dynamite", "count": 8 },

diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json
@@ -9,8 +9,9 @@
     "skills": [ { "level": 4, "name": "electronics" }, { "level": 2, "name": "launcher" } ],
     "items": {
       "both": {
-        "items": [ "hat_hard", "jumpsuit", "socks", "rope_30", "boots", "afs_herc_rig" ],
+        "items": [ "jumpsuit", "socks", "rope_30", "boots", "afs_herc_rig" ],
         "entries": [
+          { "item": "hat_hard", "variant": "blue_hat_hard" },
           { "item": "afs_foamgun", "ammo-item": "afs_foamcrete", "charges": 30 },
           { "item": "afs_foam_tank", "ammo-item": "afs_foamcrete", "charges": 30 }
         ]
@@ -30,8 +31,8 @@
     "skills": [ { "level": 3, "name": "electronics" }, { "level": 3, "name": "mechanics" } ],
     "items": {
       "both": {
-        "items": [ "hat_hard", "spacer_jumpsuit", "spacer_cap", "socks", "boots", "duct_tape", "screwdriver", "wristwatch" ],
-        "entries": [ { "item": "wrench", "container-item": "tool_belt" } ]
+        "items": [ "spacer_jumpsuit", "spacer_cap", "socks", "boots", "duct_tape", "screwdriver", "wristwatch" ],
+        "entries": [ { "item": "hat_hard", "variant": "orange_hat_hard" }, { "item": "wrench", "container-item": "tool_belt" } ]
       },
       "male": [ "briefs" ],
       "female": [ "sports_bra", "boy_shorts" ]

diff --git a/data/mods/package_bionic_professions/bionic_professions.json b/data/mods/package_bionic_professions/bionic_professions.json
@@ -652,8 +652,12 @@
     ],
     "items": {
       "both": {
-        "items": [ "socks", "jeans", "leather_belt", "boots_steel", "gloves_work", "glasses_safety", "hat_hard", "wristwatch" ],
-        "entries": [ { "group": "charged_smart_phone" }, { "item": "tshirt", "variant": "generic_tshirt" } ]
+        "items": [ "socks", "jeans", "leather_belt", "boots_steel", "gloves_work", "glasses_safety", "wristwatch" ],
+        "entries": [
+          { "item": "hat_hard", "variant": "yellow_hat_hard" },
+          { "group": "charged_smart_phone" },
+          { "item": "tshirt", "variant": "generic_tshirt" }
+        ]
       },
       "male": [ "briefs" ],
       "female": [ "sports_bra", "panties" ]

diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
@@ -1853,6 +1853,7 @@ unselectable
 unsettlingly
 unsiatable
 unskillfully
+unspecialized
 unstocked
 untampered
 untargeted