Add various pride flags (CleverRaven#59932)

* Add various pride flags * put the flags in some itemgroups * Apply suggestions from code review Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> * Update data/json/items/armor/cloaks.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> * Update data/json/items/armor/cloaks.json Co-authored-by: CalamityKing <50556426+CalamityKing@users.noreply.github.com> * Add progress flag, change weights * fix spelling * use copy-from * fix us flag density Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Co-authored-by: CalamityKing <50556426+CalamityKing@users.noreply.github.com>
anothersimulacrum · Aug 7, 2022 · dc9ff8f · dc9ff8f
1 parent dd8d170
commit dc9ff8f
Show file tree

Hide file tree

Showing 10 changed files with 137 additions and 4 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -4274,6 +4274,7 @@
       { "group": "accessory_sportsgear", "prob": 5 },
       { "item": "folding_poncho", "prob": 5 },
       { "item": "american_flag", "prob": 1 },
+      { "item": "pride_flag", "prob": 1 },
       { "item": "tool_belt", "prob": 2 },
       { "item": "leather_belt", "prob": 30 },
       { "item": "wearable_light", "prob": 10, "charges": [ 0, 100 ] },

diff --git a/data/json/itemgroups/Clothing_Gear/costumes.json b/data/json/itemgroups/Clothing_Gear/costumes.json
@@ -91,7 +91,8 @@
       { "item": "jedi_cloak", "prob": 30 },
       { "item": "cloak", "prob": 15 },
       { "item": "cloak_leather", "prob": 20 },
-      { "item": "cloak_wool", "prob": 10 }
+      { "item": "cloak_wool", "prob": 10 },
+      { "item": "pride_flag", "prob": 2 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -72,7 +72,8 @@
     "items": [
       { "group": "ammo_any_batteries_full", "prob": 50 },
       { "item": "radio", "prob": 30, "charges": 100 },
-      { "item": "mp3", "prob": 30, "charges": 100 }
+      { "item": "mp3", "prob": 30, "charges": 100 },
+      { "item": "pride_flag", "prob": 1 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1040,6 +1040,7 @@
       [ "socks_wool", 40 ],
       [ "towel", 40 ],
       [ "can_drink", 30 ],
+      [ "pride_flag", 5 ],
       [ "bottle_plastic", 30 ],
       [ "leathersandals", 30 ],
       [ "leather_belt", 30 ],
@@ -1127,6 +1128,7 @@
       [ "shot_hull", 20 ],
       [ "38_casing", 20 ],
       [ "45_casing", 20 ],
+      [ "pride_flag", 3 ],
       [ "wrapper", 20 ],
       [ "wrapper_foil", 2 ],
       [ "bottle_glass", 10 ],
@@ -1178,6 +1180,7 @@
       [ "45_casing", 20 ],
       [ "tieclip", 20 ],
       [ "splinter", 20 ],
+      [ "pride_flag", 1 ],
       [ "purse", 20 ],
       [ "heels", 20 ],
       [ "cotton_patchwork", 20 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/map_extras.json b/data/json/itemgroups/Locations_MapExtras/map_extras.json
@@ -30,6 +30,7 @@
       { "group": "college_camping", "prob": 50 },
       { "group": "college_camping", "prob": 80 },
       { "group": "SUS_book_nonf_soft", "prob": 20 },
+      { "item": "pride_flag", "prob": 5 },
       { "item": "corpse", "damage": 4 }
     ]
   },
@@ -48,6 +49,7 @@
       { "group": "college_sports", "prob": 50 },
       { "group": "college_sports", "prob": 90 },
       { "group": "SUS_book_sports", "prob": 30 },
+      { "item": "pride_flag", "prob": 2 },
       { "item": "corpse", "damage": 4 }
     ]
   },

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -256,6 +256,7 @@
       [ "glasses_bifocal", 20 ],
       [ "cotton_ball", 20 ],
       [ "contacts", 20 ],
+      { "item": "pride_flag", "prob": 5 },
       { "item": "vitamins", "prob": 20, "charges": [ 1, 20 ] },
       { "item": "aspirin", "prob": 20, "charges": [ 1, 20 ] },
       { "item": "nic_gum", "prob": 20, "charges": [ 1, 10 ] },

diff --git a/data/json/itemgroups/roof.json b/data/json/itemgroups/roof.json
@@ -27,6 +27,8 @@
       [ "bottle_glass", 10 ],
       [ "sharp_rock", 10 ],
       [ "2x4", 10 ],
+      [ "american_flag", 2 ],
+      [ "pride_flag", 2 ],
       [ "pipe", 10 ]
     ]
   },

diff --git a/data/json/itemgroups/stashes.json b/data/json/itemgroups/stashes.json
@@ -295,6 +295,7 @@
       [ "bottle_glass", 40 ],
       [ "creepy_doll", 40 ],
       [ "holy_symbol", 40 ],
+      [ "pride_flag", 20 ],
       [ "spiral_stone", 5 ],
       [ "petrified_eye", 5 ],
       [ "talking_doll", 40 ],

diff --git a/data/json/items/armor/cloaks.json b/data/json/items/armor/cloaks.json
@@ -5,7 +5,7 @@
     "type": "ARMOR",
     "name": { "str": "American flag" },
     "description": "A large American flag, made to fly in even the worst conditions.",
-    "weight": "3404 g",
+    "weight": "3200 g",
     "volume": "2 L",
     "price": 5000,
     "price_postapoc": 50,
@@ -26,6 +26,128 @@
       }
     ]
   },
+  {
+    "id": "pride_flag",
+    "repairs_like": "sheet",
+    "type": "ARMOR",
+    "name": { "str": "pride flag" },
+    "description": "A large rainbow flag, The colors reflect the diversity of the LGBT community and the spectrum of human sexuality and gender.",
+    "copy-from": "american_flag",
+    "symbol": "]",
+    "looks_like": "sheet",
+    "color": "pink",
+    "variant_type": "generic",
+    "variants": [
+      {
+        "id": "rainbow_pride_flag",
+        "name": { "str": "pride flag" },
+        "description": "A large rainbow flag, The colors reflect the diversity of the LGBT community and the spectrum of human sexuality and gender.",
+        "weight": 10
+      },
+      {
+        "id": "progress_pride_flag",
+        "name": { "str": "progress pride flag" },
+        "description": "A large rainbow flag, The colors reflect the diversity of the LGBT community and the spectrum of human sexuality and gender.  On the left side you can see a chevron that features black, brown, light blue, pink, and white stripes to bring those communities to the forefront; \"the arrow points to the right to show forward movement, while being along the left edge shows that progress still needs to be made\".",
+        "weight": 10
+      },
+      {
+        "id": "agender_pride_flag",
+        "name": { "str": "agender flag" },
+        "description": "A large green grey and black agender flag.  The black and white stripes represent complete absence of gender, grey represents being semi-genderless, and green represents non-binary gender.",
+        "weight": 2
+      },
+      {
+        "id": "bisexual_pride_flag",
+        "name": { "str": "bisexual flag" },
+        "description": "A large pink and blue bisexual flag.  The pink stripe represents homosexuality, while the blue stripe represents heterosexuality.  The purple stripe, the \"overlap\" of the blue and pink stripes, purple represents attraction regardless of sex or gender a.k.a bisexuality.",
+        "weight": 5
+      },
+      {
+        "id": "pansexual_pride_flag",
+        "name": { "str": "pansexual flag" },
+        "description": "A large pink, blue and yellow pansexual flag.  The pan-pride flag uses pink for people on the female-spectrum, blue for people on the male-spectrum, and yellow for non-binary or genderqueer people.",
+        "weight": 5
+      },
+      {
+        "id": "labrys_lesbian_pride_flag",
+        "name": { "str": "labrys lesbian flag" },
+        "description": "A large black and purple labrys lesbian flag.  On the flag you can see a labrys, a type of double-headed axe, superimposed on a downward-pointing black triangle, set against a violet background.",
+        "weight": 2
+      },
+      {
+        "id": "lesbian_pride_flag",
+        "name": { "str": "lesbian flag" },
+        "description": "A large pink, white and orange lesbian flag.  The dark orange representing \"gender non-conformity\", orange for \"independence\", light orange for \"community\", white for \"unique relationships to womanhood\", pink for \"serenity and peace\", dusty pink for \"love and sex\", and dark rose for \"femininity\".",
+        "weight": 5
+      },
+      {
+        "id": "asexual_pride_flag",
+        "name": { "str": "asexual flag" },
+        "description": "A large purple, white, grey and black asexual flag.  Black for asexuality (feeling no sexual attraction), grey for grey-asexuality and demisexuality (feeling sexual attraction only sometimes), white for non-asexual partners and allies, and purple for community.",
+        "weight": 2
+      },
+      {
+        "id": "aromantic_pride_flag",
+        "name": { "str": "aromantic flag" },
+        "description": "A large black, grey, white and green aromantic flag.  The green and light green stripes cover everyone under the aromantic spectrum, while represents nonromantic forms of love and attraction, and the gray and black represent all sexualities under the aromantic spectrum.",
+        "weight": 2
+      },
+      {
+        "id": "transgender_pride_flag",
+        "name": { "str": "transgender flag" },
+        "description": "A large white, pink, and blue transgender flag.  The stripes at the top and bottom are light blue, the traditional color for baby boys.  The stripes next to them are pink, the traditional color for baby girls.  The white stripe is for people that are nonbinary, feel that they don't have a gender.  The pattern is such that no matter which way you fly it, it is always correct, signifying finding correctness in one's life.",
+        "weight": 5
+      },
+      {
+        "id": "genderqueer_pride_flag",
+        "name": { "str": "genderqueer flag" },
+        "description": "A large green, white, and purple genderqueer flag.  Lavender, a mixture of blue and pink to represent androgynes and androgyny, white to represent agender identity, and green, the inverse of lavender, to represent all those who fall outside of the gender binary.",
+        "weight": 2
+      },
+      {
+        "id": "intersex_pride_flag",
+        "name": { "str": "intersex flag" },
+        "description": "A large yellow, and purple intersex flag.  It displays a purple circle on a yellow field.  Yellow and purple were chosen as colours as they were viewed as free from gender associations and were historically used to represent intersex people.  The circle is described as \"unbroken and unornamented, symbolizing wholeness and completeness, and our potentialities\".",
+        "weight": 2
+      },
+      {
+        "id": "genderfluid_pride_flag",
+        "name": { "str": "genderfluid flag" },
+        "description": "A large blue, black, purple, white and pink genderfluid flag.  The genderfluid flag has a pink stripe for femininity, a blue stripe for masculinity, a purple stripe for both masculinity and femininity, a black stripe for lack of gender, and a white stripe for all genders.",
+        "weight": 2
+      },
+      {
+        "id": "agender_pride_flag",
+        "name": { "str": "agender flag" },
+        "description": "A large green, white, grey and black agender flag.  The black and white stripes represent complete absence of gender, grey represents being semi-genderless, and green represents non-binary gender.  The symmetry of the pattern makes it so that it's correct no matter how it flies.",
+        "weight": 2
+      },
+      {
+        "id": "nonbinary_pride_flag",
+        "name": { "str": "non-binary flag" },
+        "description": "A large black, purple, white, and yellow non-binary flag.  Yellow for those whose gender exists outside of and without reference to the binary, white for those who have many or all genders, purple for those who feel their gender is between or a mix of female and male, and black for those who feel they are without gender.",
+        "weight": 5
+      },
+      {
+        "id": "polysexual_pride_flag",
+        "name": { "str": "polysexual flag" },
+        "description": "A large blue, green, and pink polysexual flag.  Pink for people on the female-spectrum, blue for people on the male-spectrum, and green for non-binary or genderqueer people.",
+        "weight": 2
+      },
+      {
+        "id": "leather_pride_flag",
+        "name": { "str": "leather flag" },
+        "description": "A large black and blue leather flag.  A horizontally striped black and blue flag with a white band in the midle and red heart in a corner.  The black represents leather; the blue represents devotion, loyalty, and community; the white represents purity and innocence; and the red heart represents love for the community.",
+        "weight": 1
+      },
+      {
+        "id": "bear_pride_flag",
+        "name": { "str": "bear flag" },
+        "description": "A large black and orange international bear brotherhood flag.  The flag displays seven horizontal stripes of colors ranging from black to brown representing the colours of different bear species, you can see a black bear paw in the upper right corner.",
+        "weight": 1
+      }
+    ]
+  },
   {
     "id": "cape_fp",
     "repairs_like": "sheet",

diff --git a/tests/item_test.cpp b/tests/item_test.cpp
@@ -1105,7 +1105,6 @@ static const std::set<itype_id> known_bad = {
     itype_id( "recipe_lab_elec" ), // NOLINT(cata-static-string_id-constants)
     itype_id( "pumpkin_muffins" ), // NOLINT(cata-static-string_id-constants)
     itype_id( "AID_bio_soporific" ), // NOLINT(cata-static-string_id-constants)
-    itype_id( "american_flag" ), // NOLINT(cata-static-string_id-constants)
     itype_id( "test_smart_phone" ), // NOLINT(cata-static-string_id-constants)
     itype_id( "iotv_groin_plate" ), // NOLINT(cata-static-string_id-constants)
     itype_id( "coin_silver" ), // NOLINT(cata-static-string_id-constants)