From b3a81bbb51fe89efeb576c0c208086b694b2342d Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Sun, 9 Jul 2023 21:24:16 -0500 Subject: [PATCH] Fix coruscating not draining on use --- .../eoc_crystal_draining.json | 9 +++++++ .../eoc_matrix_awakening.json | 25 +++++++++++-------- .../MindOverMatter/items/matrix_crystals.json | 2 +- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_crystal_draining.json b/data/mods/MindOverMatter/effectoncondition/eoc_crystal_draining.json index 9b3170f668740..8d0d485296971 100644 --- 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 index dbd0df3d502b1..c0e959a5a1cf5 100644 --- 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 index cb4c90ace2ba3..cd1cbf480fb2c 100644 --- 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",