Guy Fawkes mask audit (#81000)

* initial commit

* Update data/json/itemgroups/Clothing_Gear/clothing.json

* Update data/json/itemgroups/Clothing_Gear/clothing.json

---------

Co-authored-by: Maleclypse <[email protected]>

Author: BalthazarArgall

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -3822,7 +3822,7 @@
     "items": [
       { "item": "bondage_mask", "prob": 5 },
       { "item": "mask_dust", "prob": 15 },
-      { "item": "mask_guy_fawkes", "prob": 1 },
+      { "item": "mask_skull", "variant": "guy_fawkes", "prob": 1 },
       { "item": "mask_hockey", "prob": 10 },
       { "item": "mouthpiece", "prob": 5 },
       { "item": "mask_filter", "prob": 5, "charges": [ 0, 100 ] },

data/json/itemgroups/Clothing_Gear/costumes.json

@@ -259,7 +259,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "santa_beard", "prob": 20 },
-      { "item": "mask_guy_fawkes", "prob": 10 },
+      { "item": "mask_skull", "variant": "guy_fawkes", "prob": 10 },
       { "item": "mask_hockey", "prob": 20 },
       { "item": "bondage_mask", "prob": 5 },
       { "item": "blindfold", "prob": 5 },

data/json/itemgroups/Clothing_Gear/gear_civilian.json

@@ -277,7 +277,7 @@
       [ "textbook_computer", 8 ],
       [ "textbook_anarch", 4 ],
       [ "computer_science", 7 ],
-      [ "mask_guy_fawkes", 5 ],
+      { "item": "mask_skull", "variant": "guy_fawkes", "prob": 5 },
       [ "solar_cell", 5 ],
       [ "SICP", 3 ],
       [ "recipe_serum", 2 ],

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -1860,7 +1860,7 @@
       { "prob": 1, "group": "heroin_bag_zipper_1_4" },
       [ "sneakers", 40 ],
       [ "mask_hockey", 5 ],
-      [ "mask_guy_fawkes", 5 ],
+      { "item": "mask_skull", "variant": "guy_fawkes", "prob": 5 },
       [ "scarf_long", 15 ],
       [ "jersey", 20 ],
       [ "coat_lab", 40 ],
@@ -2017,7 +2017,7 @@
       [ "hackerman_computer", 10 ],
       [ "webbasics_computer", 10 ],
       [ "cookbook", 35 ],
-      [ "mask_guy_fawkes", 5 ],
+      { "item": "mask_skull", "variant": "guy_fawkes", "prob": 5 },
       [ "cookbook_italian", 25 ],
       [ "cookbook_mexican", 14 ],
       [ "manual_electronics", 20 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -342,7 +342,7 @@
       [ "hat_chef", 5 ],
       [ "jacket_chef", 5 ],
       { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },
-      [ "mask_guy_fawkes", 5 ],
+      { "item": "mask_skull", "variant": "guy_fawkes", "prob": 5 },
       { "item": "camera", "prob": 10, "charges": [ 0, 150 ] },
       { "item": "geiger_off", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "rad_monitor", "prob": 1, "charges": [ 0, 50 ] },

data/json/itemgroups/Locations_MapExtras/mansion.json

@@ -1072,7 +1072,7 @@
       [ "heels", 20 ],
       [ "cotton_patchwork", 20 ],
       { "group": "tinware", "prob": 20 },
-      [ "mask_guy_fawkes", 10 ],
+      { "item": "mask_skull", "variant": "guy_fawkes", "prob": 10 },
       [ "gold_ear", 10 ],
       [ "bone_tainted", 5 ],
       [ "silver_ear", 5 ],

data/json/itemgroups/collections_domestic.json

@@ -481,7 +481,7 @@
       { "item": "seed_poppy_bud", "prob": 5 },
       { "item": "rolling_paper", "prob": 5 },
       { "item": "mask_hockey", "prob": 5 },
-      { "item": "mask_guy_fawkes", "prob": 5 },
+      { "item": "mask_skull", "variant": "guy_fawkes", "prob": 5 },
       { "item": "hockey_stick", "prob": 10 },
       { "item": "throat_guard_nylon", "prob": 3 },
       { "item": "throat_guard_canvas", "prob": 3 },
@@ -1053,7 +1053,7 @@
       { "item": "leathersandals", "prob": 25 },
       { "item": "espadrilles", "prob": 15 },
       { "item": "survnote", "prob": 2 },
-      { "item": "mask_guy_fawkes", "prob": 5 },
+      { "item": "mask_skull", "variant": "guy_fawkes", "prob": 5 },
       { "item": "magnifying_glass", "prob": 2 },
       { "item": "holy_symbol", "prob": 5 },
       { "item": "pet_carrier", "prob": 3 },

data/json/items/armor/masks.json

@@ -281,27 +281,6 @@
       }
     ]
   },
-  {
-    "id": "mask_guy_fawkes",
-    "type": "ITEM",
-    "subtypes": [ "ARMOR" ],
-    "category": "armor",
-    "name": { "str": "Guy Fawkes mask" },
-    "description": "Remember, remember, the fifth of November.",
-    "weight": "45 g",
-    "volume": "750 ml",
-    "price": "40 USD",
-    "price_postapoc": "10 cent",
-    "material": [ "plastic" ],
-    "symbol": "[",
-    "looks_like": "mask_hockey",
-    "color": "white",
-    "warmth": 5,
-    "material_thickness": 0.2,
-    "environmental_protection": 1,
-    "flags": [ "WATER_FRIENDLY" ],
-    "armor": [ { "encumbrance": 10, "coverage": 95, "covers": [ "eyes", "mouth" ] } ]
-  },
   {
     "id": "mask_hockey",
     "type": "ITEM",
@@ -414,6 +393,11 @@
         "description": "It's a plastic mask of a lonely spirit.",
         "weight": 15,
         "append": true
+      },
+      {
+        "id": "guy_fawkes",
+        "name": { "str": "Guy Fawkes mask" },
+        "description": "Remember, remember, the fifth of November."
       }
     ]
   },

data/json/obsoletion_and_migration_0.I/migration_items.json

@@ -2556,6 +2556,12 @@
     "replace": "balclava",
     "variant": "skull"
   },
+  {
+    "type": "MIGRATION",
+    "id": "mask_guy_fawkes",
+    "replace": "mask_skull",
+    "variant": "guy_fawkes"
+  },
   {
     "type": "MIGRATION",
     "id": "robofac_head_rig_ir",

tests/ranged_balance_test.cpp

@@ -71,7 +71,7 @@ static const itype_id itype_gloves_wraps_fur( "gloves_wraps_fur" );
 static const itype_id itype_hk_mp5( "hk_mp5" );
 static const itype_id itype_holo_sight( "holo_sight" );
 static const itype_id itype_m14ebr( "m14ebr" );
-static const itype_id itype_mask_guy_fawkes( "mask_guy_fawkes" );
+static const itype_id itype_mask_skull( "mask_skull" );
 static const itype_id itype_mossberg_590( "mossberg_590" );
 static const itype_id itype_mossberg_930( "mossberg_930" );
 static const itype_id itype_mp40semi( "mp40semi" );
@@ -294,7 +294,7 @@ TEST_CASE( "unskilled_shooter_accuracy", "[ranged] [balance] [slow]" )
     standard_npc shooter( "Shooter", shooter_pos, {}, 0, 8, 8, 8, 7 );
     shooter.set_body();
     shooter.worn.wear_item( shooter, item( itype_backpack ), false, false );
-    equip_shooter( shooter, { itype_bastsandals, itype_armguard_hard, itype_armguard_soft, itype_test_armor_chitin, itype_beekeeping_gloves, itype_mask_guy_fawkes, itype_cowboy_hat } );
+    equip_shooter( shooter, { itype_bastsandals, itype_armguard_hard, itype_armguard_soft, itype_test_armor_chitin, itype_beekeeping_gloves, itype_mask_skull, itype_cowboy_hat } );
     assert_encumbrance( shooter, 10 );
 
     SECTION( "an unskilled shooter with a common pistol" ) {