diff --git a/data/mods/MindOverMatter/effectoncondition/conditions_for_eocs.json b/data/mods/MindOverMatter/effectoncondition/conditions_for_eocs.json new file mode 100644 index 0000000000000..32ad3edbaaeae --- /dev/null +++ b/data/mods/MindOverMatter/effectoncondition/conditions_for_eocs.json @@ -0,0 +1,198 @@ +[ + { + "type": "effect_on_condition", + "id": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST", + "condition": { + "and": [ + { + "u_has_any_trait": [ + "BIOKINETIC", + "CLAIRSENTIENT", + "ELECTROKINETIC", + "PHOTOKINETIC", + "PYROKINETIC", + "TELEKINETIC", + "TELEPATH", + "TELEPORTER", + "VITAKINETIC" + ] + }, + { + "or": [ + { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, + { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, + { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, + { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, + { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, + { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, + { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, + { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, + { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } + ] + } + ] + }, + "effect": [ ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER", + "condition": { + "or": [ { "is_weather": "distant_portal_storm" }, { "is_weather": "portal_storm" }, { "is_weather": "close_portal_storm" } ] + }, + "effect": [ ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CONDITION_NEAR_NETHER_RELATED_LOCATION", + "condition": { + "or": [ + { "u_near_om_location": "unvitrified_farm_0", "range": 2 }, + { "u_near_om_location": "unvitrified_farm_1", "range": 2 }, + { "u_near_om_location": "unvitrified_farm_neg_1", "range": 2 }, + { "u_near_om_location": "unvitrified_farm_2", "range": 2 }, + { "u_near_om_location": "vitrified_farm_0", "range": 2 }, + { "u_near_om_location": "vitrified_farm_1", "range": 2 }, + { "u_near_om_location": "vitrified_farm_neg_1", "range": 2 }, + { "u_near_om_location": "vitrified_farm_2", "range": 2 }, + { "u_near_om_location": "microlab_portal_elevator_physics_glass", "range": 2 }, + { "u_near_om_location": "microlab_distorted_hallway", "range": 2 }, + { "u_near_om_location": "microlab_distorted", "range": 2 }, + { "u_near_om_location": "microlab_distorted_edge", "range": 2 }, + { "u_near_om_location": "microlab_portal_elevator_physics_glass", "range": 2 }, + { "u_near_om_location": "corpse_surface", "range": 0 }, + { "u_near_om_location": "corpse_bowels_neck_right", "range": 2 }, + { "u_near_om_location": "corpse_bowels_neck_left", "range": 2 }, + { "u_near_om_location": "corpse_bowels_neck_edge_center", "range": 2 }, + { "u_near_om_location": "corpse_bowels_rcorner", "range": 2 }, + { "u_near_om_location": "corpse_bowels_lcorner", "range": 2 }, + { "u_near_om_location": "corpse_bowels_empty_edge", "range": 2 }, + { "u_near_om_location": "corpse_bowels_mid", "range": 2 }, + { "u_near_om_location": "corpse_tentacle", "range": 2 }, + { "u_near_om_location": "corpse_tentacle_entry", "range": 2 }, + { "u_near_om_location": "corpse_tentacle_surface_entry", "range": 0 }, + { "u_near_om_location": "corpse_bowels_tentacle_edge", "range": 2 }, + { "u_near_om_location": "corpse_bowels_empty_edge", "range": 2 }, + { "u_near_om_location": "corpse_head", "range": 2 }, + { "u_near_om_location": "corpse_brain", "range": 2 }, + { "u_near_om_location": "corpse_under_brain", "range": 2 }, + { "u_near_om_location": "corpse_head_edge", "range": 2 }, + { "u_near_om_location": "corpse_head_fin", "range": 2 }, + { "u_near_om_location": "corpse_head_lcorner", "range": 2 }, + { "u_near_om_location": "corpse_head_rcorner", "range": 2 }, + { "u_near_om_location": "corpse_head_neck_l", "range": 2 }, + { "u_near_om_location": "corpse_head_neck_r", "range": 2 }, + { "u_near_om_location": "corpse_head_neck_center", "range": 2 }, + { "u_near_om_location": "corpse_head_neck_l_decap", "range": 2 }, + { "u_near_om_location": "corpse_head_neck_r", "range": 2 }, + { "u_near_om_location": "corpse_head_neck_r_decap", "range": 2 }, + { "u_near_om_location": "corpse_head_neck_center_decap", "range": 2 }, + { "u_near_om_location": "nether_crystal_field", "range": 1 }, + { "u_near_om_location": "psi_phavian_lab_blockB1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_blockD1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_blockB3", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_blockD3", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block2B1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block2D1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block2B3", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block2D3", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block3B1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block3D1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block3B3", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block3D3", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block4B1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block4D1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block4B3", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block4D3", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block5B1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block5D1", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block5B3", "range": 2 }, + { "u_near_om_location": "psi_phavian_lab_block5D3", "range": 2 }, + { "u_near_om_location": "void_spider_lair_entrance", "range": 2 }, + { "u_near_om_location": "void_spider_lair_a1", "range": 2 }, + { "u_near_om_location": "void_spider_lair_a2", "range": 2 }, + { "u_near_om_location": "LIXA_surface_1b_north", "range": 2 }, + { "u_near_om_location": "LIXA_roof_1a_north", "range": 2 }, + { "u_near_om_location": "LIXA_stairshaft_1a_north", "range": 2 }, + { "u_near_om_location": "LIXA_stairshaft_2a_north", "range": 2 }, + { "u_near_om_location": "LIXA_device_2_north", "range": 2 }, + { "u_near_om_location": "LIXA_device_unfolded_noaccess_north", "range": 2 }, + { "u_near_om_location": "LIXA_entry_2_north", "range": 2 }, + { "u_near_om_location": "LIXA_road_north", "range": 2 }, + { "u_near_om_location": "LIXA_road_guard_north", "range": 2 } + ] + }, + "effect": [ ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT", + "condition": { + "or": [ + { "u_has_trait": "CLAIR_SPEED_READ" }, + { "u_has_effect": "effect_clair_speed_reader" }, + { "u_has_effect": "effect_clair_see_auras" }, + { "u_has_effect": "effect_clair_craft_bonus" }, + { "u_has_effect": "effect_clair_perfect_shot" }, + { "u_has_effect": "effect_photokin_light_local" }, + { "u_has_item": "pyrokinetic_fire_tool" }, + { "u_has_item": "pyrokinetic_torch_weld" }, + { "u_has_effect": "effect_telekinetic_strength" }, + { "u_has_item": "telekin_lifting_jack_1" }, + { "u_has_item": "telekin_lifting_jack_2" }, + { "u_has_item": "telekin_lifting_jack_3" }, + { "u_has_item": "telekin_lifting_jack_4" }, + { "u_has_item": "telekin_lifting_jack_5" }, + { "u_has_item": "telekin_lifting_jack_6" }, + { "u_has_item": "telekin_lifting_jack_7" }, + { "u_has_item": "telekin_lifting_jack_8" }, + { "u_has_item": "telekin_lifting_jack_9" }, + { "u_has_item": "telekin_lifting_jack_10" }, + { "u_has_item": "telekin_lifting_jack_11" }, + { "u_has_item": "telekin_lifting_jack_12" }, + { "u_has_item": "telekin_lifting_jack_13" }, + { "u_has_item": "telekin_lifting_jack_14" }, + { "u_has_item": "telekin_lifting_jack_15" }, + { "u_has_item": "telekin_lifting_jack_16" }, + { "u_has_item": "telekin_lifting_jack_17" }, + { "u_has_item": "telekin_lifting_jack_18" }, + { "u_has_item": "telekin_lifting_jack_19" }, + { "u_has_item": "telekin_lifting_jack_20" }, + { "u_has_effect": "effect_telekinetic_levitation" }, + { "u_has_effect": "effect_telepathic_learning_bonus" }, + { "u_has_effect": "telepathic_ignorance_self" } + ] + }, + "effect": [ ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE", + "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "effect": [ ] + }, + { + "type": "effect_on_condition", + "id": "EOC_PORTAL_STORM_CONDITION_FLAG_PORTAL_PROOF", + "condition": { + "and": [ + { "not": { "u_has_worn_with_flag": "PORTAL_PROOF" } }, + { + "not": { + "and": [ + { "u_has_effect": "effect_telepathic_psi_armor" }, + { + "math": [ + "u_spell_level('telepathic_shield')", + ">=", + "(u_vitamin('vitamin_psionic_drain') / 10) + (max(u_school_level('BIOKINETIC'), u_school_level('CLAIRSENTIENT'), u_school_level('ELECTROKINETIC'), u_school_level('PHOTOKINETIC'), u_school_level('PYROKINETIC'), u_school_level('TELEPATH'), u_school_level('TELEKINETIC'), u_school_level('TELEPORTER'), u_school_level('VITAKINETIC')) / 3) + (u_awakening_countup / 3)" + ] + } + ] + } + } + ] + }, + "effect": [ ] + } +] diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json index f2b7894cc98db..e225b3b3de568 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json @@ -27,7 +27,7 @@ { "type": "effect_on_condition", "id": "EOC_BIOKIN_MATRIX_AWAKENING_2", - "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "condition": { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" }, "effect": [ { "run_eocs": "EOC_BIOKIN_MATRIX_AWAKENING_SUCCESS" } ], "false_effect": [ { "run_eocs": "EOC_BIOKIN_MATRIX_AWAKENING_FAILURE" } ] }, @@ -88,7 +88,7 @@ { "type": "effect_on_condition", "id": "EOC_CLAIR_MATRIX_AWAKENING_2", - "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "condition": { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" }, "effect": [ { "run_eocs": "EOC_CLAIR_MATRIX_AWAKENING_SUCCESS" } ], "false_effect": [ { "run_eocs": "EOC_CLAIR_MATRIX_AWAKENING_FAILURE" } ] }, @@ -149,7 +149,7 @@ { "type": "effect_on_condition", "id": "EOC_ELECTRO_MATRIX_AWAKENING_2", - "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "condition": { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" }, "effect": [ { "run_eocs": "EOC_ELECTRO_MATRIX_AWAKENING_SUCCESS" } ], "false_effect": [ { "run_eocs": "EOC_ELECTRO_MATRIX_AWAKENING_FAILURE" } ] }, @@ -210,7 +210,7 @@ { "type": "effect_on_condition", "id": "EOC_PHOTOKIN_MATRIX_AWAKENING_2", - "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "condition": { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" }, "effect": [ { "run_eocs": "EOC_PHOTOKIN_MATRIX_AWAKENING_SUCCESS" } ], "false_effect": [ { "run_eocs": "EOC_PHOTOKIN_MATRIX_AWAKENING_FAILURE" } ] }, @@ -273,7 +273,7 @@ { "type": "effect_on_condition", "id": "EOC_PYROKIN_MATRIX_AWAKENING_2", - "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "condition": { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" }, "effect": [ { "run_eocs": "EOC_PYROKIN_MATRIX_AWAKENING_SUCCESS" } ], "false_effect": [ { "run_eocs": "EOC_PYROKIN_MATRIX_AWAKENING_FAILURE" } ] }, @@ -335,7 +335,7 @@ { "type": "effect_on_condition", "id": "EOC_TELEKIN_MATRIX_AWAKENING_2", - "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "condition": { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" }, "effect": [ { "run_eocs": "EOC_TELEKIN_MATRIX_AWAKENING_SUCCESS" } ], "false_effect": [ { "run_eocs": "EOC_TELEKIN_MATRIX_AWAKENING_FAILURE" } ] }, @@ -396,7 +396,7 @@ { "type": "effect_on_condition", "id": "EOC_TEEP_MATRIX_AWAKENING_2", - "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "condition": { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" }, "effect": [ { "run_eocs": "EOC_TEEP_MATRIX_AWAKENING_SUCCESS" } ], "false_effect": [ { "run_eocs": "EOC_TEEP_MATRIX_AWAKENING_FAILURE" } ] }, @@ -457,7 +457,7 @@ { "type": "effect_on_condition", "id": "EOC_TELEPORT_MATRIX_AWAKENING_2", - "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "condition": { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" }, "effect": [ { "run_eocs": "EOC_TELEPORT_MATRIX_AWAKENING_SUCCESS" } ], "false_effect": [ { "run_eocs": "EOC_TELEPORT_MATRIX_AWAKENING_FAILURE" } ] }, @@ -520,7 +520,7 @@ { "type": "effect_on_condition", "id": "EOC_VITAKIN_MATRIX_AWAKENING_2", - "condition": { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } }, + "condition": { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" }, "effect": [ { "run_eocs": "EOC_VITAKIN_MATRIX_AWAKENING_SUCCESS" } ], "false_effect": [ { "run_eocs": "EOC_VITAKIN_MATRIX_AWAKENING_FAILURE" } ] }, @@ -604,7 +604,7 @@ "and": [ "u_is_outside", { "is_weather": "distant_portal_storm" }, - { "not": { "u_has_worn_with_flag": "PORTAL_PROOF" } }, + { "test_eoc": "EOC_PORTAL_STORM_CONDITION_FLAG_PORTAL_PROOF" }, { "not": { "u_has_effect": "sleep" } } ] }, @@ -636,7 +636,7 @@ "and": [ "u_is_outside", { "is_weather": "portal_storm" }, - { "not": { "u_has_worn_with_flag": "PORTAL_PROOF" } }, + { "test_eoc": "EOC_PORTAL_STORM_CONDITION_FLAG_PORTAL_PROOF" }, { "not": { "u_has_effect": "sleep" } } ] }, @@ -668,7 +668,7 @@ "and": [ "u_is_outside", { "is_weather": "close_portal_storm" }, - { "not": { "u_has_worn_with_flag": "PORTAL_PROOF" } }, + { "test_eoc": "EOC_PORTAL_STORM_CONDITION_FLAG_PORTAL_PROOF" }, { "not": { "u_has_effect": "sleep" } } ] }, @@ -703,7 +703,7 @@ "and": [ { "not": { "u_has_trait": "BIOKINETIC" } }, { "not": { "u_has_effect": "psionic_awakened" } }, - { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } } + { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" } ] }, "effect": [ @@ -736,7 +736,7 @@ "and": [ { "not": { "u_has_trait": "CLAIRSENTIENT" } }, { "not": { "u_has_effect": "psionic_awakened" } }, - { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } } + { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" } ] }, "effect": [ @@ -769,7 +769,7 @@ "and": [ { "not": { "u_has_trait": "ELECTROKINETIC" } }, { "not": { "u_has_effect": "psionic_awakened" } }, - { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } } + { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" } ] }, "effect": [ @@ -801,7 +801,7 @@ "and": [ { "not": { "u_has_trait": "PHOTOKINETIC" } }, { "not": { "u_has_effect": "psionic_awakened" } }, - { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } } + { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" } ] }, "effect": [ @@ -836,7 +836,7 @@ "and": [ { "not": { "u_has_trait": "PYROKINETIC" } }, { "not": { "u_has_effect": "psionic_awakened" } }, - { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } } + { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" } ] }, "effect": [ @@ -869,7 +869,7 @@ "and": [ { "not": { "u_has_trait": "TELEKINETIC" } }, { "not": { "u_has_effect": "psionic_awakened" } }, - { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } } + { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" } ] }, "effect": [ @@ -901,7 +901,7 @@ "and": [ { "not": { "u_has_trait": "TELEPATH" } }, { "not": { "u_has_effect": "psionic_awakened" } }, - { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } } + { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" } ] }, "effect": [ @@ -934,7 +934,7 @@ "and": [ { "not": { "u_has_trait": "TELEPORTER" } }, { "not": { "u_has_effect": "psionic_awakened" } }, - { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } } + { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" } ] }, "effect": [ @@ -966,7 +966,7 @@ "and": [ { "not": { "u_has_trait": "VITAKINETIC" } }, { "not": { "u_has_effect": "psionic_awakened" } }, - { "x_in_y_chance": { "x": { "math": [ "100 - u_awakening_reducer" ] }, "y": 100 } } + { "test_eoc": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE" } ] }, "effect": [ diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_misc.json b/data/mods/MindOverMatter/effectoncondition/eoc_misc.json index 46719a620c99a..48177d540379a 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_misc.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_misc.json @@ -1,28 +1,4 @@ [ - { - "type": "effect_on_condition", - "id": "EOC_PORTAL_STORM_CONDITION_FLAG_PORTAL_PROOF", - "condition": { - "and": [ - { "not": { "u_has_worn_with_flag": "PORTAL_PROOF" } }, - { - "not": { - "and": [ - { "u_has_effect": "effect_telepathic_psi_armor" }, - { - "math": [ - "u_spell_level('telepathic_shield')", - ">=", - "(u_vitamin('vitamin_psionic_drain') / 10) + (max(u_school_level('BIOKINETIC'), u_school_level('CLAIRSENTIENT'), u_school_level('ELECTROKINETIC'), u_school_level('PHOTOKINETIC'), u_school_level('PYROKINETIC'), u_school_level('TELEPATH'), u_school_level('TELEKINETIC'), u_school_level('TELEPORTER'), u_school_level('VITAKINETIC')) / 3) + (u_awakening_countup / 3)" - ] - } - ] - } - } - ] - }, - "effect": [ ] - }, { "type": "effect_on_condition", "id": "EOC_RESET_TELEPATHIC_STEALING_TIMER", diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json index 341bc743751a5..346c0113a6b26 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json @@ -4,36 +4,7 @@ "id": "EOC_NETHER_CONDUIT_VALUE_INCREASER", "eoc_type": "EVENT", "required_event": "spellcasting_finish", - "condition": { - "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - } - ] - }, + "condition": { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, "effect": [ { "run_eocs": [ @@ -51,36 +22,7 @@ "id": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT", "eoc_type": "EVENT", "required_event": "spellcasting_finish", - "condition": { - "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - } - ] - }, + "condition": { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "_difficulty" ] }, { @@ -217,32 +159,7 @@ "required_event": "spellcasting_finish", "condition": { "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - }, + { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "15" ] } ] }, @@ -1067,32 +984,7 @@ "required_event": "spellcasting_finish", "condition": { "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - }, + { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, { "u_has_effect": "effect_nether_attunement_feedback" }, { "x_in_y_chance": { "x": { "math": [ "u_vitamin('vitamin_psionic_drain')" ] }, "y": 250 } } ] @@ -1144,101 +1036,11 @@ "required_event": "spellcasting_finish", "condition": { "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - }, + { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, { "or": [ - { "is_weather": "distant_portal_storm" }, - { "is_weather": "portal_storm" }, - { "is_weather": "close_portal_storm" }, - { "u_near_om_location": "unvitrified_farm_0", "range": 2 }, - { "u_near_om_location": "unvitrified_farm_1", "range": 2 }, - { "u_near_om_location": "unvitrified_farm_neg_1", "range": 2 }, - { "u_near_om_location": "unvitrified_farm_2", "range": 2 }, - { "u_near_om_location": "vitrified_farm_0", "range": 2 }, - { "u_near_om_location": "vitrified_farm_1", "range": 2 }, - { "u_near_om_location": "vitrified_farm_neg_1", "range": 2 }, - { "u_near_om_location": "vitrified_farm_2", "range": 2 }, - { "u_near_om_location": "microlab_portal_elevator_physics_glass", "range": 2 }, - { "u_near_om_location": "microlab_distorted_hallway", "range": 2 }, - { "u_near_om_location": "microlab_distorted", "range": 2 }, - { "u_near_om_location": "microlab_distorted_edge", "range": 2 }, - { "u_near_om_location": "microlab_portal_elevator_physics_glass", "range": 2 }, - { "u_near_om_location": "corpse_surface", "range": 0 }, - { "u_near_om_location": "corpse_bowels_neck_right", "range": 2 }, - { "u_near_om_location": "corpse_bowels_neck_left", "range": 2 }, - { "u_near_om_location": "corpse_bowels_neck_edge_center", "range": 2 }, - { "u_near_om_location": "corpse_bowels_rcorner", "range": 2 }, - { "u_near_om_location": "corpse_bowels_lcorner", "range": 2 }, - { "u_near_om_location": "corpse_bowels_empty_edge", "range": 2 }, - { "u_near_om_location": "corpse_bowels_mid", "range": 2 }, - { "u_near_om_location": "corpse_tentacle", "range": 2 }, - { "u_near_om_location": "corpse_tentacle_entry", "range": 2 }, - { "u_near_om_location": "corpse_tentacle_surface_entry", "range": 0 }, - { "u_near_om_location": "corpse_bowels_tentacle_edge", "range": 2 }, - { "u_near_om_location": "corpse_bowels_empty_edge", "range": 2 }, - { "u_near_om_location": "corpse_head", "range": 2 }, - { "u_near_om_location": "corpse_brain", "range": 2 }, - { "u_near_om_location": "corpse_under_brain", "range": 2 }, - { "u_near_om_location": "corpse_head_edge", "range": 2 }, - { "u_near_om_location": "corpse_head_fin", "range": 2 }, - { "u_near_om_location": "corpse_head_lcorner", "range": 2 }, - { "u_near_om_location": "corpse_head_rcorner", "range": 2 }, - { "u_near_om_location": "corpse_head_neck_l", "range": 2 }, - { "u_near_om_location": "corpse_head_neck_r", "range": 2 }, - { "u_near_om_location": "corpse_head_neck_center", "range": 2 }, - { "u_near_om_location": "corpse_head_neck_l_decap", "range": 2 }, - { "u_near_om_location": "corpse_head_neck_r", "range": 2 }, - { "u_near_om_location": "corpse_head_neck_r_decap", "range": 2 }, - { "u_near_om_location": "corpse_head_neck_center_decap", "range": 2 }, - { "u_near_om_location": "nether_crystal_field", "range": 1 }, - { "u_near_om_location": "psi_phavian_lab_blockB1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_blockD1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_blockB3", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_blockD3", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block2B1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block2D1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block2B3", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block2D3", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block3B1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block3D1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block3B3", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block3D3", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block4B1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block4D1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block4B3", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block4D3", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block5B1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block5D1", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block5B3", "range": 2 }, - { "u_near_om_location": "psi_phavian_lab_block5D3", "range": 2 }, - { "u_near_om_location": "void_spider_lair_entrance", "range": 2 }, - { "u_near_om_location": "void_spider_lair_a1", "range": 2 }, - { "u_near_om_location": "void_spider_lair_a2", "range": 2 } + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" }, + { "test_eoc": "EOC_CONDITION_NEAR_NETHER_RELATED_LOCATION" } ] } ] diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json index 0d62a98a3df9a..a10765731ce87 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json @@ -29,41 +29,7 @@ "id": "EOC_MELEE_MONSTER_CANCEL_TOGGLES", "eoc_type": "EVENT", "required_event": "character_melee_attacks_monster", - "condition": { - "or": [ - { "u_has_trait": "CLAIR_SPEED_READ" }, - { "u_has_effect": "effect_clair_speed_reader" }, - { "u_has_effect": "effect_clair_see_auras" }, - { "u_has_effect": "effect_clair_craft_bonus" }, - { "u_has_effect": "effect_photokin_light_local" }, - { "u_has_item": "pyrokinetic_fire_tool" }, - { "u_has_item": "pyrokinetic_torch_weld" }, - { "u_has_effect": "effect_telekinetic_strength" }, - { "u_has_item": "telekin_lifting_jack_1" }, - { "u_has_item": "telekin_lifting_jack_2" }, - { "u_has_item": "telekin_lifting_jack_3" }, - { "u_has_item": "telekin_lifting_jack_4" }, - { "u_has_item": "telekin_lifting_jack_5" }, - { "u_has_item": "telekin_lifting_jack_6" }, - { "u_has_item": "telekin_lifting_jack_7" }, - { "u_has_item": "telekin_lifting_jack_8" }, - { "u_has_item": "telekin_lifting_jack_9" }, - { "u_has_item": "telekin_lifting_jack_10" }, - { "u_has_item": "telekin_lifting_jack_11" }, - { "u_has_item": "telekin_lifting_jack_12" }, - { "u_has_item": "telekin_lifting_jack_13" }, - { "u_has_item": "telekin_lifting_jack_14" }, - { "u_has_item": "telekin_lifting_jack_15" }, - { "u_has_item": "telekin_lifting_jack_16" }, - { "u_has_item": "telekin_lifting_jack_17" }, - { "u_has_item": "telekin_lifting_jack_18" }, - { "u_has_item": "telekin_lifting_jack_19" }, - { "u_has_item": "telekin_lifting_jack_20" }, - { "u_has_effect": "effect_telekinetic_levitation" }, - { "u_has_effect": "effect_telepathic_learning_bonus" }, - { "u_has_effect": "telepathic_ignorance_self" } - ] - }, + "condition": { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" }, "effect": [ { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS" ] }, { "npc_lose_effect": "telepathic_ignorance" } ] }, { @@ -71,41 +37,7 @@ "id": "EOC_MELEE_CHARACTER_CANCEL_TOGGLES", "eoc_type": "EVENT", "required_event": "character_melee_attacks_character", - "condition": { - "or": [ - { "u_has_trait": "CLAIR_SPEED_READ" }, - { "u_has_effect": "effect_clair_speed_reader" }, - { "u_has_effect": "effect_clair_see_auras" }, - { "u_has_effect": "effect_clair_craft_bonus" }, - { "u_has_effect": "effect_photokin_light_local" }, - { "u_has_item": "pyrokinetic_fire_tool" }, - { "u_has_item": "pyrokinetic_torch_weld" }, - { "u_has_effect": "effect_telekinetic_strength" }, - { "u_has_item": "telekin_lifting_jack_1" }, - { "u_has_item": "telekin_lifting_jack_2" }, - { "u_has_item": "telekin_lifting_jack_3" }, - { "u_has_item": "telekin_lifting_jack_4" }, - { "u_has_item": "telekin_lifting_jack_5" }, - { "u_has_item": "telekin_lifting_jack_6" }, - { "u_has_item": "telekin_lifting_jack_7" }, - { "u_has_item": "telekin_lifting_jack_8" }, - { "u_has_item": "telekin_lifting_jack_9" }, - { "u_has_item": "telekin_lifting_jack_10" }, - { "u_has_item": "telekin_lifting_jack_11" }, - { "u_has_item": "telekin_lifting_jack_12" }, - { "u_has_item": "telekin_lifting_jack_13" }, - { "u_has_item": "telekin_lifting_jack_14" }, - { "u_has_item": "telekin_lifting_jack_15" }, - { "u_has_item": "telekin_lifting_jack_16" }, - { "u_has_item": "telekin_lifting_jack_17" }, - { "u_has_item": "telekin_lifting_jack_18" }, - { "u_has_item": "telekin_lifting_jack_19" }, - { "u_has_item": "telekin_lifting_jack_20" }, - { "u_has_effect": "effect_telekinetic_levitation" }, - { "u_has_effect": "effect_telepathic_learning_bonus" }, - { "u_has_effect": "telepathic_ignorance_self" } - ] - }, + "condition": { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" }, "effect": [ { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS" ] }, { "npc_lose_effect": "telepathic_ignorance" } ] }, { @@ -113,42 +45,7 @@ "id": "EOC_RANGED_MONSTER_CANCEL_TOGGLES", "eoc_type": "EVENT", "required_event": "character_ranged_attacks_monster", - "condition": { - "or": [ - { "u_has_trait": "CLAIR_SPEED_READ" }, - { "u_has_effect": "effect_clair_speed_reader" }, - { "u_has_effect": "effect_clair_see_auras" }, - { "u_has_effect": "effect_clair_craft_bonus" }, - { "u_has_effect": "effect_clair_perfect_shot" }, - { "u_has_effect": "effect_photokin_light_local" }, - { "u_has_item": "pyrokinetic_fire_tool" }, - { "u_has_item": "pyrokinetic_torch_weld" }, - { "u_has_effect": "effect_telekinetic_strength" }, - { "u_has_item": "telekin_lifting_jack_1" }, - { "u_has_item": "telekin_lifting_jack_2" }, - { "u_has_item": "telekin_lifting_jack_3" }, - { "u_has_item": "telekin_lifting_jack_4" }, - { "u_has_item": "telekin_lifting_jack_5" }, - { "u_has_item": "telekin_lifting_jack_6" }, - { "u_has_item": "telekin_lifting_jack_7" }, - { "u_has_item": "telekin_lifting_jack_8" }, - { "u_has_item": "telekin_lifting_jack_9" }, - { "u_has_item": "telekin_lifting_jack_10" }, - { "u_has_item": "telekin_lifting_jack_11" }, - { "u_has_item": "telekin_lifting_jack_12" }, - { "u_has_item": "telekin_lifting_jack_13" }, - { "u_has_item": "telekin_lifting_jack_14" }, - { "u_has_item": "telekin_lifting_jack_15" }, - { "u_has_item": "telekin_lifting_jack_16" }, - { "u_has_item": "telekin_lifting_jack_17" }, - { "u_has_item": "telekin_lifting_jack_18" }, - { "u_has_item": "telekin_lifting_jack_19" }, - { "u_has_item": "telekin_lifting_jack_20" }, - { "u_has_effect": "effect_telekinetic_levitation" }, - { "u_has_effect": "effect_telepathic_learning_bonus" }, - { "u_has_effect": "telepathic_ignorance_self" } - ] - }, + "condition": { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" }, "effect": [ { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS" ] }, { "npc_lose_effect": "telepathic_ignorance" } ] }, { @@ -156,42 +53,7 @@ "id": "EOC_RANGED_CHARACTER_CANCEL_TOGGLES", "eoc_type": "EVENT", "required_event": "character_ranged_attacks_character", - "condition": { - "or": [ - { "u_has_trait": "CLAIR_SPEED_READ" }, - { "u_has_effect": "effect_clair_speed_reader" }, - { "u_has_effect": "effect_clair_see_auras" }, - { "u_has_effect": "effect_clair_craft_bonus" }, - { "u_has_effect": "effect_clair_perfect_shot" }, - { "u_has_effect": "effect_photokin_light_local" }, - { "u_has_item": "pyrokinetic_fire_tool" }, - { "u_has_item": "pyrokinetic_torch_weld" }, - { "u_has_effect": "effect_telekinetic_strength" }, - { "u_has_item": "telekin_lifting_jack_1" }, - { "u_has_item": "telekin_lifting_jack_2" }, - { "u_has_item": "telekin_lifting_jack_3" }, - { "u_has_item": "telekin_lifting_jack_4" }, - { "u_has_item": "telekin_lifting_jack_5" }, - { "u_has_item": "telekin_lifting_jack_6" }, - { "u_has_item": "telekin_lifting_jack_7" }, - { "u_has_item": "telekin_lifting_jack_8" }, - { "u_has_item": "telekin_lifting_jack_9" }, - { "u_has_item": "telekin_lifting_jack_10" }, - { "u_has_item": "telekin_lifting_jack_11" }, - { "u_has_item": "telekin_lifting_jack_12" }, - { "u_has_item": "telekin_lifting_jack_13" }, - { "u_has_item": "telekin_lifting_jack_14" }, - { "u_has_item": "telekin_lifting_jack_15" }, - { "u_has_item": "telekin_lifting_jack_16" }, - { "u_has_item": "telekin_lifting_jack_17" }, - { "u_has_item": "telekin_lifting_jack_18" }, - { "u_has_item": "telekin_lifting_jack_19" }, - { "u_has_item": "telekin_lifting_jack_20" }, - { "u_has_effect": "effect_telekinetic_levitation" }, - { "u_has_effect": "effect_telepathic_learning_bonus" }, - { "u_has_effect": "telepathic_ignorance_self" } - ] - }, + "condition": { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" }, "effect": [ { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS" ] }, { "npc_lose_effect": "telepathic_ignorance" } ] }, { @@ -201,73 +63,9 @@ "required_event": "spellcasting_finish", "condition": { "and": [ - { - "or": [ - { "u_has_trait": "CLAIR_SPEED_READ" }, - { "u_has_effect": "effect_clair_speed_reader" }, - { "u_has_effect": "effect_clair_see_auras" }, - { "u_has_effect": "effect_clair_craft_bonus" }, - { "u_has_effect": "effect_clair_perfect_shot" }, - { "u_has_effect": "effect_photokin_light_local" }, - { "u_has_item": "pyrokinetic_fire_tool" }, - { "u_has_item": "pyrokinetic_torch_weld" }, - { "u_has_effect": "effect_telekinetic_strength" }, - { "u_has_item": "telekin_lifting_jack_1" }, - { "u_has_item": "telekin_lifting_jack_2" }, - { "u_has_item": "telekin_lifting_jack_3" }, - { "u_has_item": "telekin_lifting_jack_4" }, - { "u_has_item": "telekin_lifting_jack_5" }, - { "u_has_item": "telekin_lifting_jack_6" }, - { "u_has_item": "telekin_lifting_jack_7" }, - { "u_has_item": "telekin_lifting_jack_8" }, - { "u_has_item": "telekin_lifting_jack_9" }, - { "u_has_item": "telekin_lifting_jack_10" }, - { "u_has_item": "telekin_lifting_jack_11" }, - { "u_has_item": "telekin_lifting_jack_12" }, - { "u_has_item": "telekin_lifting_jack_13" }, - { "u_has_item": "telekin_lifting_jack_14" }, - { "u_has_item": "telekin_lifting_jack_15" }, - { "u_has_item": "telekin_lifting_jack_16" }, - { "u_has_item": "telekin_lifting_jack_17" }, - { "u_has_item": "telekin_lifting_jack_18" }, - { "u_has_item": "telekin_lifting_jack_19" }, - { "u_has_item": "telekin_lifting_jack_20" }, - { "u_has_effect": "effect_telekinetic_levitation" }, - { "u_has_effect": "effect_telepathic_learning_bonus" }, - { "u_has_effect": "telepathic_ignorance_self" } - ] - }, { "math": [ "_damage", ">=", "1" ] }, - { - "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - } - ] - } + { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" }, + { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" } ] }, "effect": [ { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS" ] } ] @@ -348,9 +146,7 @@ "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, - { "is_weather": "distant_portal_storm" }, - { "is_weather": "portal_storm" }, - { "is_weather": "close_portal_storm" } + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" } ] }, { @@ -389,9 +185,7 @@ "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, - { "is_weather": "distant_portal_storm" }, - { "is_weather": "portal_storm" }, - { "is_weather": "close_portal_storm" } + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" } ] }, { @@ -434,9 +228,7 @@ "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, - { "is_weather": "distant_portal_storm" }, - { "is_weather": "portal_storm" }, - { "is_weather": "close_portal_storm" } + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" } ] }, { @@ -476,9 +268,7 @@ "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, - { "is_weather": "distant_portal_storm" }, - { "is_weather": "portal_storm" }, - { "is_weather": "close_portal_storm" } + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" } ] }, { @@ -521,9 +311,7 @@ "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, - { "is_weather": "distant_portal_storm" }, - { "is_weather": "portal_storm" }, - { "is_weather": "close_portal_storm" } + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" } ] }, { @@ -562,9 +350,7 @@ "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, - { "is_weather": "distant_portal_storm" }, - { "is_weather": "portal_storm" }, - { "is_weather": "close_portal_storm" } + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" } ] }, { @@ -603,9 +389,7 @@ "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, - { "is_weather": "distant_portal_storm" }, - { "is_weather": "portal_storm" }, - { "is_weather": "close_portal_storm" } + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" } ] }, { @@ -648,9 +432,7 @@ "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] }, - { "is_weather": "distant_portal_storm" }, - { "is_weather": "portal_storm" }, - { "is_weather": "close_portal_storm" } + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" } ] }, { @@ -686,7 +468,11 @@ { "u_has_trait": "VITAKINETIC" }, { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] }, { - "or": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, { "math": [ "_success", "==", "false" ] } ] + "or": [ + { "math": [ "u_vitamin('vitamin_psionic_drain')", ">=", "200" ] }, + { "math": [ "_success", "==", "false" ] }, + { "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" } + ] }, { "x_in_y_chance": { @@ -728,36 +514,7 @@ "id": "EOC_PSIONICS_KCAL_COST", "eoc_type": "EVENT", "required_event": "spellcasting_finish", - "condition": { - "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - } - ] - }, + "condition": { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, "effect": [ { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(_difficulty)" ] } ] }, { @@ -905,32 +662,7 @@ "required_event": "spellcasting_finish", "condition": { "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - }, + { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, { "math": [ "u_vitamin('vitamin_maintained_powers')", ">=", "( u_val('intelligence') / 4) + (u_bonus_concentration_powers)" ] } @@ -945,32 +677,7 @@ "required_event": "spellcasting_finish", "condition": { "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - }, + { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, { "math": [ "u_val('focus')", ">=", "15" ] } ] }, diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index 8ba59b53f691e..a99c924f393b8 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -115,44 +115,6 @@ { "math": [ "u_spellcasting_adjustment('concentration', 'flag_whitelist': 'PSIONIC' )", "=", "-1" ] } ] }, - { - "type": "effect_on_condition", - "id": "EOC_PSI_EXTENDED_CHANNELING_ATTUNEMENT", - "eoc_type": "EVENT", - "required_event": "spellcasting_finish", - "condition": { - "and": [ - { - "u_has_any_trait": [ - "BIOKINETIC", - "CLAIRSENTIENT", - "ELECTROKINETIC", - "PHOTOKINETIC", - "PYROKINETIC", - "TELEKINETIC", - "TELEPATH", - "TELEPORTER", - "VITAKINETIC" - ] - }, - { - "or": [ - { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] }, - { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPATH", { "context_val": "school" } ] }, - { "compare_string": [ "TELEPORTER", { "context_val": "school" } ] }, - { "compare_string": [ "VITAKINETIC", { "context_val": "school" } ] } - ] - }, - { "u_has_trait": "PSI_EXTENDED_CHANNELING_ON" } - ] - }, - "effect": [ { "u_cast_spell": { "id": "psionic_drained_difficulty_five", "hit_self": true } } ] - }, { "type": "effect_on_condition", "id": "EOC_NETHER_ATTUNEMENT_BOOST",