Hard Hat attachments retry (#58749)

Co-authored-by: David Seguin <[email protected]>

data/json/flags.json

@@ -262,6 +262,42 @@
     "type": "json_flag",
     "info": "This gear <good>completely protects</good> you from <info>high temperatures</info>."
   },
+  {
+    "id": "HELMET_FACE_SHIELD",
+    "type": "json_flag",
+    "info": "This item is attachable in the front of <info>hard hats and helmets</info> to protect your eyes or face.",
+    "restriction": "Item must be some kind of face shield"
+  },
+  {
+    "id": "HELMET_EAR_ATTACHMENT",
+    "type": "json_flag",
+    "info": "This item is attachable in <info>hard hats and helmets</info> to cover the ears.",
+    "restriction": "Item must be some kind of ear attachment"
+  },
+  {
+    "id": "HELMET_NAPE_PROTECTOR",
+    "type": "json_flag",
+    "info": "This item is attachable in <info>hard hats and helmets</info> as a nape protector.",
+    "restriction": "Item must be some kind of nape protector"
+  },
+  {
+    "id": "HELMET_MANDIBLE_GUARD",
+    "type": "json_flag",
+    "info": "This item is attachable as a mandible guard in military <info>helmets</info> or headgear specifically adapted with rails for attachments.",
+    "restriction": "Item must be some kind of mandible guard"
+  },
+  {
+    "id": "HELMET_MANDIBLE_GUARD_STRAPPED",
+    "type": "json_flag",
+    "info": "This item is attachable as a mandible guard in <info>hard hats and helmets</info>.",
+    "restriction": "Item must be some kind of strapped mandible guard"
+  },
+  {
+    "id": "HELMET_BACK_POUCH",
+    "type": "json_flag",
+    "info": "This item is attachable in the back of <info>hard hats and helmets</info> as a counterweight pouch.",
+    "restriction": "Item must be some kind of back pouch"
+  },
   {
     "id": "COLD_IMMUNE",
     "type": "json_flag",

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -602,14 +602,49 @@
     "//": "Protective helmets or headlamps often worn by technicians and tradesmen.",
     "subtype": "distribution",
     "entries": [
-      { "item": "hat_hard", "prob": 60 },
-      { "item": "hat_hard_hooded", "prob": 15 },
+      { "item": "hat_hard", "prob": 30 },
+      { "group": "hat_hard_modified", "prob": 30 },
+      { "item": "hat_hard_hooded", "prob": 10 },
+      { "group": "hat_hard_hooded_modified", "prob": 5 },
       { "item": "miner_hat", "prob": 10, "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" }
     ]
   },
+  {
+    "id": "hat_hard_modified",
+    "type": "item_group",
+    "subtype": "collection",
+    "container-item": "hat_hard",
+    "items": [
+      { "group": "common_nape_protectors", "prob": 50 },
+      { "group": "common_face_shields", "prob": 15 },
+      { "item": "plastic_chin_guard", "prob": 10 },
+      { "item": "attachable_ear_muffs", "prob": 5 }
+    ]
+  },
+  {
+    "id": "hat_hard_hooded_modified",
+    "type": "item_group",
+    "subtype": "collection",
+    "container-item": "hat_hard_hooded",
+    "items": [ { "group": "common_nape_protectors", "prob": 50 }, { "item": "plastic_chin_guard", "prob": 10 } ]
+  },
+  {
+    "id": "common_nape_protectors",
+    "type": "item_group",
+    "//": "Common nape protectors for a hard hat or helmet.",
+    "subtype": "distribution",
+    "entries": [ { "item": "nape_protector", "prob": 6 }, { "item": "mesh_nape_protector", "prob": 4 } ]
+  },
+  {
+    "id": "common_face_shields",
+    "type": "item_group",
+    "//": "Common face shields for a hard hat.",
+    "subtype": "distribution",
+    "entries": [ { "item": "face_shield_plastic", "prob": 75 }, { "item": "face_shield", "prob": 25 } ]
+  },
   {
     "id": "clothing_work_mask",
     "type": "item_group",
@@ -671,6 +706,11 @@
       [ "boots_steel", 40 ],
       [ "sneakers_steel", 28 ],
       [ "hat_hard", 40 ],
+      [ "mesh_nape_protector", 10 ],
+      [ "nape_protector", 10 ],
+      [ "face_shield_plastic", 10 ],
+      [ "sun_shield", 15 ],
+      [ "attachable_ear_muffs", 5 ],
       [ "mask_dust", 30 ],
       { "item": "mask_filter", "prob": 30, "charges": [ 0, 100 ] },
       [ "glasses_safety", 30 ],
@@ -2807,8 +2847,10 @@
       { "item": "gloves_work", "prob": 45 },
       { "item": "mask_filter", "prob": 30, "charges-min": 0 },
       { "item": "glasses_safety", "prob": 40 },
-      { "item": "hat_hard", "prob": 50 },
-      { "item": "hat_hard_hooded", "prob": 25 },
+      { "item": "hat_hard", "prob": 25 },
+      { "group": "hat_hard_modified", "prob": 25 },
+      { "item": "hat_hard_hooded", "prob": 15 },
+      { "group": "hat_hard_hooded_modified", "prob": 10 },
       { "item": "wearable_light", "prob": 5, "charges": [ 0, 100 ] },
       { "item": "ear_plugs", "prob": 50 },
       { "group": "ammo_any_batteries_full", "prob": 50 },
@@ -3492,7 +3534,8 @@
       {
         "distribution": [
           { "item": "helmet_motor", "prob": 20 },
-          { "item": "helmet_bike", "prob": 50 },
+          { "item": "helmet_bike", "prob": 40 },
+          { "group": "helmet_bike_modified", "prob": 10 },
           { "item": "headgear", "prob": 10 },
           { "item": "helmet_ball", "prob": 15 },
           { "item": "swim_cap", "prob": 10 },

data/json/itemgroups/Clothing_Gear/costumes.json

@@ -68,6 +68,7 @@
       { "item": "leg_bag", "variant": "steampunk_leg_bag", "prob": 15 },
       { "item": "leg_bag", "variant": "skull_leg_bag", "prob": 15 },
       { "item": "clown_nose", "prob": 20 },
+      { "item": "plastic_mandible_guard", "prob": 5 },
       { "item": "leg_sheath6", "prob": 20 },
       { "item": "throwing_knife", "charges-min": 1, "charges-max": 6, "container-item": "leg_sheath6", "prob": 1 },
       { "item": "knife_combat", "container-item": "gartersheath1", "prob": 1 },
@@ -179,6 +180,7 @@
       { "item": "hat_sombrero", "prob": 20 },
       { "item": "cowboy_hat", "prob": 20 },
       { "item": "hat_hard", "prob": 10 },
+      { "item": "plastic_mandible_guard", "container-item": "hat_hard", "prob": 1 },
       { "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 },

data/json/itemgroups/Clothing_Gear/gear_civilian.json

@@ -170,7 +170,8 @@
       { "item": "helmet_ball", "prob": 30 },
       { "item": "hat_ball", "prob": 10 },
       { "item": "hat_golf", "prob": 5 },
-      { "item": "helmet_bike", "prob": 80 }
+      { "item": "helmet_bike", "prob": 70 },
+      { "group": "helmet_bike_modified", "prob": 10 }
     ]
   },
   {

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -1147,7 +1147,10 @@
       },
       {
         "distribution": [
-          { "item": "helmet_bike", "prob": 35 },
+          { "item": "helmet_bike", "prob": 25 },
+          { "group": "helmet_bike_modified", "prob": 10 },
+          { "item": "plastic_chin_guard", "prob": 5 },
+          { "item": "shield_visor", "prob": 10 },
           { "item": "knee_pads", "prob": 35 },
           { "item": "elbow_pads", "prob": 35 },
           { "item": "gloves_leather", "prob": 35 },

data/json/itemgroups/Locations_MapExtras/mansion.json

@@ -852,7 +852,10 @@
       [ "basketball", 50 ],
       [ "beach_volleyball", 40 ],
       [ "indoor_volleyball", 40 ],
-      [ "helmet_bike", 25 ],
+      [ "helmet_bike", 15 ],
+      { "group": "helmet_bike_modified", "prob": 10 },
+      [ "plastic_chin_guard", 10 ],
+      [ "shield_visor", 5 ],
       [ "helmet_ball", 25 ],
       [ "headgear", 20 ],
       [ "mask_hockey", 25 ],

data/json/itemgroups/activities_hobbies.json

@@ -66,7 +66,10 @@
       [ "goggles_ski", 30 ],
       [ "mask_ski", 30 ],
       [ "hat_ball", 30 ],
-      [ "helmet_bike", 35 ],
+      [ "helmet_bike", 25 ],
+      { "group": "helmet_bike_modified", "prob": 10 },
+      [ "plastic_chin_guard", 10 ],
+      [ "shield_visor", 1 ],
       [ "helmet_ball", 45 ],
       [ "baseball", 35 ],
       [ "football", 35 ],
@@ -144,6 +147,13 @@
       [ "fitness_band", 5 ]
     ]
   },
+  {
+    "id": "helmet_bike_modified",
+    "type": "item_group",
+    "subtype": "collection",
+    "container-item": "helmet_bike",
+    "items": [ { "item": "plastic_chin_guard", "prob": 50 }, { "item": "shield_visor", "prob": 10 } ]
+  },
   {
     "type": "item_group",
     "id": "allsporting",