Fix coruscating not draining on use

CleverRaven · Jul 10, 2023 · b3a81bb · b3a81bb
1 parent 6fac4ab
commit b3a81bb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_crystal_draining.json b/data/mods/MindOverMatter/effectoncondition/eoc_crystal_draining.json
@@ -61,5 +61,14 @@
       { "u_consume_item": "matrix_crystal_vitakinesis", "count": 1 },
       { "u_spawn_item": "matrix_crystal_drained", "suppress_message": true }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_CORUSCATING_CRYSTAL_DRAINING",
+    "condition": { "u_has_item": "matrix_crystal_coruscating" },
+    "effect": [
+      { "u_consume_item": "matrix_crystal_coruscating", "count": 1 },
+      { "u_spawn_item": "matrix_crystal_drained", "suppress_message": true }
+    ]
   }
 ]
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_matrix_awakening.json b/data/mods/MindOverMatter/effectoncondition/eoc_matrix_awakening.json
@@ -417,16 +417,19 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_CORUSCATING_MATRIX",
-    "effect": {
-      "weighted_list_eocs": [
-        [ "EOC_BIOKIN_MATRIX_AWAKENING_3", { "const": 1 } ],
-        [ "EOC_CLAIR_MATRIX_AWAKENING_3", { "const": 1 } ],
-        [ "EOC_PYROKIN_MATRIX_AWAKENING_3", { "const": 1 } ],
-        [ "EOC_TELEKIN_MATRIX_AWAKENING_3", { "const": 1 } ],
-        [ "EOC_TEEP_MATRIX_AWAKENING_3", { "const": 1 } ],
-        [ "EOC_TELEPORT_MATRIX_AWAKENING_3", { "const": 1 } ],
-        [ "EOC_VITAKIN_MATRIX_AWAKENING_3", { "const": 1 } ]
-      ]
-    }
+    "effect": [
+      { "queue_eocs": "EOC_CORUSCATING_CRYSTAL_DRAINING", "time_in_future": "1 seconds" },
+      {
+        "weighted_list_eocs": [
+          [ "EOC_BIOKIN_MATRIX_AWAKENING_3", { "const": 1 } ],
+          [ "EOC_CLAIR_MATRIX_AWAKENING_3", { "const": 1 } ],
+          [ "EOC_PYROKIN_MATRIX_AWAKENING_3", { "const": 1 } ],
+          [ "EOC_TELEKIN_MATRIX_AWAKENING_3", { "const": 1 } ],
+          [ "EOC_TEEP_MATRIX_AWAKENING_3", { "const": 1 } ],
+          [ "EOC_TELEPORT_MATRIX_AWAKENING_3", { "const": 1 } ],
+          [ "EOC_VITAKIN_MATRIX_AWAKENING_3", { "const": 1 } ]
+        ]
+      }
+    ]
   }
 ]
diff --git a/data/mods/MindOverMatter/items/matrix_crystals.json b/data/mods/MindOverMatter/items/matrix_crystals.json
@@ -261,7 +261,7 @@
   {
     "type": "TOOL",
     "id": "matrix_crystal_coruscating",
-    "name": { "str_sp": "strange crystal" },
+    "name": { "str_sp": "strange crystal, coruscating" },
     "description": "A strange-looking, surprisingly-heavy crystal.  In total darkness, multicolored lights churn and swirl within its depths.",
     "copy-from": "matrix_crystal_biokinesis",
     "color": "brown",