Variant Undies: Boxer Briefs and Boxer Shorts (#74257)

* VariantsForboxers * Update recipes to prevent id errors * New File for Clothing Snippets Not a great place to put these sort of snippets and most of the others are organized into their own files (IE: Child notes v home photos v EOC etc.) and Karol advised I just make a new file for clothing snippets * Did I Lint? * visions of money * Update data/json/snippets/clothing.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/snippets/clothing.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/snippets/clothing.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/snippets/clothing.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix broken plurals, man I messed up a lot this PR * Just... sigh --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Jun 11, 2024 · e597583 · e597583
1 parent 65c1f96
commit e597583
Show file tree

Hide file tree

Showing 3 changed files with 123 additions and 4 deletions.
diff --git a/data/json/items/armor/undergarment.json b/data/json/items/armor/undergarment.json
@@ -320,7 +320,44 @@
     "warmth": 5,
     "material_thickness": 0.1,
     "flags": [ "VARSIZE", "SKINTIGHT" ],
-    "armor": [ { "coverage": 100, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_hip_l", "leg_hip_r" ] } ]
+    "armor": [ { "coverage": 100, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_hip_l", "leg_hip_r" ] } ],
+    "variants": [
+      {
+        "id": "boxer_brief_basic",
+        "name": { "str": "boxer briefs", "str_pl": "pairs of boxer briefs" },
+        "description": "The age-old question, boxers or briefs?  Your answer?  Yes.",
+        "expand_snippets": true,
+        "weight": 100
+      },
+      {
+        "id": "boxer_brief_makeshift",
+        "name": { "str": "homemade boxer briefs", "str_pl": "pairs of homemade boxer briefs" },
+        "description": "A pair of homemade boxer briefs, a marvel of basic sewing skills.",
+        "expand_snippets": true,
+        "weight": 0
+      },
+      {
+        "id": "boxer_brief_color",
+        "name": { "str": "solid boxer briefs", "str_pl": "pairs of solid boxer briefs" },
+        "description": "A pair of boxer briefs, these are a solid <color> color.",
+        "expand_snippets": true,
+        "weight": 300
+      },
+      {
+        "id": "boxer_brief_hearts",
+        "name": { "str": "heart boxer briefs", "str_pl": "pairs of heart boxer briefs" },
+        "description": "A pair of boxer briefs, adorned with little <color> hearts.",
+        "expand_snippets": true,
+        "weight": 100
+      },
+      {
+        "id": "boxer_brief_day",
+        "name": { "str": "day boxer briefs", "str_pl": "pairs of day boxer briefs" },
+        "description": "A pair of boxer briefs.  Printed across the bottom, in bubble letters, is the word \"<day>.\"",
+        "expand_snippets": true,
+        "weight": 30
+      }
+    ]
   },
   {
     "id": "xlboxer_briefs",
@@ -356,7 +393,57 @@
         "id": "flag_boxer_shorts",
         "name": { "str": "star-spangled boxer shorts", "str_pl": "pairs of star-spangled boxer shorts" },
         "description": "This pair has been printed with the pattern of an American flag, with stars and miniature eagles embroidered at strategic positions.",
-        "append": true
+        "append": true,
+        "weight": 100
+      },
+      {
+        "id": "boxer_shorts_makeshift",
+        "name": { "str": "homemade boxer shorts", "str_pl": "pairs of homemade boxer shorts" },
+        "description": "A pair of homemade boxer shorts, a marvel of basic sewing skills.",
+        "expand_snippets": true,
+        "weight": 0
+      },
+      {
+        "id": "boxer_shorts_color",
+        "name": { "str": "solid boxer shorts", "str_pl": "pairs of solid boxer shorts" },
+        "description": "A pair of boxer shorts, these are a solid <color> color.",
+        "expand_snippets": true,
+        "weight": 400
+      },
+      {
+        "id": "boxer_shorts_hearts",
+        "name": { "str": "heart boxer shorts", "str_pl": "pairs of heart boxer shorts" },
+        "description": "A pair of boxer shorts, adorned with little <color> hearts.",
+        "expand_snippets": true,
+        "weight": 200
+      },
+      {
+        "id": "boxer_shorts_day",
+        "name": { "str": "day boxer shorts", "str_pl": "pairs of day boxer shorts" },
+        "description": "A pair of boxer shorts.  Printed across the bottom, in bubble letters, is the word \"<day>.\"",
+        "expand_snippets": true,
+        "weight": 30
+      },
+      {
+        "id": "boxer_shorts_money",
+        "name": { "str": "money boxer shorts", "str_pl": "pairs of money boxer shorts" },
+        "description": "A pair of boxer shorts adorned with images of hundred dollar bills.",
+        "expand_snippets": true,
+        "weight": 70
+      },
+      {
+        "id": "boxer_shorts_animal",
+        "name": { "str": "animal boxer shorts", "str_pl": "pairs of animal boxer shorts" },
+        "description": "A pair of boxer shorts, these are adorned with little <animals> in a pattern across the entire garment.",
+        "expand_snippets": true,
+        "weight": 70
+      },
+      {
+        "id": "boxer_shorts_cartoon",
+        "name": { "str": "cartoon boxer shorts", "str_pl": "pairs of cartoon boxer shorts" },
+        "description": "A pair of boxer shorts, merchandise for a famous cartoon.  It features <cartoon_blanket>.",
+        "expand_snippets": true,
+        "weight": 70
       }
     ],
     "weight": "42 g",

diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json
@@ -139,13 +139,14 @@
   },
   {
     "result": "boxer_briefs",
+    "variant": "boxer_brief_makeshift",
     "type": "recipe",
     "copy-from": "boy_shorts"
   },
   {
     "result": "xsboxer_briefs",
     "type": "recipe",
-    "copy-from": "boxer_briefs"
+    "copy-from": "boy_shorts"
   },
   {
     "result": "xlboxer_briefs",
@@ -154,13 +155,14 @@
   },
   {
     "result": "boxer_shorts",
+    "variant": "boxer_shorts_makeshift",
     "type": "recipe",
     "copy-from": "boy_shorts"
   },
   {
     "result": "xsboxer_shorts",
     "type": "recipe",
-    "copy-from": "boxer_shorts"
+    "copy-from": "boy_shorts"
   },
   {
     "result": "xlboxer_shorts",

diff --git a/data/json/snippets/clothing.json b/data/json/snippets/clothing.json
@@ -0,0 +1,30 @@
+[
+  {
+    "type": "snippet",
+    "category": "<day>",
+    "//": "This is a snippet category originally made for undergarments, containing the days of the week.",
+    "text": [
+      { "id": "monday", "text": "Monday" },
+      { "id": "tuesday", "text": "Tuesday" },
+      { "id": "wednesday", "text": "Wednesday" },
+      { "id": "thursday", "text": "Thursday" },
+      { "id": "friday", "text": "Friday" },
+      { "id": "saturday", "text": "Saturday" },
+      { "id": "sunday", "text": "Sunday" }
+    ]
+  },
+  {
+    "type": "snippet",
+    "category": "<animals>",
+    "//": "This category was originally made for underwear, so should be appropriate animals that appear on boxers, for example.  Should be plural.",
+    "text": [
+      { "id": "dolphins", "text": "dolphins" },
+      { "id": "chickens", "text": "chickens" },
+      { "id": "cows", "text": "cows" },
+      { "id": "horses", "text": "horses" },
+      { "id": "kittens", "text": "kittens" },
+      { "id": "mice", "text": "mice" },
+      { "id": "puppies", "text": "puppies" }
+    ]
+  }
+]