Mask love (CleverRaven#57298)

* Mask variants * Professions and special spawns * Update costumes.json * Mods
Xaritscin · Apr 30, 2022 · 4974cb9 · 4974cb9
1 parent 08f7ccb
commit 4974cb9
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 37 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -3240,7 +3240,8 @@
       { "item": "mouthpiece", "prob": 5 },
       { "item": "mask_filter", "prob": 5, "charges": [ 0, 100 ] },
       { "group": "costume_masks", "prob": 5 },
-      { "group": "costume_masks", "prob": 25, "event": "halloween" }
+      { "group": "costume_masks", "prob": 25, "event": "halloween" },
+      { "item": "mask_dust", "variant": "flag_mask_dust", "prob": 20, "event": "independence_day" }
     ]
   },
   {

diff --git a/data/json/itemgroups/Clothing_Gear/costumes.json b/data/json/itemgroups/Clothing_Gear/costumes.json
@@ -227,7 +227,10 @@
       { "item": "bondage_mask", "prob": 5 },
       { "item": "balaclava_skull", "prob": 25 },
       { "item": "mask_skull", "prob": 20 },
-      { "item": "scarf_long", "prob": 10 }
+      { "item": "scarf_long", "prob": 10 },
+      { "item": "mask_dust", "variant": "skull_mask_dust", "prob": 20 },
+      { "item": "mask_dust", "variant": "steampunk_mask_dust", "prob": 15 },
+      { "item": "mask_dust", "variant": "flag_mask_dust", "prob": 15 }
     ]
   },
   {
@@ -333,7 +336,8 @@
       { "item": "flag_shirt", "prob": 25 },
       { "item": "flag_pants", "prob": 25 },
       { "item": "american_flag", "prob": 25 },
-      { "group": "costume_independence_undergarments_women", "prob": 25 }
+      { "group": "costume_independence_undergarments_women", "prob": 25 },
+      { "item": "mask_dust", "variant": "flag_mask_dust", "prob": 15 }
     ]
   },
   {

diff --git a/data/json/items/armor/masks.json b/data/json/items/armor/masks.json
@@ -164,7 +164,80 @@
     "warmth": 5,
     "material_thickness": 0.1,
     "environmental_protection": 2,
-    "armor": [ { "encumbrance": 8, "coverage": 100, "covers": [ "mouth" ] } ]
+    "armor": [ { "encumbrance": 8, "coverage": 100, "covers": [ "mouth" ] } ],
+    "variant_type": "generic",
+    "variants": [
+      {
+        "id": "white_mask_dust",
+        "name": { "str": "white dust mask" },
+        "description": "It's a clean white color, like the ones doctors use.",
+        "weight": 40,
+        "append": true
+      },
+      {
+        "id": "blue_mask_dust",
+        "name": { "str": "blue dust mask" },
+        "description": "It's colored light blue.",
+        "weight": 25,
+        "append": true
+      },
+      {
+        "id": "black_mask_dust",
+        "name": { "str": "black dust mask" },
+        "description": "It's colored black.",
+        "weight": 15,
+        "append": true
+      },
+      {
+        "id": "flower_mask_dust",
+        "name": { "str": "flower dust mask" },
+        "description": "It's yellow and decorated in a pattern full of flowers.",
+        "weight": 6,
+        "append": true
+      },
+      {
+        "id": "camo_mask_dust",
+        "name": { "str": "camo dust mask" },
+        "description": "It's painted in camouflage dye.",
+        "weight": 4,
+        "append": true
+      },
+      {
+        "id": "mustache_mask_dust",
+        "name": { "str": "mustache dust mask" },
+        "description": "It has a large mustache painted on it.",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "skull_mask_dust",
+        "name": { "str": "skull dust mask" },
+        "description": "It's black and with a skull mouth decoration.",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "cartoon_mask_dust",
+        "name": { "str": "cartoon dust mask" },
+        "description": "It has cartoon characters painted on it.",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "steampunk_mask_dust",
+        "name": { "str": "steampunk dust mask" },
+        "description": "It's colored black and with a steampunk design.  Very fashionable.",
+        "weight": 2,
+        "append": true
+      },
+      {
+        "id": "flag_mask_dust",
+        "name": { "str": "flag dust mask" },
+        "description": "It's embroidered with the pattern of an American flag.  Perfect for a real patriot.",
+        "weight": 2,
+        "append": true
+      }
+    ]
   },
   {
     "id": "mask_guy_fawkes",

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -1370,21 +1370,23 @@
     "skills": [ { "level": 2, "name": "firstaid" }, { "level": 1, "name": "cooking" } ],
     "proficiencies": [ "prof_wound_care" ],
     "items": {
-      "both": [
-        "pants",
-        "dress_shirt",
-        "mask_dust",
-        "gloves_medical",
-        "socks",
-        "dress_shoes",
-        "coat_lab",
-        "water_clean",
-        "bandages",
-        "adhesive_bandages",
-        "aspirin",
-        "stethoscope",
-        "pudding"
-      ],
+      "both": {
+        "items": [
+          "pants",
+          "dress_shirt",
+          "gloves_medical",
+          "socks",
+          "dress_shoes",
+          "coat_lab",
+          "water_clean",
+          "bandages",
+          "adhesive_bandages",
+          "aspirin",
+          "stethoscope",
+          "pudding"
+        ],
+        "entries": [ { "item": "mask_dust", "variant": "white_mask_dust" } ]
+      },
       "male": [ "boxer_shorts" ],
       "female": [ "bra", "panties" ]
     }
@@ -4152,15 +4154,18 @@
           "gloves_medical",
           "wristwatch",
           "boots",
-          "mask_dust",
           "mbag",
           "bandages",
           "stethoscope",
           "scissors",
           "syringe",
           "morphine"
         ],
-        "entries": [ { "group": "charged_smart_phone" }, { "group": "full_1st_aid" } ]
+        "entries": [
+          { "group": "charged_smart_phone" },
+          { "group": "full_1st_aid" },
+          { "item": "mask_dust", "variant": "white_mask_dust" }
+        ]
       },
       "male": [ "boxer_shorts" ],
       "female": [ "bra", "panties" ]
@@ -4220,7 +4225,7 @@
           { "item": "water_clean", "container-item": "canteen" },
           { "item": "legpouch_large", "contents-group": "army_mags_m4" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "mask_dust", "custom-flags": [ "no_auto_equip" ] },
+          { "item": "mask_dust", "variant": "camo_mask_dust", "custom-flags": [ "no_auto_equip" ] },
           { "item": "stethoscope", "custom-flags": [ "no_auto_equip" ] },
           { "item": "knife_combat", "container-item": "sheath" },
           {
@@ -4529,7 +4534,10 @@
     "description": "You are a true American patriot, dressed with star-spangled clothing from head to toes.  The government has fallen, but the nation lives on with its people.",
     "points": -1,
     "items": {
-      "both": { "items": [ "american_flag", "socks", "sneakers", "wristwatch" ], "entries": [ { "group": "charged_smart_phone" } ] },
+      "both": {
+        "items": [ "american_flag", "socks", "sneakers", "wristwatch" ],
+        "entries": [ { "group": "charged_smart_phone" }, { "item": "mask_dust", "variant": "flag_mask_dust" } ]
+      },
       "male": [ "flag_shirt", "flag_pants", "flag_swimsuit" ],
       "female": {
         "items": [ "flag_jumpsuit" ],

diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json
@@ -215,18 +215,8 @@
     "skills": [ { "level": 4, "name": "electronics" } ],
     "items": {
       "both": {
-        "items": [
-          "coat_lab",
-          "gloves_medical",
-          "mask_dust",
-          "longshirt",
-          "afs_complete_bionic_toolkit",
-          "socks",
-          "boots",
-          "backpack",
-          "jeans"
-        ],
-        "entries": [ { "item": "cash_card", "charges": 50000 } ]
+        "items": [ "coat_lab", "gloves_medical", "longshirt", "afs_complete_bionic_toolkit", "socks", "boots", "backpack", "jeans" ],
+        "entries": [ { "item": "cash_card", "charges": 50000 }, { "item": "mask_dust", "variant": "white_mask_dust" } ]
       },
       "male": [ "briefs" ],
       "female": [ "bra", "panties" ]

diff --git a/data/mods/package_bionic_professions/bionic_professions.json b/data/mods/package_bionic_professions/bionic_professions.json
@@ -282,7 +282,6 @@
         "items": [
           "gloves_medical",
           "socks",
-          "mask_dust",
           "dress_shirt",
           "pants",
           "dress_shoes",
@@ -294,7 +293,12 @@
           "oxycodone",
           "wristwatch"
         ],
-        "entries": [ { "group": "charged_smart_phone" }, { "group": "full_1st_aid" }, { "item": "medium_battery_cell", "charges": 500 } ]
+        "entries": [
+          { "group": "charged_smart_phone" },
+          { "group": "full_1st_aid" },
+          { "item": "medium_battery_cell", "charges": 500 },
+          { "item": "mask_dust", "variant": "white_mask_dust" }
+        ]
       },
       "male": [ "boxer_shorts" ],
       "female": [ "bra", "panties" ]