From aa66f1d32af955c686bb4531ddac339c6e68cde7 Mon Sep 17 00:00:00 2001
From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:44:22 -0500
Subject: [PATCH] [MoM] Add Zener cards (#66788)

* Add and distribute Zener cards

* item -> group
---
 .../effectoncondition/eoc_misc.json           | 81 +++++++++++++++++++
 .../MindOverMatter/itemgroups/itemgroups.json | 22 +++++
 data/mods/MindOverMatter/items/misc.json      | 22 +++++
 .../mapgen/nested/office_phavian_modular.json |  1 +
 4 files changed, 126 insertions(+)
 create mode 100644 data/mods/MindOverMatter/effectoncondition/eoc_misc.json
 create mode 100644 data/mods/MindOverMatter/items/misc.json

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_misc.json b/data/mods/MindOverMatter/effectoncondition/eoc_misc.json
new file mode 100644
index 0000000000000..1d6f1d39b8095
--- /dev/null
+++ b/data/mods/MindOverMatter/effectoncondition/eoc_misc.json
@@ -0,0 +1,81 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_ZENER_DECK",
+    "condition": { "math": [ "u_val('spell_level', 'school: CLAIRSENTIENT')", ">=", "10" ] },
+    "effect": [
+      {
+        "switch": { "rand": 4 },
+        "cases": [
+          {
+            "case": 0,
+            "effect": [
+              {
+                "u_message": "You draw the hollow circle card, just as you knew you would.  You look at it for a moment and put it back in the deck."
+              }
+            ]
+          },
+          {
+            "case": 1,
+            "effect": [
+              {
+                "u_message": "You draw the three wavy lines card, just as you knew you would.  You look at it for a moment and put it back in the deck."
+              }
+            ]
+          },
+          {
+            "case": 2,
+            "effect": [
+              {
+                "u_message": "You draw the hollow square card, just as you knew you would.  You look at it for a moment and put it back in the deck."
+              }
+            ]
+          },
+          {
+            "case": 3,
+            "effect": [
+              {
+                "u_message": "You draw the five-pointed star card, just as you knew you would.  You look at it for a moment and put it back in the deck."
+              }
+            ]
+          },
+          {
+            "case": 4,
+            "effect": [
+              {
+                "u_message": "You draw the plus symbol card, just as you knew you would.  You look at it for a moment and put it back in the deck."
+              }
+            ]
+          }
+        ]
+      }
+    ],
+    "false_effect": [
+      {
+        "switch": { "rand": 4 },
+        "cases": [
+          {
+            "case": 0,
+            "effect": [ { "u_message": "You draw the hollow circle card, look at it for a moment, and put it back in the deck." } ]
+          },
+          {
+            "case": 1,
+            "effect": [ { "u_message": "You draw the three wavy lines card, look at it for a moment, and put it back in the deck." } ]
+          },
+          {
+            "case": 2,
+            "effect": [ { "u_message": "You draw the hollow square card, look at it for a moment, and put it back in the deck." } ]
+          },
+          {
+            "case": 3,
+            "effect": [ { "u_message": "You draw the five-pointed star card, look at it for a moment, and put it back in the deck." } ]
+          },
+          {
+            "case": 4,
+            "effect": [ { "u_message": "You draw the plus symbol card, look at it for a moment, and put it back in the deck." } ]
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/data/mods/MindOverMatter/itemgroups/itemgroups.json b/data/mods/MindOverMatter/itemgroups/itemgroups.json
index 911dcda948160..a6283ad8f2710 100644
--- a/data/mods/MindOverMatter/itemgroups/itemgroups.json
+++ b/data/mods/MindOverMatter/itemgroups/itemgroups.json
@@ -171,6 +171,7 @@
       { "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 },
       { "item": "salt_water", "prob": 20, "charges-min": 1 },
@@ -185,6 +186,7 @@
       { "item": "manual_meditation", "prob": 20 },
       { "item": "manual_meditation_int", "prob": 12 },
       { "item": "manual_psionics_advan", "prob": 4 },
+      { "item": "phavian_report_psionic_drain", "prob": 3 },
       { "item": "schematics_matrix_crystal_ground", "prob": 7 },
       { "item": "schematics_reactant_liquid_base", "prob": 7 },
       { "item": "schematics_matrix_channeling", "prob": 4 },
@@ -202,6 +204,26 @@
     "subtype": "distribution",
     "items": [ { "item": "lab_postit_portal", "prob": 3 }, { "item": "lab_postit_psi", "prob": 3 } ]
   },
+  {
+    "id": "psi_testing_materials",
+    "type": "item_group",
+    "subtype": "distribution",
+    "items": [
+      { "item": "cards_zener", "prob": 30 },
+      { "item": "file", "prob": 50 },
+      { "item": "deck_of_cards", "prob": 30 },
+      { "item": "pen", "prob": 30 },
+      { "item": "blue_pen", "prob": 20 },
+      { "item": "green_pen", "prob": 20 },
+      { "item": "red_pen", "prob": 30 },
+      { "item": "envelope", "prob": 30 },
+      { "item": "paper", "prob": 40 },
+      { "item": "blindfold", "prob": 20 },
+      { "item": "coin_quarter", "prob": 5 },
+      { "item": "coin_dime", "prob": 2 },
+      { "item": "coin_penny", "prob": 3 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",
diff --git a/data/mods/MindOverMatter/items/misc.json b/data/mods/MindOverMatter/items/misc.json
new file mode 100644
index 0000000000000..ae7c10984c7a7
--- /dev/null
+++ b/data/mods/MindOverMatter/items/misc.json
@@ -0,0 +1,22 @@
+[
+  {
+    "id": "cards_zener",
+    "type": "GENERIC",
+    "category": "other",
+    "name": { "str": "deck of Zener cards", "str_pl": "decks of Zener cards" },
+    "description": "A deck of Zener cards, used pre-Catalcysm to test for psychic ability.",
+    "weight": "23 g",
+    "volume": "29 ml",
+    "price": 1314,
+    "price_postapoc": 2,
+    "material": [ "cardboard" ],
+    "symbol": ",",
+    "color": "magenta",
+    "flags": [ "NO_REPAIR" ],
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Pick a card.  Any card.",
+      "effect_on_conditions": [ "EOC_ZENER_DECK" ]
+    }
+  }
+]
diff --git a/data/mods/MindOverMatter/mapgen/nested/office_phavian_modular.json b/data/mods/MindOverMatter/mapgen/nested/office_phavian_modular.json
index e312c8176500b..18022f2c6afcb 100644
--- a/data/mods/MindOverMatter/mapgen/nested/office_phavian_modular.json
+++ b/data/mods/MindOverMatter/mapgen/nested/office_phavian_modular.json
@@ -578,6 +578,7 @@
       "palettes": [ "office_phavian_palette" ],
       "place_item": [
         { "item": "deck_of_cards", "x": 2, "y": 5, "chance": 60 },
+        { "item": "cards_zener", "x": 2, "y": 5, "chance": 80 },
         { "item": "pen", "x": 2, "y": 5, "chance": 60 },
         { "item": "blue_pen", "x": 2, "y": 5, "chance": 60 },
         { "item": "green_pen", "x": 2, "y": 5, "chance": 60 },