New hats and caps (#70786)

* Update hats.json * Update hats.json * Update hats.json * Update hats.json * Update hats.json * Update hats.json * Update hats.json * Update masks.json * Update head.json * Update head.json * Update hats.json * Update tool_armor.json * Update hats.json * Update tool_armor.json * Update hats.json * Update head.json * Update hats.json * 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/armor/masks.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 hats.json * Update hats.json * Update hats.json * Update hats.json * Update hats.json * Update costumes.json * Update gear_civilian.json * Update clothing.json * Update clothing.json * Update clothing.json * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/armor/hats.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update clothing.json * Update clothing.json * Update clothing.json * Update clothing.json * Update hats.json * Update professions.json * Update clothing.json * Update costumes.json * Update fontdata.json * Update hats.json * Update hats.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Jan 14, 2024 · 56dadb6 · 56dadb6
1 parent 849ae5c
commit 56dadb6
Show file tree

Hide file tree

Showing 8 changed files with 1,251 additions and 9 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -87,6 +87,17 @@
     "entries": [
       { "item": "balclava", "prob": 50 },
       { "item": "hat_cotton", "prob": 50 },
+      { "item": "beanie_hat", "prob": 25 },
+      { "item": "neckwarmer", "prob": 25 },
+      { "item": "ushanka", "prob": 10 },
+      { "item": "fushanka", "prob": 5 },
+      { "item": "k_beanie", "prob": 5 },
+      { "item": "astrakhan", "prob": 1 },
+      { "item": "fastrakhan", "prob": 1 },
+      { "item": "tyrolean_hat", "prob": 1 },
+      { "item": "coonskin", "prob": 1 },
+      { "item": "fcoonskin", "prob": 1 },
+      { "item": "deerstalker", "prob": 1 },
       { "item": "hat_faux_fur", "prob": 25 },
       { "item": "hat_fur", "prob": 50 },
       { "item": "hat_hunting", "prob": 75 },
@@ -825,6 +836,7 @@
       [ "apron_leather", 10 ],
       { "item": "mask_filter", "prob": 20, "charges": [ 0, 100 ] },
       [ "hat_hard", 50 ],
+      [ "plumber_cap", 1 ],
       { "item": "wearable_light", "prob": 100, "charges": [ 0, 100 ] }
     ]
   },
@@ -1738,6 +1750,29 @@
       [ "scythe_fake", 2 ],
       [ "scythe_toy", 2 ],
       [ "bodysuit_lycra", 5 ],
+      [ "beanie_hat", 20 ],
+      [ "ushanka", 1 ],
+      [ "fushanka", 1 ],
+      [ "k_beanie", 15 ],
+      [ "neckwarmer", 15 ],
+      [ "deerstalker", 1 ],
+      [ "trilby_hat", 10 ],
+      [ "fascinator", 1 ],
+      [ "hat_cloche", 10 ],
+      [ "hat_floppy", 10 ],
+      [ "coonskin", 1 ],
+      [ "fcoonskin", 1 ],
+      [ "conical_hat", 1 ],
+      [ "homburg_hat", 10 ],
+      [ "fez", 1 ],
+      [ "hat_cart", 10 ],
+      [ "tyrolean_hat", 1 ],
+      [ "astrakhan", 1 ],
+      [ "fastrakhan", 1 ],
+      [ "chullo_hat", 5 ],
+      [ "plumber_cap", 1 ],
+      [ "panama_hat", 5 ],
+      [ "boater_hat", 5 ],
       { "group": "independence_all_clothing", "prob": 100, "event": "independence_day" },
       { "group": "christmas_all_clothing", "prob": 100, "event": "christmas" },
       { "group": "costume_all_clothing", "prob": 100, "event": "halloween" }
@@ -1915,9 +1950,19 @@
       [ "long_knit_scarf", 15 ],
       [ "scarf_long", 2 ],
       [ "hat_cotton", 45 ],
+      [ "beanie_hat", 30 ],
       [ "hat_newsboy", 20 ],
       [ "hat_knit", 25 ],
+      [ "k_beanie", 10 ],
       [ "hat_fur", 15 ],
+      [ "ushanka", 1 ],
+      [ "fushanka", 1 ],
+      [ "astrakhan", 1 ],
+      [ "fastrakhan", 1 ],
+      [ "coonskin", 1 ],
+      [ "fcoonskin", 1 ],
+      [ "neckwarmer", 15 ],
+      [ "deerstalker", 1 ],
       [ "hat_faux_fur", 20 ],
       [ "pants_ski", 60 ],
       [ "mask_ski", 15 ],
@@ -1965,7 +2010,7 @@
     "type": "item_group",
     "id": "fur_hats_unisex",
     "subtype": "distribution",
-    "entries": [ { "item": "hat_fur", "prob": 100 } ]
+    "entries": [ { "item": "hat_fur", "prob": 90 }, { "item": "ushanka", "prob": 1 }, { "item": "astrakhan", "prob": 1 } ]
   },
   {
     "type": "item_group",
@@ -1985,6 +2030,10 @@
     "items": [
       [ "hat_fur", 300 ],
       [ "hat_faux_fur", 300 ],
+      [ "ushanka", 10 ],
+      [ "fushanka", 10 ],
+      [ "astrakhan", 5 ],
+      [ "fastrakhan", 5 ],
       [ "sleeveless_trenchcoat_fur", 10 ],
       [ "sleeveless_duster_fur", 10 ],
       [ "sleeveless_trenchcoat_faux_fur", 10 ],
@@ -2026,6 +2075,34 @@
       [ "eboshi", 10 ],
       [ "balclava", 20 ],
       [ "porkpie", 30 ],
+      [ "leather_hatball", 25 ],
+      [ "vizor_hat", 60 ],
+      [ "lvizor_hat", 30 ],
+      [ "trucker_hat", 100 ],
+      [ "ltrucker_hat", 35 ],
+      [ "beanie_hat", 20 ],
+      [ "ushanka", 5 ],
+      [ "fushanka", 5 ],
+      [ "k_beanie", 15 ],
+      [ "deerstalker", 1 ],
+      [ "trilby_hat", 10 ],
+      [ "fascinator", 5 ],
+      [ "hat_cloche", 10 ],
+      [ "hat_floppy", 10 ],
+      [ "coonskin", 1 ],
+      [ "fcoonskin", 1 ],
+      [ "conical_hat", 1 ],
+      [ "homburg_hat", 10 ],
+      [ "fez", 1 ],
+      [ "hat_cart", 10 ],
+      [ "tyrolean_hat", 1 ],
+      [ "astrakhan", 1 ],
+      [ "fastrakhan", 1 ],
+      [ "propeller_hat", 10 ],
+      [ "chullo_hat", 10 ],
+      [ "plumber_cap", 5 ],
+      [ "panama_hat", 15 ],
+      [ "boater_hat", 15 ],
       { "group": "costume_hats_hoods", "prob": 450, "event": "halloween" },
       { "group": "christmas_hats", "prob": 450, "event": "christmas" }
     ]
@@ -2039,6 +2116,7 @@
       [ "long_knit_scarf", 30 ],
       [ "scarf_long", 30 ],
       [ "bandana", 100 ],
+      [ "neckwarmer", 30 ],
       [ "hairpin", 50 ],
       [ "fc_hairpin", 20 ],
       [ "barrette", 30 ]
@@ -2325,6 +2403,29 @@
       { "item": "hat_sombrero", "prob": 3 },
       { "item": "hat_fur", "prob": 15 },
       { "item": "hat_faux_fur", "prob": 20 },
+      { "item": "beanie_hat", "prob": 30 },
+      { "item": "ushanka", "prob": 1 },
+      { "item": "fushanka", "prob": 1 },
+      { "item": "k_beanie", "prob": 10 },
+      { "item": "neckwarmer", "prob": 15 },
+      { "item": "deerstalker", "prob": 1 },
+      { "item": "trilby_hat", "prob": 10 },
+      { "item": "fascinator", "prob": 5 },
+      { "item": "hat_cloche", "prob": 10 },
+      { "item": "hat_floppy", "prob": 10 },
+      { "item": "coonskin", "prob": 1 },
+      { "item": "fcoonskin", "prob": 1 },
+      { "item": "conical_hat", "prob": 1 },
+      { "item": "homburg_hat", "prob": 10 },
+      { "item": "fez", "prob": 1 },
+      { "item": "hat_cart", "prob": 10 },
+      { "item": "tyrolean_hat", "prob": 1 },
+      { "item": "astrakhan", "prob": 1 },
+      { "item": "fastrakhan", "prob": 1 },
+      { "item": "chullo_hat", "prob": 5 },
+      { "item": "plumber_cap", "prob": 1 },
+      { "item": "panama_hat", "prob": 8 },
+      { "item": "boater_hat", "prob": 8 },
       { "item": "under_armor", "prob": 20 },
       { "item": "under_armor_shorts", "prob": 20 },
       { "item": "tights", "prob": 20 },
@@ -3323,6 +3424,7 @@
       [ "holster", 6 ],
       [ "nylon_holster", 8 ],
       [ "bandana", 18 ],
+      [ "neckwarmer", 8 ],
       [ "scarf", 26 ],
       [ "long_knit_scarf", 15 ],
       { "item": "mask_gas_xl", "prob": 4, "charges": [ 0, 100 ] },
@@ -3431,6 +3533,7 @@
       { "item": "helmet_kabuto", "prob": 50, "damage": [ 2, 4 ] },
       { "item": "helmet_nasal", "prob": 50, "damage": [ 2, 4 ] },
       { "item": "helmet_galea", "prob": 40, "damage": [ 2, 4 ] },
+      { "item": "conical_hat", "prob": 5, "damage": [ 2, 4 ] },
       { "item": "chainmail_junk_hood", "prob": 30, "damage": [ 2, 4 ] }
     ]
   },
@@ -3462,7 +3565,19 @@
       { "item": "duster", "prob": 15 },
       { "item": "peacoat", "prob": 30 },
       { "item": "tophat", "prob": 10 },
+      { "item": "deerstalker", "prob": 1 },
       { "item": "hat_ball", "prob": 40 },
+      { "item": "leather_hatball", "prob": 15 },
+      { "item": "trucker_hat", "prob": 40 },
+      { "item": "ltrucker_hat", "prob": 15 },
+      { "item": "beanie_hat", "prob": 20 },
+      { "item": "k_beanie", "prob": 10 },
+      { "item": "deerstalker", "prob": 1 },
+      { "item": "trilby_hat", "prob": 15 },
+      { "item": "homburg_hat", "prob": 5 },
+      { "item": "tyrolean_hat", "prob": 1 },
+      { "item": "propeller_hat", "prob": 1 },
+      { "item": "plumber_cap", "prob": 1 },
       { "item": "fedora", "prob": 15 },
       { "item": "hat_cotton", "prob": 30 },
       { "item": "hat_knit", "prob": 20 },
@@ -3537,7 +3652,9 @@
       [ "scarf", 45 ],
       [ "scarf_long", 1 ],
       [ "hat_cotton", 45 ],
+      [ "beanie_hat", 30 ],
       [ "hat_knit", 25 ],
+      [ "k_beanie", 15 ],
       [ "hat_newsboy", 20 ],
       [ "under_armor", 20 ],
       [ "under_armor_shorts", 20 ],
@@ -3654,6 +3771,7 @@
     "type": "item_group",
     "items": [
       [ "bandana", 25 ],
+      [ "neckwarmer", 5 ],
       [ "boxer_shorts", 25 ],
       { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 5 },
       { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" },
@@ -3666,6 +3784,7 @@
       [ "socks_ankle", 30 ],
       [ "stockings", 20 ],
       [ "hat_cotton", 35 ],
+      [ "beanie_hat", 15 ],
       [ "copper_bracelet", 10 ],
       [ "sunglasses", 25 ],
       [ "tieclip", 15 ],
@@ -3674,6 +3793,7 @@
       [ "santa_hat", 4 ],
       [ "vampire_fangs", 5 ],
       [ "mask_skull", 4 ],
+      [ "deerstalker", 1 ],
       [ "ankle_wallet_pouch", 5 ]
     ]
   },
@@ -3725,8 +3845,15 @@
         "distribution": [
           { "item": "hat_hunting", "prob": 20 },
           { "item": "hat_faux_fur", "prob": 10 },
+          { "item": "fushanka", "prob": 1 },
+          { "item": "fcoonskin", "prob": 1 },
+          { "item": "fastrakhan", "prob": 1 },
+          { "item": "ushanka", "prob": 1 },
+          { "item": "coonskin", "prob": 1 },
+          { "item": "astrakhan", "prob": 1 },
           { "item": "hat_fur", "prob": 5 },
           { "item": "hat_boonie", "prob": 15 },
+          { "item": "hat_bucket", "prob": 20 },
           { "item": "cowl_wool", "prob": 15 },
           { "item": "hood_rain", "prob": 25 }
         ],
@@ -3743,15 +3870,32 @@
           { "item": "straw_fedora", "prob": 5 },
           { "item": "hat_golf", "prob": 15 },
           { "item": "straw_hat", "prob": 15 },
+          { "item": "panama_hat", "prob": 10 },
+          { "item": "boater_hat", "prob": 10 },
           { "item": "beret_wool", "prob": 5 },
           { "item": "beret", "prob": 10 },
+          { "item": "trilby_hat", "prob": 10 },
+          { "item": "homburg_hat", "prob": 10 },
+          { "item": "hat_cloche", "prob": 10 },
+          { "item": "hat_floppy", "prob": 10 },
+          { "item": "fez", "prob": 1 },
+          { "item": "hat_cart", "prob": 10 },
+          { "item": "tyrolean_hat", "prob": 1 },
           { "item": "porkpie", "prob": 15 }
         ],
         "prob": 50
       },
       { "item": "hat_knit", "prob": 30 },
       { "item": "hat_cotton", "prob": 40 },
+      { "item": "beanie_hat", "prob": 25 },
+      { "item": "k_beanie", "prob": 35 },
+      { "item": "chullo_hat", "prob": 15 },
       { "item": "hat_ball", "prob": 50 },
+      { "item": "leather_hatball", "prob": 15 },
+      { "item": "vizor_hat", "prob": 25 },
+      { "item": "lvizor_hat", "prob": 10 },
+      { "item": "trucker_hat", "prob": 50 },
+      { "item": "ltrucker_hat", "prob": 10 },
       { "group": "costume_hats_hoods", "prob": 1 },
       { "group": "costume_hats_hoods", "prob": 80, "event": "halloween" }
     ]
@@ -3763,6 +3907,7 @@
     "subtype": "distribution",
     "items": [
       { "item": "bondage_mask", "prob": 5 },
+      { "item": "neckwarmer", "prob": 15 },
       { "item": "mask_dust", "prob": 15 },
       { "item": "mask_guy_fawkes", "prob": 1 },
       { "item": "mask_hockey", "prob": 10 },
@@ -3794,6 +3939,7 @@
       { "item": "bandana", "prob": 90 },
       { "item": "balclava", "prob": 50 },
       { "item": "headscarf", "prob": 50 },
+      { "item": "neckwarmer", "prob": 25 },
       { "item": "scarf_fur_long", "prob": 10 },
       { "item": "scarf_fur", "prob": 20 },
       { "item": "scarf", "prob": 80 },

diff --git a/data/json/itemgroups/Clothing_Gear/costumes.json b/data/json/itemgroups/Clothing_Gear/costumes.json
@@ -212,6 +212,26 @@
       { "item": "bandana_head", "prob": 5 },
       { "item": "fedora", "prob": 10 },
       { "item": "porkpie", "prob": 10 },
+      { "item": "ushanka", "prob": 8 },
+      { "item": "fushanka", "prob": 8 },
+      { "item": "deerstalker", "prob": 10 },
+      { "item": "fascinator", "prob": 10 },
+      { "item": "trilby_hat", "prob": 10 },
+      { "item": "hat_cloche", "prob": 5 },
+      { "item": "hat_floppy", "prob": 10 },
+      { "item": "coonskin", "prob": 5 },
+      { "item": "fcoonskin", "prob": 5 },
+      { "item": "conical_hat", "prob": 10 },
+      { "item": "homburg_hat", "prob": 10 },
+      { "item": "fez", "prob": 5 },
+      { "item": "hat_cart", "prob": 10 },
+      { "item": "tyrolean_hat", "prob": 5 },
+      { "item": "astrakhan", "prob": 5 },
+      { "item": "fastrakhan", "prob": 5 },
+      { "item": "propeller_hat", "prob": 10 },
+      { "item": "plumber_cap", "prob": 15 },
+      { "item": "panama_hat", "prob": 8 },
+      { "item": "boater_hat", "prob": 8 },
       { "item": "nun_wimple", "prob": 12 }
     ]
   },
@@ -273,6 +293,7 @@
       { "item": "face_veil", "prob": 10 },
       { "item": "mask_plague", "prob": 15 },
       { "item": "pumpkin_mask", "prob": 10 },
+      { "item": "neckwarmer", "prob": 5 },
       { "item": "zombie_mask", "prob": 10 }
     ]
   },
@@ -392,6 +413,9 @@
       { "item": "flag_jumpsuit", "prob": 25 },
       { "item": "flag_shirt", "prob": 25 },
       { "item": "pants", "variant": "pants_flag", "prob": 25 },
+      { "item": "hat_ball", "variant": "america_hatball", "prob": 25 },
+      { "item": "trucker_hat", "variant": "american_truckball", "prob": 25 },
+      { "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 15 },
       { "item": "american_flag", "prob": 25 },
       { "group": "costume_independence_undergarments_women", "prob": 25 },
       { "item": "rashguard", "variant": "flag_rashguard_shirt", "prob": 15 },

diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -199,6 +199,10 @@
       { "item": "hat_golf", "prob": 5 },
       { "item": "helmet_bike", "prob": 70 },
       { "item": "helmet_riding", "prob": 5 },
+      { "item": "propeller_hat", "prob": 15 },
+      { "item": "beanie_hat", "prob": 5 },
+      { "item": "k_beanie", "prob": 5 },
+      { "item": "plumber_cap", "prob": 3 },
       { "group": "helmet_bike_modified", "prob": 10 }
     ]
   },