Variantize card games (#73457)

* initial commit * weightles makeshift cards
CleverRaven · May 4, 2024 · 61b7e77 · 61b7e77
1 parent 5136fd1
commit 61b7e77
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 46 deletions.
diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json
@@ -582,7 +582,6 @@
       [ "checkers", 50 ],
       [ "small_checkers", 50 ],
       [ "deck_of_cards", 50 ],
-      [ "cards_magic", 50 ],
       [ "uno", 30 ],
       [ "pictionary", 50 ],
       [ "monopoly", 50 ],
@@ -680,7 +679,7 @@
       "small_chess",
       "checkers",
       "small_checkers",
-      "cards_magic",
+      "deck_of_cards",
       "pictionary",
       "monopoly",
       "dnd",

diff --git a/data/json/items/fluff.json b/data/json/items/fluff.json
@@ -29,28 +29,30 @@
     "symbol": ",",
     "color": "red",
     "flags": [ "NO_REPAIR" ],
-    "use_action": [ "PLAY_GAME" ]
-  },
-  {
-    "id": "uno",
-    "type": "GENERIC",
-    "copy-from": "deck_of_cards",
-    "name": { "str": "deck of Uno cards", "str_pl": "decks of Uno cards" },
-    "description": "A set of Uno cards meant to play a game of Uno with your companions.  Just don't yell Uno too loud to avoid attracting the undead."
-  },
-  {
-    "id": "onirim",
-    "type": "GENERIC",
-    "copy-from": "deck_of_cards",
-    "name": { "str": "deck of Shadowcaser cards", "str_pl": "decks of Shadowcaser cards" },
-    "description": "A set of cards used in the solo or two-player cooperative card game called Shadowcaser.  The deck consists of 76 unique cards.  Shadowcaser is a immersive card game set in a dream world where players find themselves trapped in a mysterious labyrinthine dream.  The objective of the game is for players to escape this dream world by unlocking eight doors before they run out of time or succumb to the nightmares haunting them."
-  },
-  {
-    "id": "deck_of_cards_makeshift",
-    "type": "GENERIC",
-    "copy-from": "deck_of_cards",
-    "name": { "str": "makeshift deck of cards", "str_pl": "makeshift decks of cards" },
-    "description": "A deck of 52 makeshift cards, made out of cardboard rectangles with simple designs drawn on them."
+    "use_action": [ "PLAY_GAME" ],
+    "variants": [
+      {
+        "id": "uno",
+        "name": { "str": "deck of Uno cards", "str_pl": "decks of Uno cards" },
+        "description": "A set of Uno cards meant to play a game of Uno with your companions.  Just don't yell Uno too loud to avoid attracting the undead."
+      },
+      {
+        "id": "onirim",
+        "name": { "str": "deck of Shadowcaser cards", "str_pl": "decks of Shadowcaser cards" },
+        "description": "A set of cards used in the solo or two-player cooperative card game called Shadowcaser.  The deck consists of 76 unique cards.  Shadowcaser is a immersive card game set in a dream world where players find themselves trapped in a mysterious labyrinthine dream.  The objective of the game is for players to escape this dream world by unlocking eight doors before they run out of time or succumb to the nightmares haunting them."
+      },
+      {
+        "id": "cards_magic",
+        "name": { "str": "deck of Sorcery cards", "str_pl": "decks of Sorcery cards" },
+        "description": "A set of cards meant to play the game \"Sorcery.\"  Each card has a fun picture of a different monster."
+      },
+      {
+        "id": "deck_of_cards_makeshift",
+        "name": { "str": "makeshift deck of cards", "str_pl": "makeshift decks of cards" },
+        "description": "A deck of 52 makeshift cards, made out of cardboard rectangles with simple designs drawn on them.",
+        "weight": 0
+      }
+    ]
   },
   {
     "id": "family_photo",
@@ -591,22 +593,6 @@
     "flags": [ "NO_REPAIR" ],
     "use_action": [ "PLAY_GAME" ]
   },
-  {
-    "id": "cards_magic",
-    "type": "GENERIC",
-    "category": "other",
-    "name": { "str": "deck of Sorcery cards", "str_pl": "decks of Sorcery cards" },
-    "description": "A set of cards meant to play the game \"Sorcery.\"  Each card has a fun picture of a different monster.",
-    "weight": "210 g",
-    "volume": "250 ml",
-    "price": "23 USD",
-    "price_postapoc": "5 USD",
-    "material": [ "paper" ],
-    "symbol": "?",
-    "color": "blue",
-    "flags": [ "NO_REPAIR" ],
-    "use_action": [ "PLAY_GAME" ]
-  },
   {
     "id": "pictionary",
     "type": "GENERIC",

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1344,5 +1344,29 @@
     "type": "MIGRATION",
     "replace": "con_mix_foldable",
     "reset_item_vars": true
+  },
+  {
+    "id": "uno",
+    "type": "MIGRATION",
+    "replace": "deck_of_cards",
+    "variant": "uno"
+  },
+  {
+    "id": "onirim",
+    "type": "MIGRATION",
+    "replace": "deck_of_cards",
+    "variant": "onirim"
+  },
+  {
+    "id": "cards_magic",
+    "type": "MIGRATION",
+    "replace": "deck_of_cards",
+    "variant": "cards_magic"
+  },
+  {
+    "id": "deck_of_cards_makeshift",
+    "type": "MIGRATION",
+    "replace": "deck_of_cards",
+    "variant": "deck_of_cards_makeshift"
   }
 ]
diff --git a/data/json/recipes/other/other.json b/data/json/recipes/other/other.json
@@ -29,7 +29,8 @@
     ]
   },
   {
-    "result": "deck_of_cards_makeshift",
+    "result": "deck_of_cards",
+    "variant": "deck_of_cards_makeshift",
     "type": "recipe",
     "activity_level": "NO_EXERCISE",
     "category": "CC_OTHER",

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -5974,11 +5974,11 @@
     "components": [ [ [ "scrap_aluminum", 1 ], [ "plastic_chunk", 2 ] ] ]
   },
   {
-    "result": "cards_magic",
+    "result": "deck_of_cards",
     "type": "uncraft",
     "activity_level": "NO_EXERCISE",
     "time": "2 s",
-    "components": [ [ [ "paper", 20 ] ] ],
+    "components": [ [ [ "cardboard", 20 ] ] ],
     "flags": [ "BLIND_EASY" ]
   },
   {

diff --git a/data/json/starting_missions.json b/data/json/starting_missions.json
@@ -584,7 +584,6 @@
         { "u_has_item": "dnd" },
         { "u_has_item": "g_warhammer" },
         { "u_has_item": "g_warhammer40k" },
-        { "u_has_item": "cards_magic" },
         { "u_has_item": "deck_of_cards" },
         { "u_has_item": "chess" },
         { "u_has_item": "checkers" },

diff --git a/data/mods/MindOverMatter/itemgroups/matrix_technology_labs.json b/data/mods/MindOverMatter/itemgroups/matrix_technology_labs.json
@@ -20,7 +20,6 @@
       { "item": "camera_pro", "prob": 20 },
       { "item": "deck_of_cards", "prob": 15 },
       { "item": "magic_8_ball", "prob": 10 },
-      { "item": "cards_magic", "prob": 5 },
       { "group": "psi_testing_materials", "prob": 50 },
       { "item": "apron_plastic", "prob": 30 },
       { "item": "apron_cotton", "prob": 10 },
@@ -131,7 +130,6 @@
       { "item": "camera_pro", "prob": 20 },
       { "item": "deck_of_cards", "prob": 15 },
       { "item": "magic_8_ball", "prob": 10 },
-      { "item": "cards_magic", "prob": 5 },
       { "group": "psi_testing_materials", "prob": 50 },
       { "item": "chemistry_set", "prob": 4 },
       { "item": "apron_plastic", "prob": 30 },