diff --git a/data/json/effects_on_condition/bionic_active_eocs.json b/data/json/effects_on_condition/bionic_active_eocs.json index 5d34082cfc783..141db77da055a 100644 --- a/data/json/effects_on_condition/bionic_active_eocs.json +++ b/data/json/effects_on_condition/bionic_active_eocs.json @@ -48,7 +48,7 @@ "effect": [ { "u_message": "Your muscles hiss as hydraulic strength fills them!", "type": "good" }, { "u_make_sound": "HISISSS!", "volume": 19, "type": "activity" }, - { "queue_eocs": "EOC_bio_hydraulics_act", "time_in_future": 1 } + { "run_eocs": "EOC_bio_hydraulics_act", "time_in_future": 1 } ] }, { @@ -58,7 +58,7 @@ "//": "Sound of hissing hydraulic muscle! (not quite as loud as a car horn)", "effect": [ { "u_make_sound": "HISISSS!", "volume": 19, "type": "activity" }, - { "queue_eocs": "EOC_bio_hydraulics_act", "time_in_future": 1 } + { "run_eocs": "EOC_bio_hydraulics_act", "time_in_future": 1 } ] }, { diff --git a/data/json/effects_on_condition/dream_eocs.json b/data/json/effects_on_condition/dream_eocs.json index 3a292c8e4f704..58140b49af93c 100644 --- a/data/json/effects_on_condition/dream_eocs.json +++ b/data/json/effects_on_condition/dream_eocs.json @@ -15,7 +15,7 @@ { "u_message": "nightmares", "snippet": true, "type": "bad" }, { "u_add_morale": "morale_nightmare", "bonus": [ -15, -30 ], "max_bonus": -30 }, { "math": [ "dream_counter", "=", "1" ] }, - { "queue_eocs": "EOC_RESET_DREAM_COUNTER", "time_in_future": 1 } + { "run_eocs": "EOC_RESET_DREAM_COUNTER", "time_in_future": 1 } ] }, { @@ -50,7 +50,7 @@ ] }, { "math": [ "dream_counter", "=", "1" ] }, - { "queue_eocs": "EOC_RESET_DREAM_COUNTER", "time_in_future": 1 } + { "run_eocs": "EOC_RESET_DREAM_COUNTER", "time_in_future": 1 } ] } ] diff --git a/data/json/effects_on_condition/example_eocs.json b/data/json/effects_on_condition/example_eocs.json index 8dd5d821883bb..2be48164efd51 100644 --- a/data/json/effects_on_condition/example_eocs.json +++ b/data/json/effects_on_condition/example_eocs.json @@ -440,7 +440,7 @@ { "if": { "u_query_tile": "anywhere", "target_var": { "global_val": "loc" }, "message": "Select point" }, "then": { - "run_eoc_with": { "id": "EOC_teleport_test_other_do", "effect": { "npc_teleport": { "global_val": "teleport_test_pos" } } }, + "run_eocs": { "id": "EOC_teleport_test_other_do", "effect": { "npc_teleport": { "global_val": "teleport_test_pos" } } }, "beta_loc": { "global_val": "loc" }, "false_eocs": { "id": "EOC_teleport_test_other_do_fail_msg", "effect": { "message": "Please select a creature." } } }, @@ -469,7 +469,7 @@ { "if": { "u_query_tile": "anywhere", "target_var": { "global_val": "loc" }, "message": "Select point" }, "then": { - "run_eoc_with": { + "run_eocs": { "id": "_EOC_control_npc_do", "effect": [ { "if": "npc_is_npc", "then": [ "follow", "take_control" ], "else": { "message": "Please select a NPC." } } ] }, @@ -485,7 +485,7 @@ "id": "EOC_return_to_player", "effect": [ { - "run_eoc_with": { "id": "_EOC_return_to_player_do", "effect": [ "follow", "take_control" ] }, + "run_eocs": { "id": "_EOC_return_to_player_do", "effect": [ "follow", "take_control" ] }, "alpha_talker": "avatar", "beta_talker": { "global_val": "player_id" }, "false_eocs": { "id": "_EOC_return_to_player_fail_msg", "effect": { "message": "Unable to locate your original body." } } @@ -497,7 +497,7 @@ "id": "EOC_null_talker_test", "effect": [ { - "run_eoc_with": { "id": "_EOC_hello_world_msg", "effect": { "message": "hello world" } }, + "run_eocs": { "id": "_EOC_hello_world_msg", "effect": { "message": "hello world" } }, "alpha_talker": "", "beta_talker": "", "false_eocs": { "id": "_EOC_null_talker_msg", "effect": { "message": "Constructed a EOC with no talkers!" } } diff --git a/data/json/effects_on_condition/medicine_eocs/regen_serum_eoc.json b/data/json/effects_on_condition/medicine_eocs/regen_serum_eoc.json index 8b9b1fc19739d..8ce39a755bd01 100644 --- a/data/json/effects_on_condition/medicine_eocs/regen_serum_eoc.json +++ b/data/json/effects_on_condition/medicine_eocs/regen_serum_eoc.json @@ -14,9 +14,9 @@ { "math": [ "_serum_duration", "=", "rng(time('1 d'), time('2 d'))" ] }, { "u_add_effect": "regen_serum_main", "duration": { "context_val": "serum_duration" } }, { "u_add_effect": "regen_serum_crash_cardio", "duration": { "math": [ "_serum_duration * rng(1.5, 2.5)" ] } }, - { "queue_eocs": "EOC_APPLY_REGEN_SERUM_CRASH", "time_in_future": { "context_val": "serum_duration" } }, - { "queue_eocs": "EOC_REGEN_SERUM_PAIN_SPIKE", "time_in_future": [ "1 h", "6 h" ] }, - { "queue_eocs": "EOC_REGEN_SERUM_MUT_REJECTION", "time_in_future": [ "1 h", "6 h" ] } + { "run_eocs": "EOC_APPLY_REGEN_SERUM_CRASH", "time_in_future": { "context_val": "serum_duration" } }, + { "run_eocs": "EOC_REGEN_SERUM_PAIN_SPIKE", "time_in_future": [ "1 h", "6 h" ] }, + { "run_eocs": "EOC_REGEN_SERUM_MUT_REJECTION", "time_in_future": [ "1 h", "6 h" ] } ] }, { @@ -32,7 +32,7 @@ "effect": [ { "u_message": "You feel an immense pain, when something within your bloodstream moves eerily.", "type": "bad" }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(15, 55)" ] }, - { "queue_eocs": "EOC_REGEN_SERUM_PAIN_SPIKE", "time_in_future": [ "1 h", "6 h" ] } + { "run_eocs": "EOC_REGEN_SERUM_PAIN_SPIKE", "time_in_future": [ "1 h", "6 h" ] } ] }, { diff --git a/data/json/effects_on_condition/misc_effect_on_condition.json b/data/json/effects_on_condition/misc_effect_on_condition.json index 6fcb6fee6830e..b6d8f043abbf6 100644 --- a/data/json/effects_on_condition/misc_effect_on_condition.json +++ b/data/json/effects_on_condition/misc_effect_on_condition.json @@ -200,7 +200,7 @@ { "if": { "compare_string": [ "your_followers", { "context_val": "new_owner" } ] }, "then": { - "queue_eocs": { + "run_eocs": { "id": "EOC_camp_rumor_spread", "effect": { "u_message": "Rumors of your takeover of have begun to spread…", "type": "mixed" } }, diff --git a/data/json/effects_on_condition/mutation_eocs/mutation_activation_eocs.json b/data/json/effects_on_condition/mutation_eocs/mutation_activation_eocs.json index 061396c16bc9e..bac040eb7e85e 100644 --- a/data/json/effects_on_condition/mutation_eocs/mutation_activation_eocs.json +++ b/data/json/effects_on_condition/mutation_eocs/mutation_activation_eocs.json @@ -35,7 +35,7 @@ "id": "EOC_BIOLUM3_activated", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "prep_time": "3", "spell_to_cast": "spell_spit_flare", @@ -50,7 +50,7 @@ "id": "EOC_SLIME_SPRAY", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "prep_time": "1", "spell_to_cast": "spell_slime_spray", @@ -65,7 +65,7 @@ "id": "EOC_FELINE_LEAP", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "energy_amount": "2000", "prep_time": "1", @@ -84,7 +84,7 @@ "id": "EOC_SHORT_LEAP", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "energy_amount": "2000", "prep_time": "2", @@ -103,7 +103,7 @@ "id": "EOC_CRUSHING_LEAP", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "energy_amount": "6000", "prep_time": "3", @@ -119,7 +119,7 @@ "id": "EOC_AVIAN_LEAP", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "energy_amount": "2500", "prep_time": "1", diff --git a/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json b/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json index 991a28a65a0ee..a90408722e61f 100644 --- a/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json +++ b/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json @@ -161,7 +161,7 @@ "eoc_type": "EVENT", "required_event": "loses_mutation", "condition": { "and": [ { "compare_string": [ "BEAK", { "context_val": "trait" } ] } ] }, - "effect": { "queue_eocs": "EOC_MUTE_BEAK_LOSE_2", "time_in_future": 1 } + "effect": { "run_eocs": "EOC_MUTE_BEAK_LOSE_2", "time_in_future": 1 } }, { "type": "effect_on_condition", @@ -194,7 +194,7 @@ { "compare_string": [ "GASTROPOD_EXTREMITY3", { "context_val": "trait" } ] } ] }, - "effect": [ { "queue_eocs": "EOC_MUTE_GASTROPOD_LOSE_2", "time_in_future": 1 } ] + "effect": [ { "run_eocs": "EOC_MUTE_GASTROPOD_LOSE_2", "time_in_future": 1 } ] }, { "type": "effect_on_condition", diff --git a/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json b/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json index b87da716b1e22..d23ff7d035a1a 100644 --- a/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json +++ b/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json @@ -2051,7 +2051,7 @@ "type": "effect_on_condition", "id": "EOC_LIXA_unfold_return", "effect": [ - { "queue_eocs": "EOC_LIXA_unfold_spawn_goodbye_cards", "time_in_future": "0 seconds" }, + { "run_eocs": "EOC_LIXA_unfold_spawn_goodbye_cards", "time_in_future": "0 seconds" }, { "alter_timed_events": "LIXA_escape_key" }, { "u_lose_effect": "LIXA_unfolded_eff" }, { "mapgen_update": "turn_off_LIXA", "target_var": { "global_val": "LIXA_chamber_1" } }, @@ -2079,7 +2079,7 @@ { "switch": { "math": [ "u_LIXA_unfold_level" ] }, "cases": [ - { "case": 0, "effect": { "queue_eocs": "EOC_LIXA_unfold_shift_0", "time_in_future": "2 seconds" } }, + { "case": 0, "effect": { "run_eocs": "EOC_LIXA_unfold_shift_0", "time_in_future": "2 seconds" } }, { "case": 1, "effect": { @@ -2089,7 +2089,7 @@ "effect": [ { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_A" } }, { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_B" } }, - { "queue_eocs": "EOC_LIXA_unfold_shift_1", "time_in_future": "2 seconds" } + { "run_eocs": "EOC_LIXA_unfold_shift_1", "time_in_future": "2 seconds" } ] } ] @@ -2104,7 +2104,7 @@ "effect": [ { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_A" } }, { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_B" } }, - { "queue_eocs": "EOC_LIXA_unfold_shift_2", "time_in_future": "2 seconds" } + { "run_eocs": "EOC_LIXA_unfold_shift_2", "time_in_future": "2 seconds" } ] } ] @@ -2119,7 +2119,7 @@ "effect": [ { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_A" } }, { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_B" } }, - { "queue_eocs": "EOC_LIXA_unfold_shift_3", "time_in_future": "2 seconds" } + { "run_eocs": "EOC_LIXA_unfold_shift_3", "time_in_future": "2 seconds" } ] } ] @@ -2134,7 +2134,7 @@ "effect": [ { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_A" } }, { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_B" } }, - { "queue_eocs": "EOC_LIXA_unfold_shift_4", "time_in_future": "2 seconds" } + { "run_eocs": "EOC_LIXA_unfold_shift_4", "time_in_future": "2 seconds" } ] } ] @@ -2149,7 +2149,7 @@ "effect": [ { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_A" } }, { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_B" } }, - { "queue_eocs": "EOC_LIXA_unfold_shift_5", "time_in_future": "2 seconds" } + { "run_eocs": "EOC_LIXA_unfold_shift_5", "time_in_future": "2 seconds" } ] } ] @@ -2164,7 +2164,7 @@ "effect": [ { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_A" } }, { "mapgen_update": "cleanup_LIXA", "target_var": { "global_val": "LIXA_unfold_B" } }, - { "queue_eocs": "EOC_LIXA_unfold_shift_6", "time_in_future": "2 seconds" } + { "run_eocs": "EOC_LIXA_unfold_shift_6", "time_in_future": "2 seconds" } ] } ] diff --git a/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json index 4e8c368829d30..76dc9e8e0b8a4 100644 --- a/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json +++ b/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json @@ -299,7 +299,7 @@ "effect": [ { "u_message": "You suddenly feel feeble. Your muscles wobble.", "type": "bad" }, { "u_add_effect": "pd_str_bad", "duration": "50 minutes" }, - { "queue_eocs": "EOC_PORTAL_DEPENDENT_MESSAGES_STR_BAD", "time_in_future": [ "10 minutes", "40 minutes" ] } + { "run_eocs": "EOC_PORTAL_DEPENDENT_MESSAGES_STR_BAD", "time_in_future": [ "10 minutes", "40 minutes" ] } ] }, { @@ -310,7 +310,7 @@ "effect": [ { "u_message": "You suddenly feel a sharp pain in your hand. You reach out to grab it, and miss.", "type": "bad" }, { "u_add_effect": "pd_dex_bad", "duration": "50 minutes" }, - { "queue_eocs": "EOC_PORTAL_DEPENDENT_MESSAGES_DEX_BAD", "time_in_future": [ "10 minutes", "40 minutes" ] } + { "run_eocs": "EOC_PORTAL_DEPENDENT_MESSAGES_DEX_BAD", "time_in_future": [ "10 minutes", "40 minutes" ] } ] }, { @@ -321,7 +321,7 @@ "effect": [ { "u_message": "You blink one time, and everything seems bigger.", "type": "bad" }, { "u_add_effect": "pd_per_bad", "duration": "50 minutes" }, - { "queue_eocs": "EOC_PORTAL_DEPENDENT_MESSAGES_PER_BAD", "time_in_future": [ "10 minutes", "40 minutes" ] } + { "run_eocs": "EOC_PORTAL_DEPENDENT_MESSAGES_PER_BAD", "time_in_future": [ "10 minutes", "40 minutes" ] } ] }, { @@ -332,7 +332,7 @@ "effect": [ { "u_message": "You stop to think, but you can't seem to remember about what.", "type": "bad" }, { "u_add_effect": "pd_int_bad", "duration": "50 minutes" }, - { "queue_eocs": "EOC_PORTAL_DEPENDENT_MESSAGES_INT_BAD", "time_in_future": [ "10 minutes", "40 minutes" ] } + { "run_eocs": "EOC_PORTAL_DEPENDENT_MESSAGES_INT_BAD", "time_in_future": [ "10 minutes", "40 minutes" ] } ] }, { diff --git a/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json index eca57b108522b..2fb293cd8e30e 100644 --- a/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json +++ b/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json @@ -148,7 +148,7 @@ }, { "math": [ "cause_early_portal_storm", "=", "1" ] }, "next_weather", - { "queue_eocs": "EOC_CAUSE_PORTAL_STORM", "time_in_future": [ "30 seconds", "1 minutes" ] }, + { "run_eocs": "EOC_CAUSE_PORTAL_STORM", "time_in_future": [ "30 seconds", "1 minutes" ] }, { "assign_mission": "MISSION_INVESTIGATE_PORTAL_STORM_CENTER" }, { "u_message": "You suddenly register a buzzing in your senses. It's getting louder, and your head starts to throb. Somewhere nearby, a tiny cataclysm has begun (check mission log for details).", @@ -208,7 +208,7 @@ "target_var": { "global_val": "portal_storm_voice_mood" } }, { - "queue_eocs": "EOC_CANCEL_PORTAL_STORM", + "run_eocs": "EOC_CANCEL_PORTAL_STORM", "time_in_future": [ { "global_val": "ps_min_length", "default": "15 minutes" }, { "global_val": "ps_max_length", "default": "30 minutes" } @@ -703,7 +703,7 @@ }, "effect": [ { "u_teleport": { "u_val": "stuck_teleport" }, "success_message": "You feel an intense sense of deja vu." }, - { "queue_eocs": "EOC_PORTAL_TELEPORT_STUCK_LOOP", "time_in_future": [ "3 seconds", "5 seconds" ] } + { "run_eocs": "EOC_PORTAL_TELEPORT_STUCK_LOOP", "time_in_future": [ "3 seconds", "5 seconds" ] } ] }, { @@ -907,7 +907,7 @@ { "mapgen_update": "portal_cell", "target_var": { "global_val": "cell_loc" } }, { "u_teleport": { "global_val": "cell_start" }, "fail_message": "that sucks" }, { - "queue_eocs": { + "run_eocs": { "id": "EOC_PORTAL_STORM_CELL_TELEPORT", "effect": [ { "math": [ "u_in_portal_cell", "=", "0" ] }, @@ -968,7 +968,7 @@ { "u_teleport": { "global_val": "dungeon_start" }, "fail_message": "Something is very wrong!", "force": true }, { "math": [ "portal_dungeon_level", "=", "1" ] }, { "math": [ "visited_a_portal_dungeon", "=", "1" ] }, - { "queue_eocs": "EOC_PORTAL_STORM_DUNGEON_SHIFT", "time_in_future": [ "5 seconds", "15 seconds" ] }, + { "run_eocs": "EOC_PORTAL_STORM_DUNGEON_SHIFT", "time_in_future": [ "5 seconds", "15 seconds" ] }, { "run_eocs": [ "EOC_PORTAL_STORM_DUNGEON_REFLECTION_SPAWN" ] }, { "u_message": "You are trapped in !" }, { "u_message": { "global_val": "portal_storm_voice_mood", "default_str": "none" }, "snippet": true } @@ -993,7 +993,7 @@ "condition": { "math": [ "portal_dungeon_level", ">", "0" ] }, "effect": [ { "mapgen_update": "portal_dungeon", "target_var": { "global_val": "dungeon_loc" } }, - { "queue_eocs": "EOC_PORTAL_STORM_DUNGEON_SHIFT", "time_in_future": [ "5 seconds", "15 seconds" ] } + { "run_eocs": "EOC_PORTAL_STORM_DUNGEON_SHIFT", "time_in_future": [ "5 seconds", "15 seconds" ] } ] }, { diff --git a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json index c349ccba2b1cf..93d909bbf5cc6 100644 --- a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json +++ b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json @@ -277,7 +277,7 @@ { "type": "effect_on_condition", "id": "EOC_queue_vitrified_int_drain", - "effect": { "queue_eocs": "EOC_vitrified_int_drain", "time_in_future": "1 seconds" } + "effect": { "run_eocs": "EOC_vitrified_int_drain", "time_in_future": "1 seconds" } }, { "type": "effect_on_condition", @@ -294,7 +294,7 @@ "id": "EOC_queue_unvitrified_return", "condition": { "math": [ "u_back_from_vitri_glass", "<", "1" ] }, "effect": [ - { "queue_eocs": "EOC_unvitrified_return", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_unvitrified_return", "time_in_future": "1 seconds" }, { "math": [ "u_back_from_vitri_glass", "=", "1" ] } ] }, diff --git a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json index 875c1b241181a..209c2a3c215b1 100644 --- a/data/json/effects_on_condition/npc_eocs/appearance_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/appearance_eocs.json @@ -16,13 +16,13 @@ "if": { "u_has_trait": "hair_buzzcut" }, "then": [ { "u_lose_trait": "hair_buzzcut" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_crewcut" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_crewcut" } } ], "else": { "if": { "u_has_trait": "hair_crewcut" }, "then": [ { "u_lose_trait": "hair_crewcut" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_short" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_short" } } ], "else": { "if": { @@ -40,7 +40,7 @@ { "u_lose_trait": "hair_short_over_eye" }, { "u_lose_trait": "hair_modern" }, { "u_lose_trait": "hair_detective" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_medium" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_medium" } } ], "else": { "if": { @@ -56,13 +56,13 @@ { "u_lose_trait": "hair_puff" }, { "u_lose_trait": "hair_beaded" }, { "u_lose_trait": "hair_curls" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_long" } } ], "else": { "if": { "u_has_trait": "hair_mohawk" }, "then": [ { "u_lose_trait": "hair_mohawk" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_mohawk" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_mohawk" } } ], "else": { "if": { @@ -82,14 +82,14 @@ { "u_lose_trait": "hair_long_over_eye" }, { "u_lose_trait": "hair_mullet" }, { "u_lose_trait": "hair_bun" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_messy" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_messy" } } ], "else": { "if": { "or": [ { "u_has_trait": "hair_messy" }, { "u_has_trait": "hair_punk_long" } ] }, "then": [ { "u_lose_trait": "hair_messy" }, { "u_lose_trait": "hair_punk_long" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_very_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_very_long" } } ], "else": { "if": { "or": [ { "u_has_trait": "hair_very_long" }, { "u_has_trait": "hair_twintails" }, { "u_has_trait": "hair_braid" } ] }, @@ -97,19 +97,13 @@ { "u_lose_trait": "hair_very_long" }, { "u_lose_trait": "hair_twintails" }, { "u_lose_trait": "hair_braid" }, - { - "run_eoc_with": "reset_natural_hair_color", - "variables": { "trait_id": "hair_extremely_long" } - } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_extremely_long" } } ], "else": { "if": { "or": [ { "u_has_trait": "hair_extremely_long" } ] }, "then": [ { "u_lose_trait": "hair_extremely_long" }, - { - "run_eoc_with": "reset_natural_hair_color", - "variables": { "trait_id": "hair_body_length" } - } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_body_length" } } ] } } @@ -424,7 +418,7 @@ "condition": { "u_has_item": "hair_dye_black" }, "effect": [ { "u_message": "You finish dyeing your hair." }, - { "run_eoc_with": "apply_hair_dye", "variables": { "color_id": "black" } } + { "run_eocs": "apply_hair_dye", "variables": { "color_id": "black" } } ], "false_effect": [ { "u_message": "You don't have any black hair dye!" } ] }, @@ -434,7 +428,7 @@ "condition": { "u_has_item": "hair_dye_blond" }, "effect": [ { "u_message": "You finish dyeing your hair." }, - { "run_eoc_with": "apply_hair_dye", "variables": { "color_id": "blond" } } + { "run_eocs": "apply_hair_dye", "variables": { "color_id": "blond" } } ], "false_effect": [ { "u_message": "You don't have any blond hair dye!" } ] }, @@ -444,7 +438,7 @@ "condition": { "u_has_item": "hair_dye_blue" }, "effect": [ { "u_message": "You finish dyeing your hair." }, - { "run_eoc_with": "apply_hair_dye", "variables": { "color_id": "blue" } } + { "run_eocs": "apply_hair_dye", "variables": { "color_id": "blue" } } ], "false_effect": [ { "u_message": "You don't have any blue hair dye!" } ] }, @@ -454,7 +448,7 @@ "condition": { "u_has_item": "hair_dye_brown" }, "effect": [ { "u_message": "You finish dyeing your hair." }, - { "run_eoc_with": "apply_hair_dye", "variables": { "color_id": "brown" } } + { "run_eocs": "apply_hair_dye", "variables": { "color_id": "brown" } } ], "false_effect": [ { "u_message": "You don't have any brown hair dye!" } ] }, @@ -464,7 +458,7 @@ "condition": { "u_has_item": "hair_dye_gray" }, "effect": [ { "u_message": "You finish dyeing your hair." }, - { "run_eoc_with": "apply_hair_dye", "variables": { "color_id": "gray" } } + { "run_eocs": "apply_hair_dye", "variables": { "color_id": "gray" } } ], "false_effect": [ { "u_message": "You don't have any gray hair dye!" } ] }, @@ -474,7 +468,7 @@ "condition": { "u_has_item": "hair_dye_green" }, "effect": [ { "u_message": "You finish dyeing your hair." }, - { "run_eoc_with": "apply_hair_dye", "variables": { "color_id": "green" } } + { "run_eocs": "apply_hair_dye", "variables": { "color_id": "green" } } ], "false_effect": [ { "u_message": "You don't have any green hair dye!" } ] }, @@ -484,7 +478,7 @@ "condition": { "u_has_item": "hair_dye_red" }, "effect": [ { "u_message": "You finish dyeing your hair." }, - { "run_eoc_with": "apply_hair_dye", "variables": { "color_id": "red" } } + { "run_eocs": "apply_hair_dye", "variables": { "color_id": "red" } } ], "false_effect": [ { "u_message": "You don't have any red hair dye!" } ] }, @@ -494,7 +488,7 @@ "condition": { "u_has_item": "hair_dye_pink" }, "effect": [ { "u_message": "You finish dyeing your hair." }, - { "run_eoc_with": "apply_hair_dye", "variables": { "color_id": "pink" } } + { "run_eocs": "apply_hair_dye", "variables": { "color_id": "pink" } } ], "false_effect": [ { "u_message": "You don't have any pink hair dye!" } ] }, @@ -504,7 +498,7 @@ "condition": { "u_has_item": "hair_dye_white" }, "effect": [ { "u_message": "You finish dyeing your hair." }, - { "run_eoc_with": "apply_hair_dye", "variables": { "color_id": "white" } } + { "run_eocs": "apply_hair_dye", "variables": { "color_id": "white" } } ], "false_effect": [ { "u_message": "You don't have any white hair dye!" } ] } diff --git a/data/json/effects_on_condition/npc_eocs/hallucination_eocs.json b/data/json/effects_on_condition/npc_eocs/hallucination_eocs.json index 6655397e42b93..5e945a3beb513 100644 --- a/data/json/effects_on_condition/npc_eocs/hallucination_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/hallucination_eocs.json @@ -101,8 +101,8 @@ "id": "determine_if_coversation", "//": "85% chance for your weapon to make a conversation. If not, try again some time later.", "condition": { "x_in_y_chance": { "x": 85, "y": 100 } }, - "effect": { "queue_eocs": "weapon_talk_hallucination", "time_in_future": [ "10 seconds", "15 seconds" ] }, - "false_effect": { "queue_eocs": "weapon_talk_hallucination", "time_in_future": [ "4 hours", "6 hours" ] } + "effect": { "run_eocs": "weapon_talk_hallucination", "time_in_future": [ "10 seconds", "15 seconds" ] }, + "false_effect": { "run_eocs": "weapon_talk_hallucination", "time_in_future": [ "4 hours", "6 hours" ] } } } ], diff --git a/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json b/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json index 923f31961b079..63dd374a69c87 100644 --- a/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json @@ -249,7 +249,7 @@ }, { "u_teleport": { "global_val": "barry_return_home_map" }, "force": true }, { - "queue_eocs": { "id": "EOC_BARRY_CHECK_IF_HOME_DEACTIVATE", "effect": { "math": [ "barry_travelling_home", "=", "2" ] } }, + "run_eocs": { "id": "EOC_BARRY_CHECK_IF_HOME_DEACTIVATE", "effect": { "math": [ "barry_travelling_home", "=", "2" ] } }, "time_in_future": 25 }, { "u_spawn_item": "NC_Isherwood_Barry_equip", "use_item_group": true, "force_equip": true }, @@ -288,7 +288,7 @@ "om_special": "Barry's Mi-Go Scout Tower" }, { "math": [ "currently_invading_map", "=", "0" ] }, - { "queue_eocs": "isherwood_mission_damage_flee_message", "time_in_future": 1 } + { "run_eocs": "isherwood_mission_damage_flee_message", "time_in_future": 1 } ] } ], @@ -439,13 +439,13 @@ { "mapgen_update": "LUKE_REMOVE_TRUCK", "om_terrain": "trailhead_shack_z0" }, { "math": [ "isherwood_luke_truck_status", "++" ] } ], - "false_effect": [ { "queue_eocs": "EOC_LUKE_RETRIEVE_TRUCK_END", "time_in_future": 100 } ] + "false_effect": [ { "run_eocs": "EOC_LUKE_RETRIEVE_TRUCK_END", "time_in_future": 100 } ] }, { "type": "effect_on_condition", "id": "EOC_BARRY_ISHERWOOD_DIE", "eoc_type": "NPC_DEATH", - "effect": [ { "queue_eocs": "EOC_BARRY_ISHERWOOD_DIE_TRUE_EFFECT", "time_in_future": 1 } ] + "effect": [ { "run_eocs": "EOC_BARRY_ISHERWOOD_DIE_TRUE_EFFECT", "time_in_future": 1 } ] }, { "type": "effect_on_condition", diff --git a/data/json/effects_on_condition/scenario_specific_eocs.json b/data/json/effects_on_condition/scenario_specific_eocs.json index 0b37ba4cc1636..5826106304f7a 100644 --- a/data/json/effects_on_condition/scenario_specific_eocs.json +++ b/data/json/effects_on_condition/scenario_specific_eocs.json @@ -59,13 +59,13 @@ "max_radius": 0 }, { "location_variable_adjust": { "u_val": "mansion_centre" }, "x_adjust": 11, "y_adjust": 11 }, - { "run_eoc_with": "EOC_BANISH_MANSION_MONSTERS", "beta_loc": { "u_val": "mansion_centre" } }, + { "run_eocs": "EOC_BANISH_MANSION_MONSTERS", "beta_loc": { "u_val": "mansion_centre" } }, { "run_eocs": "EOC_SPAWN_MANSION_MONSTERS" }, { "location_variable_adjust": { "u_val": "mansion_centre" }, "z_adjust": 0, "z_override": true }, - { "run_eoc_with": "EOC_BANISH_MANSION_MONSTERS", "beta_loc": { "u_val": "mansion_centre" } }, + { "run_eocs": "EOC_BANISH_MANSION_MONSTERS", "beta_loc": { "u_val": "mansion_centre" } }, { "run_eocs": "EOC_SPAWN_MANSION_MONSTERS" }, { "location_variable_adjust": { "u_val": "mansion_centre" }, "z_adjust": 1, "z_override": true }, - { "run_eoc_with": "EOC_BANISH_MANSION_MONSTERS", "beta_loc": { "u_val": "mansion_centre" } }, + { "run_eocs": "EOC_BANISH_MANSION_MONSTERS", "beta_loc": { "u_val": "mansion_centre" } }, { "run_eocs": "EOC_SPAWN_MANSION_MONSTERS" }, { "u_run_monster_eocs": [ { "id": "EOC_BANISH_MONSTERS_AROUND_PLAYER", "effect": { "run_eocs": "EOC_BANISH_SELF" } } ], diff --git a/data/json/encounters/randec_independent_travelers.json b/data/json/encounters/randec_independent_travelers.json index 8d2895b15df1b..9814360e4b120 100644 --- a/data/json/encounters/randec_independent_travelers.json +++ b/data/json/encounters/randec_independent_travelers.json @@ -7,7 +7,7 @@ "effect": [ { "set_condition": "random_enc_condition", "condition": { "math": [ "0", "==", "0" ] } }, { - "run_eoc_with": "EOC_RandEnc", + "run_eocs": "EOC_RandEnc", "variables": { "omt": "roadstop_a", "map_update": "nest_RandEnc_campervan_traveler_add", diff --git a/data/json/encounters/randenc_caravans.json b/data/json/encounters/randenc_caravans.json index b88ce88992e1a..396c07720c99b 100644 --- a/data/json/encounters/randenc_caravans.json +++ b/data/json/encounters/randenc_caravans.json @@ -7,7 +7,7 @@ "effect": [ { "set_condition": "random_enc_condition", "condition": { "and": [ { "not": { "is_season": "winter" } }, "is_day" ] } }, { - "run_eoc_with": "EOC_RandEnc", + "run_eocs": "EOC_RandEnc", "variables": { "omt": "roadstop_a", "map_update": "nest_RandEnc_roadstop_a_add", @@ -59,7 +59,7 @@ } }, { - "run_eoc_with": "EOC_RandEnc", + "run_eocs": "EOC_RandEnc", "variables": { "omt": "roadstop_a", "map_update": "nest_RandEnc_roadstop_a_refugee_add", diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index 819d76a4cd11d..9827ce3ce2a2c 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -514,7 +514,7 @@ { "id": "EOC_myopia_contacts_weekly", "effect": { - "run_eoc_with": "EOC_CONTACTS", + "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "MYOPIC", "flag2": "MYOPIC_IN_LIGHT", "effect": "contacts", "time": "604800" } } } @@ -541,7 +541,7 @@ { "id": "EOC_myopia_transition_contacts_weekly", "effect": { - "run_eoc_with": "EOC_CONTACTS", + "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "MYOPIC", "flag2": "MYOPIC_IN_LIGHT", "effect": "transition_contacts", "time": "604800" } } } @@ -566,7 +566,7 @@ { "id": "EOC_myopia_contacts_daily", "effect": { - "run_eoc_with": "EOC_CONTACTS", + "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "MYOPIC", "flag2": "MYOPIC_IN_LIGHT", "effect": "contacts", "time": "57600" } } } @@ -591,7 +591,7 @@ { "id": "EOC_myopia_transition_contacts_daily", "effect": { - "run_eoc_with": "EOC_CONTACTS", + "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "MYOPIC", "flag2": "MYOPIC_IN_LIGHT", "effect": "transition_contacts", "time": "57600" } } } @@ -615,7 +615,7 @@ "effect_on_conditions": [ { "id": "EOC_hyperopia_contacts_weekly", - "effect": { "run_eoc_with": "EOC_CONTACTS", "variables": { "flag1": "HYPEROPIC", "effect": "contacts", "time": "604800" } } + "effect": { "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "HYPEROPIC", "effect": "contacts", "time": "604800" } } } ] } @@ -637,10 +637,7 @@ "effect_on_conditions": [ { "id": "EOC_hyperopia_transition_contacts_weekly", - "effect": { - "run_eoc_with": "EOC_CONTACTS", - "variables": { "flag1": "HYPEROPIC", "effect": "transition_contacts", "time": "604800" } - } + "effect": { "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "HYPEROPIC", "effect": "transition_contacts", "time": "604800" } } } ] } @@ -662,7 +659,7 @@ "effect_on_conditions": [ { "id": "EOC_hyperopia_contacts_daily", - "effect": { "run_eoc_with": "EOC_CONTACTS", "variables": { "flag1": "HYPEROPIC", "effect": "contacts", "time": "57600" } } + "effect": { "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "HYPEROPIC", "effect": "contacts", "time": "57600" } } } ] } @@ -684,10 +681,7 @@ "effect_on_conditions": [ { "id": "EOC_hyperopia_transition_contacts_daily", - "effect": { - "run_eoc_with": "EOC_CONTACTS", - "variables": { "flag1": "HYPEROPIC", "effect": "transition_contacts", "time": "57600" } - } + "effect": { "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "HYPEROPIC", "effect": "transition_contacts", "time": "57600" } } } ] } @@ -710,7 +704,7 @@ { "id": "EOC_bifocal_contacts_weekly", "effect": { - "run_eoc_with": "EOC_CONTACTS", + "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "MYOPIC", "flag2": "MYOPIC_IN_LIGHT", "flag3": "HYPEROPIC", "effect": "contacts", "time": "604800" } } } @@ -735,7 +729,7 @@ { "id": "EOC_bifocal_transition_contacts_weekly", "effect": { - "run_eoc_with": "EOC_CONTACTS", + "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "MYOPIC", "flag2": "MYOPIC_IN_LIGHT", @@ -766,7 +760,7 @@ { "id": "EOC_bifocal_contacts_daily", "effect": { - "run_eoc_with": "EOC_CONTACTS", + "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "MYOPIC", "flag2": "MYOPIC_IN_LIGHT", "flag3": "HYPEROPIC", "effect": "contacts", "time": "57600" } } } @@ -791,7 +785,7 @@ { "id": "EOC_bifocal_transition_contacts_daily", "effect": { - "run_eoc_with": "EOC_CONTACTS", + "run_eocs": "EOC_CONTACTS", "variables": { "flag1": "MYOPIC", "flag2": "MYOPIC_IN_LIGHT", @@ -821,10 +815,7 @@ "effect_on_conditions": [ { "id": "EOC_plano_transition_contacts_weekly", - "effect": { - "run_eoc_with": "EOC_CONTACTS", - "variables": { "effect": "transition_contacts_plano", "plano": "1", "time": "604800" } - } + "effect": { "run_eocs": "EOC_CONTACTS", "variables": { "effect": "transition_contacts_plano", "plano": "1", "time": "604800" } } } ] } @@ -846,10 +837,7 @@ "effect_on_conditions": [ { "id": "EOC_plano_transition_contacts_daily", - "effect": { - "run_eoc_with": "EOC_CONTACTS", - "variables": { "plano": "1", "effect": "transition_contacts_plano", "time": "57600" } - } + "effect": { "run_eocs": "EOC_CONTACTS", "variables": { "plano": "1", "effect": "transition_contacts_plano", "time": "57600" } } } ] } diff --git a/data/json/items/comestibles/serums.json b/data/json/items/comestibles/serums.json index 37ecdd4d61a98..e8abe4c7048fd 100644 --- a/data/json/items/comestibles/serums.json +++ b/data/json/items/comestibles/serums.json @@ -18,7 +18,7 @@ "effect_on_conditions": [ { "id": "EOC_RUN_SERUM_REGEN", - "effect": { "run_eoc_with": "EOC_SERUM_GENERIFIED", "variables": { "eoc": "EOC_SERUM_REGEN" } } + "effect": { "run_eocs": "EOC_SERUM_GENERIFIED", "variables": { "eoc": "EOC_SERUM_REGEN" } } } ] } diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index c0d4a01990ff4..43221ec1c56f4 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -2875,7 +2875,7 @@ { "id": "EOC_toolweapon_activate__combatsaw", "effect": { - "run_eoc_with": "EOC_toolweapon_activate", + "run_eocs": "EOC_toolweapon_activate", "variables": { "turn_cost": "0.6", "transform_target": "combatsaw_on", @@ -2909,7 +2909,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__combatsaw", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "combatsaw_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "combatsaw_off" } } } ] }, @@ -2919,7 +2919,7 @@ { "id": "EOC_toolweapon_running__combatsaw", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "12", "sound_message": { "i18n": true, "str": "Your combat chainsaw growls." }, @@ -2957,7 +2957,7 @@ { "id": "EOC_toolweapon_activate__e_combatsaw", "effect": { - "run_eoc_with": "EOC_toolweapon_activate", + "run_eocs": "EOC_toolweapon_activate", "variables": { "turn_cost": "0.6", "transform_target": "e_combatsaw_on", @@ -2999,7 +2999,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__e_combatsaw", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "e_combatsaw_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "e_combatsaw_off" } } } ] }, @@ -3009,7 +3009,7 @@ { "id": "EOC_toolweapon_running__e_combatsaw", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "12", "sound_message": { "i18n": true, "str": "Your electric combat chainsaw growls." }, diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index e3f84341b330c..8494aafe39917 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -91,7 +91,7 @@ { "id": "EOC_toolweapon_activate__carver", "effect": { - "run_eoc_with": "EOC_toolweapon_activate", + "run_eocs": "EOC_toolweapon_activate", "variables": { "turn_cost": "0.8", "transform_target": "carver_on", @@ -126,7 +126,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__carver", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "carver_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "carver_off" } } } ] }, @@ -138,7 +138,7 @@ { "id": "EOC_toolweapon_running__carver", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "10", "sound_message": { "i18n": true, "str": "Your electric carver buzzes." }, diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 4c4a06ddcfe4e..1f1678812b020 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -916,7 +916,7 @@ { "id": "EOC_toolweapon_running__supernoisemaker", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "0", "sound_message": { "i18n": true, "str": "Your super noise emitter produces an unholy blast of sonic chaos." }, diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json index d382dd62085c5..d7465661a93eb 100644 --- a/data/json/items/tool/landscaping.json +++ b/data/json/items/tool/landscaping.json @@ -364,7 +364,7 @@ "id": "EOC_toolweapon_activate__trimmer", "condition": { "math": [ "rng(0, 10) - n_damage_level()", ">", "3" ] }, "effect": { - "run_eoc_with": "EOC_toolweapon_activate", + "run_eocs": "EOC_toolweapon_activate", "variables": { "turn_cost": "0.8", "transform_target": "trimmer_on", @@ -396,7 +396,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__trimmer", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "trimmer_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "trimmer_off" } } } ] }, @@ -406,7 +406,7 @@ { "id": "EOC_toolweapon_running__trimmer", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "15", "sound_message": { "i18n": true, "str": "Your hedge trimmer rumbles." }, diff --git a/data/json/items/tool/masonry.json b/data/json/items/tool/masonry.json index 0ed0f42d46794..b2ac9a5a9d467 100644 --- a/data/json/items/tool/masonry.json +++ b/data/json/items/tool/masonry.json @@ -25,7 +25,7 @@ "id": "EOC_toolweapon_activate__masonrysaw", "condition": { "math": [ "rng(0, 10) - n_damage_level()", ">", "5" ] }, "effect": { - "run_eoc_with": "EOC_toolweapon_activate", + "run_eocs": "EOC_toolweapon_activate", "variables": { "turn_cost": "0.8", "transform_target": "masonrysaw_on", @@ -60,7 +60,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__masonrysaw", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "masonrysaw_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "masonrysaw_off" } } } ] }, @@ -70,7 +70,7 @@ { "id": "EOC_toolweapon_running__masonrysaw", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "15", "sound_message": { "i18n": true, "str": "Your masonry saw buzzes." }, @@ -137,7 +137,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__electric_masonrysaw", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "electric_masonrysaw_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "electric_masonrysaw_off" } } } ] }, @@ -155,7 +155,7 @@ { "id": "EOC_toolweapon_running__electric_masonrysaw", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "15", "sound_message": { "i18n": true, "str": "Your electric masonry saw buzzes." }, diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json index 02f28ed121637..8542b9b3ced68 100644 --- a/data/json/items/tool/med.json +++ b/data/json/items/tool/med.json @@ -435,7 +435,7 @@ { "id": "SALINE_INFUSION_250", "condition": { "math": [ "u_skill('firstaid')", ">=", "3" ] }, - "effect": { "run_eoc_with": "SALINE_INFUSION", "variables": { "volume_of_saline": "250" } }, + "effect": { "run_eocs": "SALINE_INFUSION", "variables": { "volume_of_saline": "250" } }, "false_effect": [ { "u_message": "You don't actually know how to use it properly.", "type": "bad" } ] } ] @@ -463,7 +463,7 @@ { "id": "SALINE_INFUSION_500", "condition": { "math": [ "u_skill('firstaid')", ">=", "4" ] }, - "effect": { "run_eoc_with": "SALINE_INFUSION", "variables": { "volume_of_saline": "500" } }, + "effect": { "run_eocs": "SALINE_INFUSION", "variables": { "volume_of_saline": "500" } }, "false_effect": [ { "u_message": "You don't actually know how to use it properly.", "type": "bad" } ] } ] @@ -491,7 +491,7 @@ { "id": "SALINE_INFUSION_1000", "condition": { "math": [ "u_skill('firstaid')", ">=", "4" ] }, - "effect": { "run_eoc_with": "SALINE_INFUSION", "variables": { "volume_of_saline": "1000" } }, + "effect": { "run_eocs": "SALINE_INFUSION", "variables": { "volume_of_saline": "1000" } }, "false_effect": [ { "u_message": "You don't actually know how to use it properly.", "type": "bad" } ] } ] @@ -519,7 +519,7 @@ { "id": "SALINE_INFUSION_2000", "condition": { "math": [ "u_skill('firstaid')", ">=", "4" ] }, - "effect": { "run_eoc_with": "SALINE_INFUSION", "variables": { "volume_of_saline": "2000" } }, + "effect": { "run_eocs": "SALINE_INFUSION", "variables": { "volume_of_saline": "2000" } }, "false_effect": [ { "u_message": "You don't actually know how to use it properly.", "type": "bad" } ] } ] diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index 97076af8f5dcf..f4a800d7c080e 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -96,7 +96,7 @@ { "id": "EOC_toolweapon_deactivate__chainsaw", "effect": [ - { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "chainsaw_off" } }, + { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "chainsaw_off" } }, { "sound_effect": "chainsaw_on", "id": "chainsaw_stop" } ] } @@ -108,7 +108,7 @@ { "id": "EOC_toolweapon_running__chainsaw", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "15", "sound_message": { "i18n": true, "str": "Your chainsaw rumbles." }, @@ -148,7 +148,7 @@ { "id": "EOC_toolweapon_activate__polesaw", "effect": { - "run_eoc_with": "EOC_toolweapon_activate", + "run_eocs": "EOC_toolweapon_activate", "variables": { "turn_cost": "0.8", "transform_target": "polesaw_on", @@ -182,7 +182,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__polesaw", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "polesaw_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "polesaw_off" } } } ] }, @@ -192,7 +192,7 @@ { "id": "EOC_toolweapon_running__polesaw", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "15", "sound_message": { "i18n": true, "str": "Your pole saw rumbles." }, @@ -229,7 +229,7 @@ { "id": "EOC_toolweapon_activate__circsaw", "effect": { - "run_eoc_with": "EOC_toolweapon_activate", + "run_eocs": "EOC_toolweapon_activate", "variables": { "turn_cost": "0.6", "transform_target": "circsaw_on", @@ -265,7 +265,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__circsaw", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "circsaw_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "circsaw_off" } } } ] }, @@ -275,7 +275,7 @@ { "id": "EOC_toolweapon_running__circsaw", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "15", "sound_message": { "i18n": true, "str": "Your circular saw buzzes." }, @@ -393,7 +393,7 @@ "id": "EOC_toolweapon_activate__elec_chainsaw", "condition": { "math": [ "rng(0, 10) - n_damage_level()", ">", "5" ] }, "effect": { - "run_eoc_with": "EOC_toolweapon_activate", + "run_eocs": "EOC_toolweapon_activate", "variables": { "turn_cost": "0.6", "transform_target": "elec_chainsaw_on", @@ -430,7 +430,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__elec_chainsaw", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "elec_chainsaw_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "elec_chainsaw_off" } } } ] }, @@ -440,7 +440,7 @@ { "id": "EOC_toolweapon_running__elec_chainsaw", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "5", "sound_message": { "i18n": true, "str": "Your electric chainsaw rumbles." }, @@ -471,7 +471,7 @@ "id": "EOC_toolweapon_activate__elec_chainsaw_cord", "condition": { "math": [ "rng(0, 10) - n_damage_level()", ">", "5" ] }, "effect": { - "run_eoc_with": "EOC_toolweapon_activate", + "run_eocs": "EOC_toolweapon_activate", "variables": { "turn_cost": "0.6", "transform_target": "elec_chainsaw_cord_on", @@ -502,7 +502,7 @@ "effect_on_conditions": [ { "id": "EOC_toolweapon_deactivate__elec_chainsaw_cord", - "effect": { "run_eoc_with": "EOC_toolweapon_deactivate", "variables": { "transform_target": "elec_chainsaw_cord_off" } } + "effect": { "run_eocs": "EOC_toolweapon_deactivate", "variables": { "transform_target": "elec_chainsaw_cord_off" } } } ] }, @@ -514,7 +514,7 @@ { "id": "EOC_toolweapon_running__elec_chainsaw_cord", "effect": { - "run_eoc_with": "EOC_toolweapon_running", + "run_eocs": "EOC_toolweapon_running", "variables": { "sound_chance": "5", "sound_message": { "i18n": true, "str": "Your corded electric chainsaw rumbles." }, diff --git a/data/json/mapgen/haunting.json b/data/json/mapgen/haunting.json index b85593f7f4f38..a7cb0b5aa78b8 100644 --- a/data/json/mapgen/haunting.json +++ b/data/json/mapgen/haunting.json @@ -38,7 +38,7 @@ "type": "speech", "target_var": { "global_val": "MERC_LOC" } }, - { "queue_eocs": "EOC_HAUNTING", "time_in_future": [ "30 seconds", "50 seconds" ] } + { "run_eocs": "EOC_HAUNTING", "time_in_future": [ "30 seconds", "50 seconds" ] } ], "effect": [ { "math": [ "XEDRA_OFFICER_STATUS", "=", "0" ] }, @@ -82,7 +82,7 @@ "global": true, "effect": [ { "give_achievement": "achievement_officer_kill" }, - { "queue_eocs": "EOC_HAUNTING_STOP", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_HAUNTING_STOP", "time_in_future": "1 seconds" } ] }, { diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json index f80c376858d16..be22d635c6e80 100644 --- a/data/json/monster_special_attacks/spells.json +++ b/data/json/monster_special_attacks/spells.json @@ -1043,7 +1043,7 @@ { "type": "effect_on_condition", "id": "EOC_PORTAL_STORM_DUNGEON_REFLECTION_RESPAWN", - "effect": [ { "queue_eocs": "EOC_PORTAL_STORM_DUNGEON_REFLECTION_SPAWN", "time_in_future": [ "30 seconds", "1 minutes" ] } ] + "effect": [ { "run_eocs": "EOC_PORTAL_STORM_DUNGEON_REFLECTION_SPAWN", "time_in_future": [ "30 seconds", "1 minutes" ] } ] }, { "type": "SPELL", @@ -1064,7 +1064,7 @@ "type": "effect_on_condition", "id": "EOC_PORTAL_STORM_SHADOW_RESPAWN", "condition": { "x_in_y_chance": { "x": 8, "y": 10 } }, - "effect": [ { "queue_eocs": "EOC_PORTAL_STORM_SHADOW_SPAWN", "time_in_future": [ "30 seconds", "1 minutes" ] } ], + "effect": [ { "run_eocs": "EOC_PORTAL_STORM_SHADOW_SPAWN", "time_in_future": [ "30 seconds", "1 minutes" ] } ], "false_effect": [ { "u_lose_trait": "TAINTED_SHADOW" } ] }, { diff --git a/data/json/monster_special_attacks/void_spider_mechanics.json b/data/json/monster_special_attacks/void_spider_mechanics.json index dda19b0682e66..f84d0a1144adc 100644 --- a/data/json/monster_special_attacks/void_spider_mechanics.json +++ b/data/json/monster_special_attacks/void_spider_mechanics.json @@ -146,8 +146,8 @@ "effect": [ { "mapgen_update": "void_spider_lair_entrance_shift", "om_terrain": "void_spider_lair_entrance" }, { "math": [ "spider_lair_sealed", "=", "1" ] }, - { "queue_eocs": "EOC_IN_VOID_SPIDER_LAIR", "time_in_future": "1 seconds" }, - { "queue_eocs": "EOC_VOID_SPIDER_EMPTY_REVERT", "time_in_future": "25 seconds" } + { "run_eocs": "EOC_IN_VOID_SPIDER_LAIR", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_VOID_SPIDER_EMPTY_REVERT", "time_in_future": "25 seconds" } ] } ] @@ -175,7 +175,7 @@ }, "effect": [ { "place_override": { "global_val": "place_name", "default_str": "strange cavern" }, "length": "10 seconds" }, - { "queue_eocs": "EOC_IN_VOID_SPIDER_LAIR", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_IN_VOID_SPIDER_LAIR", "time_in_future": "1 seconds" }, { "run_eocs": [ { @@ -314,7 +314,7 @@ } ] }, - { "queue_eocs": "EOC_VOID_SPIDER_DISTURBED_NEST", "time_in_future": [ "8 seconds", "10 seconds" ] } + { "run_eocs": "EOC_VOID_SPIDER_DISTURBED_NEST", "time_in_future": [ "8 seconds", "10 seconds" ] } ] }, { @@ -340,16 +340,16 @@ }, "effect": [ { "u_cast_spell": { "id": "void_spider_empty_revert", "hit_self": true } }, - { "queue_eocs": "EOC_VOID_SPIDER_EMPTY_REVERT", "time_in_future": "25 seconds" } + { "run_eocs": "EOC_VOID_SPIDER_EMPTY_REVERT", "time_in_future": "25 seconds" } ] }, { "type": "effect_on_condition", "id": "EOC_VOID_SPIDER_ON_DEATH", "effect": [ - { "queue_eocs": "EOC_VOID_SPIDER_KILLED", "time_in_future": "0 seconds" }, - { "queue_eocs": "EOC_VOID_SPIDER_RESET_VARS", "time_in_future": "2 hours" }, - { "queue_eocs": "EOC_DISSOLVE_VOID_SPIDER_LAIR", "time_in_future": "20 minutes" } + { "run_eocs": "EOC_VOID_SPIDER_KILLED", "time_in_future": "0 seconds" }, + { "run_eocs": "EOC_VOID_SPIDER_RESET_VARS", "time_in_future": "2 hours" }, + { "run_eocs": "EOC_DISSOLVE_VOID_SPIDER_LAIR", "time_in_future": "20 minutes" } ] }, { diff --git a/data/json/monster_special_attacks/yrax_special_attacks.json b/data/json/monster_special_attacks/yrax_special_attacks.json index aa826a7d365bd..bd13c01947338 100644 --- a/data/json/monster_special_attacks/yrax_special_attacks.json +++ b/data/json/monster_special_attacks/yrax_special_attacks.json @@ -227,7 +227,7 @@ "condition": { "math": [ "u_monsters_nearby('mon_yrax_quadraphract', 'radius': 60)", ">=", "1" ] }, "effect": [ { "math": [ "updating_quadraphracts", "=", "1" ] }, - { "queue_eocs": "eoc_update_quadraphract_walkers", "time_in_future": 1 }, + { "run_eocs": "eoc_update_quadraphract_walkers", "time_in_future": 1 }, { "u_run_monster_eocs": [ "eoc_quadraphract_walker" ], "monster_range": 65, diff --git a/data/json/monsters/singularities.json b/data/json/monsters/singularities.json index 6fa1826d2dd63..3bc40c26259e2 100644 --- a/data/json/monsters/singularities.json +++ b/data/json/monsters/singularities.json @@ -363,7 +363,7 @@ { "math": [ "Shadow_Lurking", "-=", "1" ] }, { "u_spawn_monster": "mon_lieutenant_shadow", "real_count": 1, "min_radius": 10, "max_radius": 15 }, { "u_location_variable": { "global_val": "shadow_encounter_XYZ_pos" }, "min_radius": 1, "max_radius": 1 }, - { "queue_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_MESSAGE", "time_in_future": 1 } + { "run_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_MESSAGE", "time_in_future": 1 } ], "false_effect": [ { "run_eocs": [ "EOC_LIEUTENANT_SHADOW_WARN" ] } ] }, @@ -473,7 +473,7 @@ "target_min_radius": 0, "target_max_radius": 60 }, - { "run_eoc_with": "EOC_KILL_SHADOW", "beta_loc": { "global_val": "Shadow_monster" } }, + { "run_eocs": "EOC_KILL_SHADOW", "beta_loc": { "global_val": "Shadow_monster" } }, { "u_message": "…but it grows more distant for now.", "type": "good" } ] }, @@ -491,7 +491,7 @@ "target_min_radius": 0, "target_max_radius": 60 }, - { "run_eoc_with": "EOC_LIEUTENANT_SHADOW_CATCHUP", "beta_loc": { "global_val": "Shadow_monster" } } + { "run_eocs": "EOC_LIEUTENANT_SHADOW_CATCHUP", "beta_loc": { "global_val": "Shadow_monster" } } ] }, { diff --git a/data/json/npcs/EOC_talkers/haircutting.json b/data/json/npcs/EOC_talkers/haircutting.json index bcdf2da7df514..09c2b4e04a210 100644 --- a/data/json/npcs/EOC_talkers/haircutting.json +++ b/data/json/npcs/EOC_talkers/haircutting.json @@ -58,7 +58,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_buzzcut" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_buzzcut" } } ], "topic": "TALK_DONE" }, @@ -105,7 +105,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_crewcut" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_crewcut" } } ], "topic": "TALK_DONE" }, @@ -151,7 +151,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_short" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_short" } } ], "topic": "TALK_DONE" }, @@ -196,7 +196,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_short_no_fringe" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_short_no_fringe" } } ], "topic": "TALK_DONE" }, @@ -240,7 +240,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_short_over_eye" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_short_over_eye" } } ], "topic": "TALK_DONE" }, @@ -283,7 +283,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_modern" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_modern" } } ], "topic": "TALK_DONE" }, @@ -325,7 +325,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_detective" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_detective" } } ], "topic": "TALK_DONE" }, @@ -366,7 +366,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_medium" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_medium" } } ], "topic": "TALK_DONE" }, @@ -406,7 +406,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_puff" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_puff" } } ], "topic": "TALK_DONE" }, @@ -445,7 +445,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_mohawk" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_mohawk" } } ], "topic": "TALK_DONE" }, @@ -483,7 +483,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_beaded" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_beaded" } } ], "topic": "TALK_DONE" }, @@ -520,7 +520,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_curls" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_curls" } } ], "topic": "TALK_DONE" }, @@ -556,7 +556,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_super_princess" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_super_princess" } } ], "topic": "TALK_DONE" }, @@ -591,7 +591,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_mohawk" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_mohawk" } } ], "topic": "TALK_DONE" }, @@ -625,7 +625,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_long" } } ], "topic": "TALK_DONE" }, @@ -658,7 +658,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_over_eye" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_over_eye" } } ], "topic": "TALK_DONE" }, @@ -690,7 +690,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_mullet" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_mullet" } } ], "topic": "TALK_DONE" }, @@ -721,7 +721,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_bun" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_bun" } } ], "topic": "TALK_DONE" }, @@ -751,7 +751,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_messy" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_messy" } } ], "topic": "TALK_DONE" }, @@ -780,7 +780,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_punk_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_punk_long" } } ], "topic": "TALK_DONE" }, @@ -808,7 +808,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_very_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_very_long" } } ], "topic": "TALK_DONE" }, @@ -831,7 +831,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_twintails" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_twintails" } } ], "topic": "TALK_DONE" }, @@ -852,7 +852,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_braid" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_braid" } } ], "topic": "TALK_DONE" }, @@ -868,7 +868,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_extremely_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_extremely_long" } } ], "topic": "TALK_DONE" }, @@ -884,7 +884,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_buzzcut" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_buzzcut" } } ], "topic": "TALK_DONE" }, @@ -900,7 +900,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_crewcut" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_crewcut" } } ], "topic": "TALK_DONE" }, @@ -916,7 +916,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_short" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_short" } } ], "topic": "TALK_DONE" }, @@ -932,7 +932,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_short_no_fringe" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_short_no_fringe" } } ], "topic": "TALK_DONE" }, @@ -948,7 +948,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_short_over_eye" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_short_over_eye" } } ], "topic": "TALK_DONE" }, @@ -964,7 +964,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_modern" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_modern" } } ], "topic": "TALK_DONE" }, @@ -980,7 +980,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_detective" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_detective" } } ], "topic": "TALK_DONE" }, @@ -996,7 +996,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_medium" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_medium" } } ], "topic": "TALK_DONE" }, @@ -1012,7 +1012,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_puff" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_puff" } } ], "topic": "TALK_DONE" }, @@ -1028,7 +1028,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_mohawk" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_mohawk" } } ], "topic": "TALK_DONE" }, @@ -1044,7 +1044,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_beaded" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_beaded" } } ], "topic": "TALK_DONE" }, @@ -1060,7 +1060,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_curls" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_curls" } } ], "topic": "TALK_DONE" }, @@ -1076,7 +1076,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_super_princess" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_super_princess" } } ], "topic": "TALK_DONE" }, @@ -1092,7 +1092,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_mohawk" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_mohawk" } } ], "topic": "TALK_DONE" }, @@ -1108,7 +1108,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_long" } } ], "topic": "TALK_DONE" }, @@ -1124,7 +1124,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_over_eye" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_long_over_eye" } } ], "topic": "TALK_DONE" }, @@ -1140,7 +1140,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_mullet" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_mullet" } } ], "topic": "TALK_DONE" }, @@ -1156,7 +1156,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_bun" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_bun" } } ], "topic": "TALK_DONE" }, @@ -1172,7 +1172,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_messy" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_messy" } } ], "topic": "TALK_DONE" }, @@ -1188,7 +1188,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_punk_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_punk_long" } } ], "topic": "TALK_DONE" }, @@ -1204,7 +1204,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_very_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_very_long" } } ], "topic": "TALK_DONE" }, @@ -1220,7 +1220,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_extremely_long" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_extremely_long" } } ], "topic": "TALK_DONE" }, @@ -1236,7 +1236,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_twintails" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_twintails" } } ], "topic": "TALK_DONE" }, @@ -1252,7 +1252,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_braid" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_braid" } } ], "topic": "TALK_DONE" }, @@ -1268,7 +1268,7 @@ "duration": "30 minutes", "decay_start": "30 minutes" }, - { "run_eoc_with": "reset_natural_hair_color", "variables": { "trait_id": "hair_body_length" } } + { "run_eocs": "reset_natural_hair_color", "variables": { "trait_id": "hair_body_length" } } ], "topic": "TALK_DONE" }, diff --git a/data/json/npcs/EOC_talkers/xedra_merc.json b/data/json/npcs/EOC_talkers/xedra_merc.json index 37fa1df0ba10e..fee2dff62c9ed 100644 --- a/data/json/npcs/EOC_talkers/xedra_merc.json +++ b/data/json/npcs/EOC_talkers/xedra_merc.json @@ -23,7 +23,7 @@ { "text": "You can hear the rushing of boots all around you, and the chattering of radios. It must still be close and you are their target.", "effect": [ - { "queue_eocs": "EOC_HAUNTING", "time_in_future": [ "20 seconds", "30 seconds" ] }, + { "run_eocs": "EOC_HAUNTING", "time_in_future": [ "20 seconds", "30 seconds" ] }, { "run_eocs": "EOC_HAUNTING_SPAWN" }, { "u_transform_radius": 5, "ter_furn_transform": "merc_spike_transform" } ], diff --git a/data/json/npcs/godco/godco_missions.json b/data/json/npcs/godco/godco_missions.json index 32fb8dd07257e..c626f2b549754 100644 --- a/data/json/npcs/godco/godco_missions.json +++ b/data/json/npcs/godco/godco_missions.json @@ -183,7 +183,7 @@ "effect": [ { "npc_location_variable": { "context_val": "search_locale" } }, { - "queue_eocs": "godco_place_warehouse_new", + "run_eocs": "godco_place_warehouse_new", "time_in_future": "336 hours", "variables": { "search_locale": { "context_val": "search_locale" } } }, @@ -320,7 +320,7 @@ { "npc_location_variable": { "context_val": "search_locale" } }, { "math": [ "darryl_building_coop", "=", "1" ] }, { - "queue_eocs": "godco_place_coop_new", + "run_eocs": "godco_place_coop_new", "time_in_future": "168 hours", "variables": { "search_locale": { "context_val": "search_locale" } } }, @@ -980,7 +980,7 @@ { "u_spawn_item": "icon", "count": 90 }, { "npc_location_variable": { "context_val": "search_locale" } }, { - "queue_eocs": "godco_place_herb_garden_new", + "run_eocs": "godco_place_herb_garden_new", "time_in_future": "72 hours", "variables": { "search_locale": { "context_val": "search_locale" } } } @@ -1260,7 +1260,7 @@ { "mapgen_update": "helena_planer", "om_terrain": "godco_8" }, { "npc_location_variable": { "context_val": "search_locale" } }, { - "queue_eocs": "godco_place_wall_new", + "run_eocs": "godco_place_wall_new", "time_in_future": "432 hours", "variables": { "search_locale": { "context_val": "search_locale" } } }, diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json index 363b47404b0ac..a090bd6a16d69 100644 --- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json @@ -480,7 +480,7 @@ "text": "All right. Let's kick some alien butt.", "effect": [ { "math": [ "isherwood_family_coming", "=", "0" ] }, - { "queue_eocs": "isherwood_mission_lisa_coming", "time_in_future": "1 hour" }, + { "run_eocs": "isherwood_mission_lisa_coming", "time_in_future": "1 hour" }, { "run_eocs": "isherwood_mission_initialization_eoc" }, { "math": [ "npc_isherwood_barry_rescue_attempts", "++" ] } ], @@ -490,7 +490,7 @@ "text": "Okay, I'll give you about an hour to talk with her about it. I'll be back soon.", "effect": [ { "math": [ "isherwood_family_coming", "=", "0" ] }, - { "queue_eocs": "isherwood_mission_lisa_coming", "time_in_future": "1 hour" } + { "run_eocs": "isherwood_mission_lisa_coming", "time_in_future": "1 hour" } ], "topic": "TALK_DONE" } @@ -853,7 +853,7 @@ "value": 0, "end": { "effect": [ - { "queue_eocs": "isherwood_mission_wall_finished", "time_in_future": "24 hours" }, + { "run_eocs": "isherwood_mission_wall_finished", "time_in_future": "24 hours" }, { "math": [ "isherwood_wall_status", "++" ] } ] }, diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index c178874059265..f85e6bc5f3000 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -525,7 +525,7 @@ ] } }, - "end": { "effect": [ { "queue_eocs": "EOC_LUKE_RETRIEVE_TRUCK_END", "time_in_future": 100 } ] }, + "end": { "effect": [ { "run_eocs": "EOC_LUKE_RETRIEVE_TRUCK_END", "time_in_future": 100 } ] }, "origins": [ "ORIGIN_SECONDARY" ], "//": "Dialogue for this mission is handled externally.", "dialogue": { diff --git a/data/json/npcs/isolated_road/isolated_road_cody_weaponsmith.json b/data/json/npcs/isolated_road/isolated_road_cody_weaponsmith.json index 3e30442d8b759..6d8c212c05100 100644 --- a/data/json/npcs/isolated_road/isolated_road_cody_weaponsmith.json +++ b/data/json/npcs/isolated_road/isolated_road_cody_weaponsmith.json @@ -45,109 +45,85 @@ }, { "text": "[200 merch, 3 days] I need a mace.", - "effect": { "run_eoc_with": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "mace", "cost": "200", "wait": "3" } }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "mace", "cost": "200", "wait": "3" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[200 merch, 3 days] I need a steelshod quarterstaff.", - "effect": { - "run_eoc_with": "EOC_blacksmith_weapon_choose_type", - "variables": { "name": "steel_staff", "cost": "200", "wait": "3" } - }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "steel_staff", "cost": "200", "wait": "3" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[250 merch, 4 days] I need a battle axe.", - "effect": { - "run_eoc_with": "EOC_blacksmith_weapon_choose_type", - "variables": { "name": "battleaxe", "cost": "250", "wait": "4" } - }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "battleaxe", "cost": "250", "wait": "4" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[250 merch, 4 days] I need a longsword.", - "effect": { - "run_eoc_with": "EOC_blacksmith_weapon_choose_type", - "variables": { "name": "longsword", "cost": "250", "wait": "4" } - }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "longsword", "cost": "250", "wait": "4" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[250 merch, 4 days] I need a nodachi.", - "effect": { "run_eoc_with": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "nodachi", "cost": "250", "wait": "4" } }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "nodachi", "cost": "250", "wait": "4" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[250 merch, 4 days] I need a zweihander.", - "effect": { - "run_eoc_with": "EOC_blacksmith_weapon_choose_type", - "variables": { "name": "zweihander", "cost": "250", "wait": "4" } - }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "zweihander", "cost": "250", "wait": "4" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[200 merch, 3 days] I need an arming sword.", - "effect": { - "run_eoc_with": "EOC_blacksmith_weapon_choose_type", - "variables": { "name": "arming_sword", "cost": "200", "wait": "3" } - }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "arming_sword", "cost": "200", "wait": "3" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[200 merch, 3 days] I need a broadsword.", - "effect": { - "run_eoc_with": "EOC_blacksmith_weapon_choose_type", - "variables": { "name": "broadsword", "cost": "200", "wait": "3" } - }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "broadsword", "cost": "200", "wait": "3" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[200 merch, 3 days] I need a cavalry saber.", "effect": { - "run_eoc_with": "EOC_blacksmith_weapon_choose_type", + "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "cavalry_sabre", "cost": "200", "wait": "3" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[200 merch, 3 days] I need a cutlass.", - "effect": { "run_eoc_with": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "cutlass", "cost": "200", "wait": "3" } }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "cutlass", "cost": "200", "wait": "3" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[200 merch, 3 days] I need a katana.", - "effect": { "run_eoc_with": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "katana", "cost": "200", "wait": "3" } }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "katana", "cost": "200", "wait": "3" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[170 merch, 3 days] I need a wakizashi.", - "effect": { - "run_eoc_with": "EOC_blacksmith_weapon_choose_type", - "variables": { "name": "wakizashi", "cost": "170", "wait": "3" } - }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "wakizashi", "cost": "170", "wait": "3" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[150 merch, 2 days] I need a kukri.", - "effect": { "run_eoc_with": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "kukri", "cost": "150", "wait": "2" } }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "kukri", "cost": "150", "wait": "2" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[250 merch, 4 days] I need an estoc.", - "effect": { "run_eoc_with": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "estoc", "cost": "250", "wait": "4" } }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "estoc", "cost": "250", "wait": "4" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[200 merch, 3 days] I need a rapier.", - "effect": { "run_eoc_with": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "rapier", "cost": "200", "wait": "3" } }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "rapier", "cost": "200", "wait": "3" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" }, { "text": "[70 merch, 2 days] I need a trench knife.", - "effect": { - "run_eoc_with": "EOC_blacksmith_weapon_choose_type", - "variables": { "name": "knife_trench", "cost": "70", "wait": "2" } - }, + "effect": { "run_eocs": "EOC_blacksmith_weapon_choose_type", "variables": { "name": "knife_trench", "cost": "70", "wait": "2" } }, "topic": "TALK_BLACKSMITH_WEAPONSMITH_STEEL" } ] diff --git a/data/json/npcs/isolated_road/isolated_road_jay_convert.json b/data/json/npcs/isolated_road/isolated_road_jay_convert.json index 6fedbf0d425d7..cdb2133865138 100644 --- a/data/json/npcs/isolated_road/isolated_road_jay_convert.json +++ b/data/json/npcs/isolated_road/isolated_road_jay_convert.json @@ -105,7 +105,7 @@ "text": "5.56x45.", "condition": { "u_has_items": { "item": "556", "count": { "u_val": "number_artisans_gunsmith_ammo_amount" } } }, "effect": [ - { "run_eoc_with": "EOC_gunsmith_set_source_type", "variables": { "key1": "556" } }, + { "run_eocs": "EOC_gunsmith_set_source_type", "variables": { "key1": "556" } }, { "run_eocs": "EOC_gunsmith_take_source" } ], "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" @@ -114,7 +114,7 @@ "text": "7.62x51.", "condition": { "u_has_items": { "item": "762_51", "count": { "u_val": "number_artisans_gunsmith_ammo_amount" } } }, "effect": [ - { "run_eoc_with": "EOC_gunsmith_set_source_type", "variables": { "key1": "76251" } }, + { "run_eocs": "EOC_gunsmith_set_source_type", "variables": { "key1": "76251" } }, { "run_eocs": "EOC_gunsmith_take_source" } ], "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" @@ -123,7 +123,7 @@ "text": "7.62x39.", "condition": { "u_has_items": { "item": "762_m87", "count": { "u_val": "number_artisans_gunsmith_ammo_amount" } } }, "effect": [ - { "run_eoc_with": "EOC_gunsmith_set_source_type", "variables": { "key1": "76239" } }, + { "run_eocs": "EOC_gunsmith_set_source_type", "variables": { "key1": "76239" } }, { "run_eocs": "EOC_gunsmith_take_source" } ], "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" @@ -132,7 +132,7 @@ "text": ".300 AAC.", "condition": { "u_has_items": { "item": "300blk", "count": { "u_val": "number_artisans_gunsmith_ammo_amount" } } }, "effect": [ - { "run_eoc_with": "EOC_gunsmith_set_source_type", "variables": { "key1": "300" } }, + { "run_eocs": "EOC_gunsmith_set_source_type", "variables": { "key1": "300" } }, { "run_eocs": "EOC_gunsmith_take_source" } ], "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" @@ -162,7 +162,7 @@ { "math": [ "u_number_artisans_failed_to_convert_ammo", "==", "0" ] } ] }, - "effect": { "run_eoc_with": "EOC_gunsmith_set_convert_target", "variables": { "key1": "556" } }, + "effect": { "run_eocs": "EOC_gunsmith_set_convert_target", "variables": { "key1": "556" } }, "topic": "TALK_GUNSMITH_CONVERT_CONFIRM" }, { @@ -173,7 +173,7 @@ { "math": [ "u_number_artisans_failed_to_convert_ammo", "==", "0" ] } ] }, - "effect": { "run_eoc_with": "EOC_gunsmith_set_convert_target", "variables": { "key1": "76251" } }, + "effect": { "run_eocs": "EOC_gunsmith_set_convert_target", "variables": { "key1": "76251" } }, "topic": "TALK_GUNSMITH_CONVERT_CONFIRM" }, { @@ -184,7 +184,7 @@ { "math": [ "u_number_artisans_failed_to_convert_ammo", "==", "0" ] } ] }, - "effect": { "run_eoc_with": "EOC_gunsmith_set_convert_target", "variables": { "key1": "76239" } }, + "effect": { "run_eocs": "EOC_gunsmith_set_convert_target", "variables": { "key1": "76239" } }, "topic": "TALK_GUNSMITH_CONVERT_CONFIRM" }, { @@ -195,7 +195,7 @@ { "math": [ "u_number_artisans_failed_to_convert_ammo", "==", "0" ] } ] }, - "effect": { "run_eoc_with": "EOC_gunsmith_set_convert_target", "variables": { "key1": "300" } }, + "effect": { "run_eocs": "EOC_gunsmith_set_convert_target", "variables": { "key1": "300" } }, "topic": "TALK_GUNSMITH_CONVERT_CONFIRM" }, { diff --git a/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json b/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json index d9c0d7c81c723..aa284d9466f07 100644 --- a/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json +++ b/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json @@ -90,34 +90,28 @@ "text": "[x20 , $1 a piece, max 200]", "show_always": true, "condition": { "math": [ "n_number_fabricate_2x4", "<", "200" ] }, - "effect": { "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "2x4", "batch": "20", "cost": "1" } }, + "effect": { "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "2x4", "batch": "20", "cost": "1" } }, "topic": "TALK_LUMBERMILL_FABRICATE" }, { "text": "[x20 , $0.7 a piece, max 200]", "show_always": true, "condition": { "math": [ "n_number_fabricate_plank_short", "<", "200" ] }, - "effect": { - "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", - "variables": { "name": "plank_short", "batch": "20", "cost": "0.7" } - }, + "effect": { "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "plank_short", "batch": "20", "cost": "0.7" } }, "topic": "TALK_LUMBERMILL_FABRICATE" }, { "text": "[x20 , $1.5 a piece, max 200]", "show_always": true, "condition": { "math": [ "n_number_fabricate_plank_long", "<", "200" ] }, - "effect": { - "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", - "variables": { "name": "plank_long", "batch": "20", "cost": "1.5" } - }, + "effect": { "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "plank_long", "batch": "20", "cost": "1.5" } }, "topic": "TALK_LUMBERMILL_FABRICATE" }, { "text": "[x10 , $1 a piece, max 100]", "show_always": true, "condition": { "math": [ "n_number_fabricate_wooden_post", "<", "100" ] }, - "effect": { "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wooden_post", "batch": "10", "cost": "1" } }, + "effect": { "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wooden_post", "batch": "10", "cost": "1" } }, "topic": "TALK_LUMBERMILL_FABRICATE" }, { @@ -125,7 +119,7 @@ "show_always": true, "condition": { "math": [ "n_number_fabricate_wooden_post_short", "<", "100" ] }, "effect": { - "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", + "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wooden_post_short", "batch": "10", "cost": "0.7" } }, "topic": "TALK_LUMBERMILL_FABRICATE" @@ -135,7 +129,7 @@ "show_always": true, "condition": { "math": [ "n_number_fabricate_wooden_post_long", "<", "100" ] }, "effect": { - "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", + "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wooden_post_long", "batch": "10", "cost": "1.5" } }, "topic": "TALK_LUMBERMILL_FABRICATE" @@ -144,28 +138,28 @@ "text": "[x5 , $8 a piece, max 100]", "show_always": true, "condition": { "math": [ "n_number_fabricate_wood_panel", "<", "100" ] }, - "effect": { "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wood_panel", "batch": "5", "cost": "8" } }, + "effect": { "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wood_panel", "batch": "5", "cost": "8" } }, "topic": "TALK_LUMBERMILL_FABRICATE" }, { "text": "[x5 , $16 a piece, max 100]", "show_always": true, "condition": { "math": [ "n_number_fabricate_wood_sheet", "<", "100" ] }, - "effect": { "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wood_sheet", "batch": "5", "cost": "16" } }, + "effect": { "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wood_sheet", "batch": "5", "cost": "16" } }, "topic": "TALK_LUMBERMILL_FABRICATE" }, { "text": "[x1 , $20 a piece, max 50]", "show_always": true, "condition": { "math": [ "n_number_fabricate_wood_beam", "<", "50" ] }, - "effect": { "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wood_beam", "batch": "1", "cost": "20" } }, + "effect": { "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "wood_beam", "batch": "1", "cost": "20" } }, "topic": "TALK_LUMBERMILL_FABRICATE" }, { "text": "[x5 , $5 a piece, max 100]", "show_always": true, "condition": { "math": [ "n_number_fabricate_log", "<", "100" ] }, - "effect": { "run_eoc_with": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "log", "batch": "5", "cost": "5" } }, + "effect": { "run_eocs": "EOC_LUMBERMILL_FABRICATE_order", "variables": { "name": "log", "batch": "5", "cost": "5" } }, "topic": "TALK_LUMBERMILL_FABRICATE" }, { diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_anchor_seller.json b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_anchor_seller.json index f4b0a2d3332a5..f85130f2f221b 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_anchor_seller.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_anchor_seller.json @@ -43,7 +43,7 @@ "speaker_effect": { "effect": [ { "u_add_var": "dialogue_BEM_ANCHOR_SELLER_ANCHOR_SELLER_paranormal", "value": "yes" }, - { "queue_eocs": "EOC_BEM_ANCHOR_SELLER_GONE", "time_in_future": [ "0s", "0s" ] } + { "run_eocs": "EOC_BEM_ANCHOR_SELLER_GONE", "time_in_future": [ "0s", "0s" ] } ] }, "responses": [ diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_chatting_veterans.json b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_chatting_veterans.json index 07e46326edf7a..cc2633a4e9bf5 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_chatting_veterans.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_chatting_veterans.json @@ -25,7 +25,7 @@ { "effect": [ { "u_add_effect": "drunk", "duration": "370 minutes" }, - { "queue_eocs": "EOC_BEM_BEM_CHATTING_VETERANS_DRUNK_TP", "time_in_future": [ "0s", "0s" ] }, + { "run_eocs": "EOC_BEM_BEM_CHATTING_VETERANS_DRUNK_TP", "time_in_future": [ "0s", "0s" ] }, { "u_add_faction_trust": 1 } ] } @@ -33,10 +33,7 @@ "responses": [ { "text": "Bar… barshender! We… we?", - "effect": [ - "end_conversation", - { "queue_eocs": "EOC_BEM_BEM_CHATTING_VETERANS_DRUNK_MESSAGE", "time_in_future": [ "0s", "0s" ] } - ], + "effect": [ "end_conversation", { "run_eocs": "EOC_BEM_BEM_CHATTING_VETERANS_DRUNK_MESSAGE", "time_in_future": [ "0s", "0s" ] } ], "topic": "TALK_DONE" } ] diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json index 364e600e54939..1e82eb6fa1e1d 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json @@ -101,7 +101,7 @@ "condition": { "u_has_items": { "item": "RobofacCoin", "count": 5 } }, "effect": [ { "u_sell_item": "RobofacCoin", "count": 5 }, - { "queue_eocs": "EOC_BEM_HUMAN_SAMPLE_BUY", "time_in_future": [ "2 days", "2 days" ] } + { "run_eocs": "EOC_BEM_HUMAN_SAMPLE_BUY", "time_in_future": [ "2 days", "2 days" ] } ] }, { diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json index 3583c4d80fe70..c57eca3737040 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json @@ -96,7 +96,7 @@ "effect": [ { "u_consume_item": "RobofacCoin", "count": 6, "popup": true }, { - "run_eoc_with": "EOC_INTERCOM_SPAWN_ARMOR_SET", + "run_eocs": "EOC_INTERCOM_SPAWN_ARMOR_SET", "variables": { "armor_type": "robofac_armor_pieces_military" } }, { "u_lose_var": "dialogue_hub_rnd_u_can_buy_armor" } @@ -370,7 +370,7 @@ "effect": [ { "u_consume_item": "RobofacCoin", "count": 6, "popup": true }, { - "run_eoc_with": "EOC_INTERCOM_SPAWN_ARMOR_SET", + "run_eocs": "EOC_INTERCOM_SPAWN_ARMOR_SET", "variables": { "armor_type": "robofac_armor_pieces_military" } } ], @@ -474,7 +474,7 @@ "condition": { "math": [ "time_since(u_timer_hub_rnd_u_waiting_on_hub)", ">=", "time('1 d')" ] }, "effect": [ { - "run_eoc_with": "EOC_INTERCOM_SPAWN_ARMOR_SET", + "run_eocs": "EOC_INTERCOM_SPAWN_ARMOR_SET", "variables": { "armor_type": { "u_val": "dialogue_hub_rnd_u_armor_type" } } }, { "u_lose_var": "dialogue_hub_rnd_u_project_ongoing" }, diff --git a/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json b/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json index 452b875d4b7dd..361d05d2a51e5 100644 --- a/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json +++ b/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json @@ -69,7 +69,7 @@ "effect": [ { "u_consume_item": "afs_shuttle_radiobeacon", "count": 1 }, { "u_message": "Order Received: Shuttle inbound to your location.", "popup": true }, - { "queue_eocs": "EOC_AFS_LAND_AUGUSTMOON_SHUTTLE", "time_in_future": "30 minutes" }, + { "run_eocs": "EOC_AFS_LAND_AUGUSTMOON_SHUTTLE", "time_in_future": "30 minutes" }, { "math": [ "augustmoon_shuttle_inprogress", "=", "1" ] } ], "false_effect": [ { "u_message": "WARNING: Cannot schedule landing, shuttle already inbound.", "popup": true } ] @@ -96,9 +96,9 @@ }, { "assign_mission": "MISSION_REACH_AUGUSTMOON_SHUTTLE" }, { "mapgen_update": "augustmoon_shuttle_ground", "target_var": { "global_val": "landing_site" } }, - { "queue_eocs": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL", "time_in_future": "4 hours" } + { "run_eocs": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL", "time_in_future": "4 hours" } ], - "false_effect": [ { "queue_eocs": "EOC_AFS_LAND_AUGUSTMOON_SHUTTLE", "time_in_future": "10 seconds" } ] + "false_effect": [ { "run_eocs": "EOC_AFS_LAND_AUGUSTMOON_SHUTTLE", "time_in_future": "10 seconds" } ] }, { "type": "effect_on_condition", @@ -109,7 +109,7 @@ { "remove_active_mission": "MISSION_REACH_AUGUSTMOON_SHUTTLE" }, { "mapgen_update": "augustmoon_shuttle_ground_left", "target_var": { "global_val": "landing_site" } } ], - "false_effect": [ { "queue_eocs": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL", "time_in_future": "10 seconds" } ] + "false_effect": [ { "run_eocs": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL", "time_in_future": "10 seconds" } ] }, { "type": "effect_on_condition", @@ -117,8 +117,8 @@ "effect": [ { "math": [ "augustmoon_shuttle_inprogress", "=", "0" ] }, { "run_eocs": "EOC_VALIDATE_PORT_AUGUSTMOON" }, - { "queue_eocs": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL", "time_in_future": "1 seconds" }, - { "queue_eocs": "EOC_augustmoon_reroll_vending_machine", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_augustmoon_reroll_vending_machine", "time_in_future": "1 seconds" }, { "u_location_variable": { "context_val": "crate_loc" }, "terrain": "t_intermodal_crate_scripted_source", @@ -145,7 +145,7 @@ "effect": [ { "math": [ "augustmoon_shuttle_inprogress", "=", "0" ] }, { "run_eocs": "EOC_VALIDATE_PORT_AUGUSTMOON" }, - { "queue_eocs": "EOC_augustmoon_reroll_vending_machine", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_augustmoon_reroll_vending_machine", "time_in_future": "1 seconds" }, { "u_location_variable": { "context_val": "crate_loc" }, "terrain": "t_intermodal_crate_scripted_source", diff --git a/data/mods/Aftershock/EOC/game_eoc.json b/data/mods/Aftershock/EOC/game_eoc.json index d3995f6877be2..7c5fddc5a4859 100644 --- a/data/mods/Aftershock/EOC/game_eoc.json +++ b/data/mods/Aftershock/EOC/game_eoc.json @@ -17,7 +17,7 @@ "id": "EOC_return_to_partyleader", "effect": [ { - "run_eoc_with": { + "run_eocs": { "id": "_EOC_return_to_partyleader_do", "effect": [ "follow", { "math": [ "afs_leadership_act", "=", "0" ] }, "take_control" ] }, diff --git a/data/mods/Aftershock/EOC/hacking_eoc.json b/data/mods/Aftershock/EOC/hacking_eoc.json index cf04706e25d19..1c8282613973a 100644 --- a/data/mods/Aftershock/EOC/hacking_eoc.json +++ b/data/mods/Aftershock/EOC/hacking_eoc.json @@ -59,7 +59,7 @@ { "u_message": "You connect to the lock controller." }, { "u_assign_activity": "ACT_afs_hack", "duration": { "context_val": "t_delay" } }, { - "queue_eoc_with": "EOC_afs_hack_unlock", + "run_eocs": "EOC_afs_hack_unlock", "time_in_future": { "context_val": "t_delay" }, "variables": { "furn_pos": { "context_val": "furn_pos" }, diff --git a/data/mods/Aftershock/effects_on_condition.json b/data/mods/Aftershock/effects_on_condition.json index de47e81cd3595..793afb99b1833 100644 --- a/data/mods/Aftershock/effects_on_condition.json +++ b/data/mods/Aftershock/effects_on_condition.json @@ -39,7 +39,7 @@ ] }, { "math": [ "u_flag_motion_sensor_afs_motion_sensor_ping", "++" ] }, - { "queue_eocs": "afs_motion_sensor_eoc_end_ping", "time_in_future": "2 seconds" } + { "run_eocs": "afs_motion_sensor_eoc_end_ping", "time_in_future": "2 seconds" } ] }, { @@ -84,7 +84,7 @@ "min_radius": 0, "max_radius": 0 }, - { "queue_eocs": "EOC_CRASHING_SHIP_U_DIE", "time_in_future": "7 minutes" } + { "run_eocs": "EOC_CRASHING_SHIP_U_DIE", "time_in_future": "7 minutes" } ] }, { diff --git a/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json b/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json index 7817edfb76fa5..9a1e49655c3cf 100644 --- a/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json +++ b/data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json @@ -253,7 +253,7 @@ "effect": [ { "math": [ "_t_delay", "=", "time('20 m')" ] }, { - "run_eoc_with": "EOC_start_lock_hack", + "run_eocs": "EOC_start_lock_hack", "variables": { "furn_pos": { "context_val": "pos" }, "t_delay": { "context_val": "t_delay" }, "difficulty": "9", "t_radius": "0" }, "alpha_talker": "avatar" } @@ -294,7 +294,7 @@ "effect": [ { "math": [ "_t_delay", "=", "time('20 m')" ] }, { - "run_eoc_with": "EOC_start_lock_hack", + "run_eocs": "EOC_start_lock_hack", "variables": { "furn_pos": { "context_val": "pos" }, "t_delay": { "context_val": "t_delay" }, "difficulty": "10", "t_radius": "0" }, "alpha_talker": "avatar" } @@ -429,7 +429,7 @@ "effect": [ { "math": [ "_t_delay", "=", "time('20 m')" ] }, { - "run_eoc_with": "EOC_start_lock_hack", + "run_eocs": "EOC_start_lock_hack", "variables": { "furn_pos": { "context_val": "pos" }, "t_delay": { "context_val": "t_delay" }, "difficulty": "10", "t_radius": "6" }, "alpha_talker": "avatar" } diff --git a/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json b/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json index eb2af995275ea..e09c3568e8256 100644 --- a/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json +++ b/data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_doors.json @@ -26,7 +26,7 @@ "effect": [ { "math": [ "_t_delay", "=", "time('20 m')" ] }, { - "run_eoc_with": "EOC_start_lock_hack", + "run_eocs": "EOC_start_lock_hack", "variables": { "furn_pos": { "context_val": "pos" }, "t_delay": { "context_val": "t_delay" }, "difficulty": "9", "t_radius": "0" }, "alpha_talker": "avatar" } diff --git a/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json b/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json index 0541cc2d742b2..6a4c51145df23 100644 --- a/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json +++ b/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json @@ -8,7 +8,7 @@ { "run_eocs": "EOC_AFS_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_afs_electrokin_see_electricity", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_AFS_ELECTROKIN_SEE_ELECTRICITY_MAINTENANCE", + "run_eocs": "EOC_AFS_ELECTROKIN_SEE_ELECTRICITY_MAINTENANCE", "time_in_future": [ { "math": [ "( (u_spell_level('afs_electrokinetic_see_electric') * 150) + 900) * (scaling_factor(u_val('intelligence') ) )" ] @@ -44,7 +44,7 @@ ] }, { - "queue_eocs": "EOC_AFS_ELECTROKIN_SEE_ELECTRICITY_MAINTENANCE", + "run_eocs": "EOC_AFS_ELECTROKIN_SEE_ELECTRICITY_MAINTENANCE", "time_in_future": [ { "math": [ "( (u_spell_level('afs_electrokinetic_see_electric') * 150) + 900) * (scaling_factor(u_val('intelligence') ) )" ] @@ -66,7 +66,7 @@ { "run_eocs": [ "EOC_AFS_POWER_MAINTENANCE_MINUS_ONE", "EOC_AFS_ELECTROKIN_HACKING_INTERFACE_SWITCHER" ] }, { "u_add_effect": "effect_afs_electrokin_hacking_interface", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_AFS_ELECTROKIN_HACKING_INTERFACE_MAINTENANCE", + "run_eocs": "EOC_AFS_ELECTROKIN_HACKING_INTERFACE_MAINTENANCE", "time_in_future": [ { "math": [ @@ -143,7 +143,7 @@ ] }, { - "queue_eocs": "EOC_AFS_ELECTROKIN_HACKING_INTERFACE_MAINTENANCE", + "run_eocs": "EOC_AFS_ELECTROKIN_HACKING_INTERFACE_MAINTENANCE", "time_in_future": [ { "math": [ @@ -168,7 +168,7 @@ { "u_message": "The hair on your body stands up on end.", "type": "good" }, { "run_eocs": [ "EOC_AFS_POWER_MAINTENANCE_MINUS_ONE" ] }, { - "queue_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER", + "run_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER", "time_in_future": [ { "math": [ @@ -184,7 +184,7 @@ }, { "u_add_effect": "effect_afs_electrokin_personal_battery", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_MAINTENANCE", + "run_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_MAINTENANCE", "time_in_future": [ { "math": [ @@ -213,7 +213,7 @@ "condition": { "u_has_effect": "effect_afs_electrokin_personal_battery" }, "effect": [ { - "queue_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER", + "run_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER", "time_in_future": [ { "math": [ @@ -239,7 +239,7 @@ } ] }, - { "queue_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER_FINALIZATION", "time_in_future": 1 } + { "run_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER_FINALIZATION", "time_in_future": 1 } ] }, { @@ -323,7 +323,7 @@ ] }, { - "queue_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_MAINTENANCE", + "run_eocs": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_MAINTENANCE", "time_in_future": [ { "math": [ diff --git a/data/mods/Aftershock/spells/psionics/telepathy_concentration_eocs.json b/data/mods/Aftershock/spells/psionics/telepathy_concentration_eocs.json index b37513377f21f..2c5f0328c90cc 100644 --- a/data/mods/Aftershock/spells/psionics/telepathy_concentration_eocs.json +++ b/data/mods/Aftershock/spells/psionics/telepathy_concentration_eocs.json @@ -8,7 +8,7 @@ { "run_eocs": "EOC_AFS_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_telepathic_psi_armor", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_AFS_TELEPATH_SHIELD_MAINTENANCE", + "run_eocs": "EOC_AFS_TELEPATH_SHIELD_MAINTENANCE", "time_in_future": [ { "math": [ "( (u_spell_level('afs_telepathic_shield') * 15) + 180) * (scaling_factor(u_val('intelligence') ) ) " ] }, { @@ -40,7 +40,7 @@ ] }, { - "queue_eocs": "EOC_AFS_TELEPATH_SHIELD_MAINTENANCE", + "run_eocs": "EOC_AFS_TELEPATH_SHIELD_MAINTENANCE", "time_in_future": [ { "math": [ "( (u_spell_level('afs_telepathic_shield') * 15) + 180) * (scaling_factor(u_val('intelligence') ) ) " ] }, { @@ -60,7 +60,7 @@ { "run_eocs": "EOC_AFS_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_telepath_sense_minds", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_AFS_TELEPATH_SENSE_MINDS_MAINTENANCE", + "run_eocs": "EOC_AFS_TELEPATH_SENSE_MINDS_MAINTENANCE", "time_in_future": [ { "math": [ "( (u_spell_level('afs_telepathic_mind_sense') * 26) + 90) * (scaling_factor(u_val('intelligence') ) ) " ] }, { @@ -92,7 +92,7 @@ ] }, { - "queue_eocs": "EOC_AFS_TELEPATH_SENSE_MINDS_MAINTENANCE", + "run_eocs": "EOC_AFS_TELEPATH_SENSE_MINDS_MAINTENANCE", "time_in_future": [ { "math": [ "( (u_spell_level('afs_telepathic_mind_sense') * 26) + 90) * (scaling_factor(u_val('intelligence') ) ) " ] }, { @@ -112,7 +112,7 @@ { "run_eocs": "EOC_AFS_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_telepathic_suggestion", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_AFS_TELEPATH_SUGGESTION_MAINTENANCE", + "run_eocs": "EOC_AFS_TELEPATH_SUGGESTION_MAINTENANCE", "time_in_future": [ { "math": [ "( (u_spell_level('afs_telepathic_suggestion') * 381) + 981) * (scaling_factor(u_val('intelligence') ) ) " ] @@ -146,7 +146,7 @@ ] }, { - "queue_eocs": "EOC_AFS_TELEPATH_SUGGESTION_MAINTENANCE", + "run_eocs": "EOC_AFS_TELEPATH_SUGGESTION_MAINTENANCE", "time_in_future": [ { "math": [ "( (u_spell_level('afs_telepathic_suggestion') * 381) + 981) * (scaling_factor(u_val('intelligence') ) ) " ] diff --git a/data/mods/BombasticPerks/corefiles/core_eocs.json b/data/mods/BombasticPerks/corefiles/core_eocs.json index 62ecc319a9c66..30ff3ed1af261 100644 --- a/data/mods/BombasticPerks/corefiles/core_eocs.json +++ b/data/mods/BombasticPerks/corefiles/core_eocs.json @@ -49,7 +49,7 @@ "condition": { "and": [ { "not": { "u_has_trait": "perk_perk_menu" } } ] }, "effect": [ { "open_dialogue": { "topic": "TALK_PERK_MENU_WELCOME" } }, - { "queue_eocs": "EOC_bombastic_perks_try_configure", "time_in_future": "30 seconds" }, + { "run_eocs": "EOC_bombastic_perks_try_configure", "time_in_future": "30 seconds" }, { "u_message": "Configuration menu closed, if Bombastic Perks was not properly configured menu will open again in 30 seconds." } diff --git a/data/mods/BombasticPerks/perkdata/grit_your_teeth.json b/data/mods/BombasticPerks/perkdata/grit_your_teeth.json index a5e5860d334f9..065ff920de804 100644 --- a/data/mods/BombasticPerks/perkdata/grit_your_teeth.json +++ b/data/mods/BombasticPerks/perkdata/grit_your_teeth.json @@ -28,7 +28,7 @@ "effect": [ { "math": [ "u_grit_your_teeth_pain_value_removed", "=", "u_pain() / 2" ] }, { "math": [ "u_pain()", "-=", "u_grit_your_teeth_pain_value_removed" ] }, - { "queue_eocs": "EOC_PERK_GRIT_YOUR_TEETH_DEACTIVATE", "time_in_future": 180 } + { "run_eocs": "EOC_PERK_GRIT_YOUR_TEETH_DEACTIVATE", "time_in_future": 180 } ], "false_effect": [ { @@ -38,12 +38,12 @@ "effect": [ { "math": [ "u_grit_your_teeth_pain_value_removed", "=", "30" ] }, { "math": [ "u_pain()", "-=", "u_grit_your_teeth_pain_value_removed" ] }, - { "queue_eocs": "EOC_PERK_GRIT_YOUR_TEETH_DEACTIVATE", "time_in_future": 180 } + { "run_eocs": "EOC_PERK_GRIT_YOUR_TEETH_DEACTIVATE", "time_in_future": 180 } ], "false_effect": [ { "math": [ "u_grit_your_teeth_pain_value_removed", "=", "u_pain()" ] }, { "math": [ "u_pain()", "=", "0" ] }, - { "queue_eocs": "EOC_PERK_GRIT_YOUR_TEETH_DEACTIVATE", "time_in_future": 180 } + { "run_eocs": "EOC_PERK_GRIT_YOUR_TEETH_DEACTIVATE", "time_in_future": 180 } ] } } diff --git a/data/mods/Defense_Mode/effects_on_condition/altered_eocs.json b/data/mods/Defense_Mode/effects_on_condition/altered_eocs.json index 93c646e31ab7c..5c82ef2239637 100644 --- a/data/mods/Defense_Mode/effects_on_condition/altered_eocs.json +++ b/data/mods/Defense_Mode/effects_on_condition/altered_eocs.json @@ -23,7 +23,7 @@ { "u_location_variable": { "global_val": "portal_storm_center" }, "min_radius": 30, "max_radius": 75 }, { "math": [ "cause_early_portal_storm", "=", "1" ] }, "next_weather", - { "queue_eocs": "EOC_CAUSE_PORTAL_STORM", "time_in_future": [ "30 seconds", "1 minutes" ] }, + { "run_eocs": "EOC_CAUSE_PORTAL_STORM", "time_in_future": [ "30 seconds", "1 minutes" ] }, { "assign_mission": "MISSION_INVESTIGATE_PORTAL_STORM_CENTER" }, { "u_message": "You suddenly register a buzzing in your senses. It's getting louder, and your head starts to throb. Somewhere nearby, a tiny cataclysm has begun (check mission log for details).", diff --git a/data/mods/Isolation-Protocol/Player/Perks/perk_eoc.json b/data/mods/Isolation-Protocol/Player/Perks/perk_eoc.json index 3073089f7503b..f9579e6e13eb7 100644 --- a/data/mods/Isolation-Protocol/Player/Perks/perk_eoc.json +++ b/data/mods/Isolation-Protocol/Player/Perks/perk_eoc.json @@ -49,7 +49,7 @@ { "id": "_EOC_ISO_GEAS", "condition": { "math": [ "u_val('difficulty')", ">=", "30" ] }, - "effect": [ { "run_eoc_with": "geas_monster", "beta_talker": "avatar" } ] + "effect": [ { "run_eocs": "geas_monster", "beta_talker": "avatar" } ] } ], "monster_range": 65, diff --git a/data/mods/Magiclysm/Spells/attunements/Cleansing_Flame.json b/data/mods/Magiclysm/Spells/attunements/Cleansing_Flame.json index 481b582266af6..638d30ead02e5 100644 --- a/data/mods/Magiclysm/Spells/attunements/Cleansing_Flame.json +++ b/data/mods/Magiclysm/Spells/attunements/Cleansing_Flame.json @@ -26,11 +26,11 @@ "effect": [ { "u_add_effect": "effect_burning_trail", "duration": "PERMANENT" }, { "u_add_effect": "effect_flame_immunity", "duration": "2 s" }, - { "queue_eocs": "EOC_CLEANSING_FLAME_FIRE_FOOSTEPS_2", "time_in_future": 1 } + { "run_eocs": "EOC_CLEANSING_FLAME_FIRE_FOOSTEPS_2", "time_in_future": 1 } ], "false_effect": [ { "u_lose_effect": "effect_burning_trail" }, - { "queue_eocs": "EOC_CLEANSING_FLAME_FIRE_FOOSTEPS_CLEANUP", "time_in_future": 2 } + { "run_eocs": "EOC_CLEANSING_FLAME_FIRE_FOOSTEPS_CLEANUP", "time_in_future": 2 } ] }, { @@ -47,12 +47,12 @@ { "math": [ "u_val('mana')", "-=", "1" ] }, { "u_add_effect": "effect_flame_immunity", "duration": "2 s" }, { "u_set_field": "fd_fire", "radius": 0, "hit_player": false }, - { "queue_eocs": "EOC_CLEANSING_FLAME_FIRE_FOOSTEPS_2", "time_in_future": 1 } + { "run_eocs": "EOC_CLEANSING_FLAME_FIRE_FOOSTEPS_2", "time_in_future": 1 } ], "false_effect": [ { "u_message": "You do not have enough mana to fuel your searing footsteps!", "type": "bad" }, { "u_lose_effect": "effect_burning_trail" }, - { "queue_eocs": "EOC_CLEANSING_FLAME_FIRE_FOOSTEPS_CLEANUP", "time_in_future": 2 } + { "run_eocs": "EOC_CLEANSING_FLAME_FIRE_FOOSTEPS_CLEANUP", "time_in_future": 2 } ] } ] diff --git a/data/mods/Magiclysm/Spells/biomancer.json b/data/mods/Magiclysm/Spells/biomancer.json index 1f4357479e1e2..51bbf533159a0 100644 --- a/data/mods/Magiclysm/Spells/biomancer.json +++ b/data/mods/Magiclysm/Spells/biomancer.json @@ -501,7 +501,7 @@ }, { "u_add_trait": "BIO_GIANT_GROWTH" }, { - "queue_eocs": "EOC_GIANT_GROWTH_MUTATION_REMOVE", + "run_eocs": "EOC_GIANT_GROWTH_MUTATION_REMOVE", "time_in_future": { "math": [ "(( u_spell_level('biomancer_giant_growth') * 40 ) + 300 ) * ( transformation_proficiency_modifier() )" ] } } ], @@ -598,7 +598,7 @@ { "u_message": "Your shoulders itch before two barbed tentacles erupt from them!", "type": "good" }, { "u_add_trait": "BIO_LASHING_TENTACLES" }, { - "queue_eocs": "EOC_LASHING_TENTACLES_MUTATION_REMOVE", + "run_eocs": "EOC_LASHING_TENTACLES_MUTATION_REMOVE", "time_in_future": { "math": [ "(( u_spell_level('biomancer_lashing_tentacles') * 15 ) + 70 ) * (transformation_proficiency_modifier() )" ] } @@ -761,7 +761,7 @@ { "u_add_trait": "ACIDBLOOD" }, { "u_add_trait": "ACIDPROOF" }, { - "queue_eocs": "EOC_BIO_CAUSTIC_BLOOD_MUTATION_REMOVE", + "run_eocs": "EOC_BIO_CAUSTIC_BLOOD_MUTATION_REMOVE", "time_in_future": { "math": [ "(( u_spell_level('biomancer_caustic_blood') * 600 ) + 1800 ) * ( enhancement_proficiency_modifier() )" ] } } ], diff --git a/data/mods/Magiclysm/Spells/druid.json b/data/mods/Magiclysm/Spells/druid.json index 79c0bcfac5dbe..bda8f92ca3ee2 100644 --- a/data/mods/Magiclysm/Spells/druid.json +++ b/data/mods/Magiclysm/Spells/druid.json @@ -792,7 +792,7 @@ "effect": [ { "u_add_trait": "TREE_COMMUNION" }, { "u_activate_trait": "TREE_COMMUNION" }, - { "queue_eocs": "EOC_LOSE_WHISPER_LEAVES", "time_in_future": [ "1 seconds", "1 seconds" ] } + { "run_eocs": "EOC_LOSE_WHISPER_LEAVES", "time_in_future": [ "1 seconds", "1 seconds" ] } ], "false_effect": [ { @@ -1208,7 +1208,7 @@ "search_data": [ { "id": "item_druid_disinfectant" } ], "true_eocs": [ { "id": "EOC_DRUID_DISINFECTANT_ITEM_ACTIVATE", "effect": { "u_activate": "heal" } } ] }, - { "queue_eocs": "EOC_DRUID_DISINFECTANT_REMOVE", "time_in_future": [ "1 seconds", "1 seconds" ] } + { "run_eocs": "EOC_DRUID_DISINFECTANT_REMOVE", "time_in_future": [ "1 seconds", "1 seconds" ] } ] }, { diff --git a/data/mods/Magiclysm/Spells/stormshaper.json b/data/mods/Magiclysm/Spells/stormshaper.json index d0d9cade679a8..87d29c3d9fbce 100644 --- a/data/mods/Magiclysm/Spells/stormshaper.json +++ b/data/mods/Magiclysm/Spells/stormshaper.json @@ -1126,7 +1126,7 @@ { "u_add_trait": "PHEROMONE_AMPHIBIAN" }, { "u_add_trait": "AMPHIBIAN" }, { - "queue_eocs": "EOC_LOSE_CLOAK_OF_FROG_MUTATIONS", + "run_eocs": "EOC_LOSE_CLOAK_OF_FROG_MUTATIONS", "time_in_future": [ { "math": [ "( (u_spell_level('stormshaper_cloak_of_frog') * 3750) + 15000) * transformation_proficiency_modifier()" ] }, { diff --git a/data/mods/Magiclysm/Spells/technomancer.json b/data/mods/Magiclysm/Spells/technomancer.json index 93d88f408bebe..f3712969899a0 100644 --- a/data/mods/Magiclysm/Spells/technomancer.json +++ b/data/mods/Magiclysm/Spells/technomancer.json @@ -760,7 +760,7 @@ "id": "EOC_CONJURE_UPS_SWITCHER", "effect": [ { - "queue_eocs": "EOC_CONJURE_UPS_REMOVER", + "run_eocs": "EOC_CONJURE_UPS_REMOVER", "time_in_future": { "math": [ "((u_spell_level('technomancer_conjure_ups') * 100 ) + 1000) * summoning_proficiency_modifier()" ] } }, { diff --git a/data/mods/Magiclysm/effect_on_conditions/attunements.json b/data/mods/Magiclysm/effect_on_conditions/attunements.json index 3e9a37184b215..8b4711d1d86d0 100644 --- a/data/mods/Magiclysm/effect_on_conditions/attunements.json +++ b/data/mods/Magiclysm/effect_on_conditions/attunements.json @@ -61,7 +61,7 @@ { "math": [ "u_hp('ALL')", "=", "999" ] }, { "math": [ "u_calories()", "=", "70000" ] }, { "u_spawn_item": "corpse_painful" }, - { "queue_eocs": "EOC_DUST_REBORN_2", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_DUST_REBORN_2", "time_in_future": "1 seconds" }, { "u_message": "You feel an insane pain, as your soul is pulled off, out of your body. Second later, your mind were pulled somewhere else, in the place you visit before." } diff --git a/data/mods/Magiclysm/effects/eoc_game_start.json b/data/mods/Magiclysm/effects/eoc_game_start.json index 687d577012546..f36910bf03c0c 100644 --- a/data/mods/Magiclysm/effects/eoc_game_start.json +++ b/data/mods/Magiclysm/effects/eoc_game_start.json @@ -5,7 +5,7 @@ "eoc_type": "EVENT", "required_event": "game_start", "condition": { "u_profession": "shifter_druid" }, - "effect": [ { "queue_eocs": "EOC_DRUID_SHIFTER_GIVE_FORM_2", "time_in_future": 0 } ] + "effect": [ { "run_eocs": "EOC_DRUID_SHIFTER_GIVE_FORM_2", "time_in_future": 0 } ] }, { "type": "effect_on_condition", diff --git a/data/mods/Magiclysm/effects/eoc_transformations.json b/data/mods/Magiclysm/effects/eoc_transformations.json index 3882bbb046dc8..3b682c7299b9f 100644 --- a/data/mods/Magiclysm/effects/eoc_transformations.json +++ b/data/mods/Magiclysm/effects/eoc_transformations.json @@ -51,7 +51,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a bear.", "type": "bad" }, - { "queue_eocs": "EOC_DRUID_SHIFTER_BEAR_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_DRUID_SHIFTER_BEAR_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -102,7 +102,7 @@ ], "false_effect": [ { "u_message": "You cannot transform into a bear if you are already in an animal form.", "type": "mixed" }, - { "queue_eocs": "EOC_DRUID_SHIFTER_BEAR_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_DRUID_SHIFTER_BEAR_FORM_deactivate_future", "time_in_future": 0 } ] }, { @@ -155,7 +155,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a cougar.", "type": "bad" }, - { "queue_eocs": "EOC_DRUID_SHIFTER_COUGAR_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_DRUID_SHIFTER_COUGAR_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -201,7 +201,7 @@ ], "false_effect": [ { "u_message": "You cannot transform into a cougar if you are already in an animal form.", "type": "mixed" }, - { "queue_eocs": "EOC_DRUID_SHIFTER_COUGAR_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_DRUID_SHIFTER_COUGAR_FORM_deactivate_future", "time_in_future": 0 } ] }, { @@ -262,7 +262,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a deer.", "type": "bad" }, - { "queue_eocs": "EOC_DRUID_SHIFTER_DEER_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_DRUID_SHIFTER_DEER_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -313,7 +313,7 @@ ], "false_effect": [ { "u_message": "You cannot transform into a deer if you are already in an animal form.", "type": "mixed" }, - { "queue_eocs": "EOC_DRUID_SHIFTER_DEER_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_DRUID_SHIFTER_DEER_FORM_deactivate_future", "time_in_future": 0 } ] }, { @@ -378,7 +378,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a raven.", "type": "bad" }, - { "queue_eocs": "EOC_DRUID_SHIFTER_RAVEN_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_DRUID_SHIFTER_RAVEN_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -433,7 +433,7 @@ ], "false_effect": [ { "u_message": "You cannot transform into a raven if you are already in an animal form.", "type": "mixed" }, - { "queue_eocs": "EOC_DRUID_SHIFTER_RAVEN_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_DRUID_SHIFTER_RAVEN_FORM_deactivate_future", "time_in_future": 0 } ] }, { diff --git a/data/mods/Magiclysm/items/enchanted_rings.json b/data/mods/Magiclysm/items/enchanted_rings.json index 27b89b9c5777e..fc096e2e68772 100644 --- a/data/mods/Magiclysm/items/enchanted_rings.json +++ b/data/mods/Magiclysm/items/enchanted_rings.json @@ -550,7 +550,7 @@ "condition": { "compare_string": [ "mring_sustenance", { "context_val": "itype" } ] }, "effect": [ { "u_add_effect": "effect_mring_sustenance", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_MAGICLYSM_WEARING_RING_OF_SUSTENANCE_FOLLOW_UP", "time_in_future": 60 } + { "run_eocs": "EOC_MAGICLYSM_WEARING_RING_OF_SUSTENANCE_FOLLOW_UP", "time_in_future": 60 } ] }, { @@ -569,9 +569,9 @@ "if": { "math": [ "u_calories()", "<=", "118000" ] }, "then": { "math": [ "u_calories()", "+=", "7" ] } }, - { "queue_eocs": "EOC_MAGICLYSM_WEARING_RING_OF_SUSTENANCE_FOLLOW_UP", "time_in_future": 60 } + { "run_eocs": "EOC_MAGICLYSM_WEARING_RING_OF_SUSTENANCE_FOLLOW_UP", "time_in_future": 60 } ], - "false_effect": [ { "queue_eocs": "EOC_MAGICLYSM_WEARING_RING_OF_SUSTENANCE_FOLLOW_UP", "time_in_future": 60 } ] + "false_effect": [ { "run_eocs": "EOC_MAGICLYSM_WEARING_RING_OF_SUSTENANCE_FOLLOW_UP", "time_in_future": 60 } ] } ], "false_eocs": [ diff --git a/data/mods/Magiclysm/mutations/mutation_eocs.json b/data/mods/Magiclysm/mutations/mutation_eocs.json index 6d1661d34c5aa..a7ff330d9e5e0 100644 --- a/data/mods/Magiclysm/mutations/mutation_eocs.json +++ b/data/mods/Magiclysm/mutations/mutation_eocs.json @@ -26,7 +26,7 @@ "id": "EOC_IRON_ALLERGY_WEARING_IRON_RESULT_TRUE", "effect": [ { "u_add_effect": "effect_iron_allergy_wearing_iron", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_IRON_ALLERGY_WEARING_IRON_FOLLOWUP", "time_in_future": 60 } + { "run_eocs": "EOC_IRON_ALLERGY_WEARING_IRON_FOLLOWUP", "time_in_future": 60 } ] } ], @@ -68,7 +68,7 @@ "id": "EOC_IRON_ALLERGY_WEARING_STEEL_RESULT_TRUE", "effect": [ { "u_add_effect": "effect_iron_allergy_wearing_steel", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_IRON_ALLERGY_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 } + { "run_eocs": "EOC_IRON_ALLERGY_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 } ], "false_effect": [ { "u_lose_effect": "effect_iron_allergy_wearing_steel" } ] } @@ -86,7 +86,7 @@ "id": "EOC_RAVENFOLK_LEAP", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "energy_amount": "2500", "prep_time": "1", diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json index 0d103b086a458..f3abdc82aa48a 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json @@ -53,7 +53,7 @@ { "run_eocs": "EOC_TEACH_BIOKIN_CONTEMPLATE_RECIPES" }, { "math": [ "u_awakening_countup", "+=", "1" ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_BIOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_BIOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -67,7 +67,7 @@ { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 10 }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_BIOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_BIOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -115,7 +115,7 @@ { "run_eocs": "EOC_TEACH_CLAIR_CONTEMPLATE_RECIPES" }, { "math": [ "u_awakening_countup", "+=", "1" ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_CLAIR_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_CLAIR_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -128,7 +128,7 @@ }, { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 10 }, - { "queue_eocs": "EOC_CLAIR_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_CLAIR_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 } ] }, @@ -177,7 +177,7 @@ { "run_eocs": "EOC_TEACH_ELECTROKIN_CONTEMPLATE_RECIPES" }, { "math": [ "u_awakening_countup", "+=", "1" ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_ELECTRO_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_ELECTRO_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -191,7 +191,7 @@ { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 10 }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_ELECTRO_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_ELECTRO_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -237,11 +237,11 @@ { "u_add_trait": "PHOTO_EYES" }, { "u_add_effect": "effect_photokin_arms", "duration": "5 minutes" }, { "u_add_effect": "effect_photokin_invisibility", "duration": "5 minutes" }, - { "queue_eocs": "EOC_PHOTOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_PHOTOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, { "run_eocs": "EOC_TEACH_PHOTOKIN_CONTEMPLATE_RECIPES" }, { "math": [ "u_awakening_countup", "+=", "1" ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_PHOTOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_PHOTOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -254,7 +254,7 @@ }, { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 5 }, - { "queue_eocs": "EOC_PHOTOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_PHOTOKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 } ] }, @@ -304,7 +304,7 @@ { "run_eocs": "EOC_TEACH_PYROKIN_CONTEMPLATE_RECIPES" }, { "math": [ "u_awakening_countup", "+=", "1" ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_PYROKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_PYROKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -317,7 +317,7 @@ }, { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 10 }, - { "queue_eocs": "EOC_PYROKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_PYROKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 } ] }, @@ -366,7 +366,7 @@ { "run_eocs": "EOC_TEACH_TELEKIN_CONTEMPLATE_RECIPES" }, { "math": [ "u_awakening_countup", "+=", "1" ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_TELEKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_TELEKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -379,7 +379,7 @@ }, { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 10 }, - { "queue_eocs": "EOC_TELEKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_TELEKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 } ] }, @@ -428,7 +428,7 @@ { "run_eocs": "EOC_TEACH_TELEPATH_CONTEMPLATE_RECIPES" }, { "math": [ "u_awakening_countup", "+=", "1" ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_TELEPATH_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_TELEPATH_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -441,7 +441,7 @@ }, { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 5 }, - { "queue_eocs": "EOC_TELEPATH_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_TELEPATH_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 } ] }, @@ -492,7 +492,7 @@ { "run_eocs": "EOC_TEACH_TELEPORT_CONTEMPLATE_RECIPES" }, { "math": [ "u_awakening_countup", "+=", "1" ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_TELEPORT_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_TELEPORT_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -505,7 +505,7 @@ }, { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 10 }, - { "queue_eocs": "EOC_TELEPORT_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_TELEPORT_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 } ] }, @@ -554,7 +554,7 @@ { "run_eocs": "EOC_TEACH_VITAKIN_CONTEMPLATE_RECIPES" }, { "math": [ "u_awakening_countup", "+=", "1" ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_VITAKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_VITAKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { @@ -567,7 +567,7 @@ }, { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 10 }, - { "queue_eocs": "EOC_VITAKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, + { "run_eocs": "EOC_VITAKIN_CRYSTAL_DRAINING", "time_in_future": "1 seconds" }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 } ] }, @@ -602,7 +602,7 @@ ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, - { "queue_eocs": "EOC_CORUSCATING_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_CORUSCATING_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ], "false_effect": [ { @@ -611,7 +611,7 @@ }, { "u_add_effect": "psionic_overload", "duration": "1 hours" }, { "u_add_effect": "stunned", "duration": 10 }, - { "queue_eocs": "EOC_CORUSCATING_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_CORUSCATING_CRYSTAL_DRAINING", "time_in_future": "1 seconds" } ] }, { diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_items.json b/data/mods/MindOverMatter/effectoncondition/eoc_items.json index d1a9d7d460083..6f0d7fcbdd723 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_items.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_items.json @@ -128,11 +128,8 @@ "id": "EOC_PSI_TRANSPORTER_REMOTE_TELEPORT", "condition": { "u_has_items": { "item": "psionic_transporter_remote_on", "count": 1 } }, "effect": [ - { "queue_eocs": "EOC_PSI_TRANSPORTER_REMOTE_TELEPORT_BEEP", "time_in_future": [ "15 seconds", "45 seconds" ] }, - { - "queue_eocs": "EOC_PSI_TRANSPORTER_REMOTE_TELEPORT_TRANSPORT", - "time_in_future": [ "4 minutes", "7 minutes" ] - } + { "run_eocs": "EOC_PSI_TRANSPORTER_REMOTE_TELEPORT_BEEP", "time_in_future": [ "15 seconds", "45 seconds" ] }, + { "run_eocs": "EOC_PSI_TRANSPORTER_REMOTE_TELEPORT_TRANSPORT", "time_in_future": [ "4 minutes", "7 minutes" ] } ] }, { @@ -142,7 +139,7 @@ "effect": [ { "u_message": "The transporter remote emits a small beep.", "type": "neutral" }, { "u_make_sound": "a small beep", "volume": 2, "type": "music" }, - { "queue_eocs": "EOC_PSI_TRANSPORTER_REMOTE_TELEPORT_BEEP", "time_in_future": [ "15 seconds", "45 seconds" ] } + { "run_eocs": "EOC_PSI_TRANSPORTER_REMOTE_TELEPORT_BEEP", "time_in_future": [ "15 seconds", "45 seconds" ] } ] }, { diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json index d791058ad4896..22854292b930f 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json @@ -1225,7 +1225,7 @@ { "math": [ "_success", "!=", "false" ] } ] }, - "effect": [ { "queue_eocs": "EOC_PSI_RESEARCH_LEARN_EXTENDED_CHANNELING_TRIGGER", "time_in_future": [ "6 hours", "24 hours" ] } ] + "effect": [ { "run_eocs": "EOC_PSI_RESEARCH_LEARN_EXTENDED_CHANNELING_TRIGGER", "time_in_future": [ "6 hours", "24 hours" ] } ] }, { "type": "effect_on_condition", @@ -1261,9 +1261,7 @@ { "math": [ "_success", "!=", "false" ] } ] }, - "effect": [ - { "queue_eocs": "EOC_PSI_RESEARCH_LEARN_TORRENTIAL_CHANNELING_TRIGGER", "time_in_future": [ "6 hours", "24 hours" ] } - ] + "effect": [ { "run_eocs": "EOC_PSI_RESEARCH_LEARN_TORRENTIAL_CHANNELING_TRIGGER", "time_in_future": [ "6 hours", "24 hours" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_misc.json b/data/mods/MindOverMatter/effectoncondition/eoc_misc.json index 0b64dd59dedd7..d7a56ccd13a82 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_misc.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_misc.json @@ -266,7 +266,7 @@ "type": "effect_on_condition", "id": "EOC_ALIEN_MEADOW_BUSH_2_BERRIES", "//": "This sets up a delayed reaction to eating the berries", - "effect": [ { "queue_eocs": "EOC_ALIEN_MEADOW_BUSH_2_BERRIES_2", "time_in_future": [ "5 minutes", "20 minutes" ] } ] + "effect": [ { "run_eocs": "EOC_ALIEN_MEADOW_BUSH_2_BERRIES_2", "time_in_future": [ "5 minutes", "20 minutes" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_observed.json b/data/mods/MindOverMatter/effectoncondition/eoc_observed.json index f1ad4523ca39c..440baa108aab2 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_observed.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_observed.json @@ -83,7 +83,7 @@ "true_eocs": [ { "id": "EOC_CHECK_NEAR_NETHER_CRYSTAL_FOLLOWUP", - "effect": [ { "queue_eocs": "EOC_CHECK_NEAR_NETHER_CRYSTAL_FOLLOWUP_2", "time_in_future": "30 minutes" } ] + "effect": [ { "run_eocs": "EOC_CHECK_NEAR_NETHER_CRYSTAL_FOLLOWUP_2", "time_in_future": "30 minutes" } ] } ] } 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 aa51466250cdf..9e1145e90d8ae 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json @@ -36,7 +36,7 @@ { "id": "EOC_PSI_NO_COMBAT_POWER_CHARACTER_DAMAGE_CHECK_2", "condition": { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" }, - "effect": [ { "run_eoc_with": "EOC_POWER_TOGGLE_REMOVE_EFFECTS", "alpha_talker": "npc" } ] + "effect": [ { "run_eocs": "EOC_POWER_TOGGLE_REMOVE_EFFECTS", "alpha_talker": "npc" } ] } ] } @@ -54,7 +54,7 @@ { "id": "EOC_PSI_NO_COMBAT_POWER_MONSTER_DAMAGE_CHECK_2", "condition": { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" }, - "effect": [ { "run_eoc_with": "EOC_POWER_TOGGLE_REMOVE_EFFECTS", "alpha_talker": "npc" } ] + "effect": [ { "run_eocs": "EOC_POWER_TOGGLE_REMOVE_EFFECTS", "alpha_talker": "npc" } ] } ] } @@ -541,7 +541,7 @@ { "u_add_effect": "downed", "duration": 5 }, { "u_add_effect": "motor_seizure", "duration": 4 }, { "u_add_effect": "stunned", "duration": 1 }, - { "queue_eocs": "EOC_ELECTRO_OVERLOAD_ZAP", "time_in_future": [ "1 minutes", "45 minutes" ] } + { "run_eocs": "EOC_ELECTRO_OVERLOAD_ZAP", "time_in_future": [ "1 minutes", "45 minutes" ] } ] }, { @@ -746,7 +746,7 @@ { "not": { "u_has_flag": "TEEPSHIELD" } } ] }, - "effect": [ { "queue_eocs": "EOC_TELEPORTER_THE_HOUNDS_FOLLOW_GATEWAY_2", "time_in_future": 0 } ] + "effect": [ { "run_eocs": "EOC_TELEPORTER_THE_HOUNDS_FOLLOW_GATEWAY_2", "time_in_future": 0 } ] }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_potions.json b/data/mods/MindOverMatter/effectoncondition/eoc_potions.json index fac139087f8f2..f2ec72c564ebf 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_potions.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_potions.json @@ -8,7 +8,7 @@ { "u_lose_effect": "effect_biokin_potion_comedown" }, { "u_add_effect": "effect_biokin_potion", "duration": "30 hours" }, { "u_add_effect": "effect_matrix_potion_nether_boost", "duration": "30 hours" }, - { "queue_eocs": "EOC_BIOKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } + { "run_eocs": "EOC_BIOKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } ], "false_effect": [ { "u_message": "You drink the concoction." }, @@ -33,7 +33,7 @@ { "u_lose_effect": "effect_clair_potion_comedown" }, { "u_add_effect": "effect_clair_potion", "duration": "30 hours" }, { "u_add_effect": "effect_matrix_potion_nether_boost", "duration": "30 hours" }, - { "queue_eocs": "EOC_CLAIR_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } + { "run_eocs": "EOC_CLAIR_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } ], "false_effect": [ { "u_message": "You drink the concoction." }, @@ -59,7 +59,7 @@ { "u_add_effect": "effect_electrokin_potion", "duration": "30 hours" }, { "u_add_effect": "effect_matrix_potion_nether_boost", "duration": "30 hours" }, { "run_eocs": "EOC_ELECTROKIN_POTION_JITTERS_CHECKER" }, - { "queue_eocs": "EOC_ELECTROKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } + { "run_eocs": "EOC_ELECTROKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } ], "false_effect": [ { "u_message": "You drink the concoction." }, @@ -100,7 +100,7 @@ { "u_add_effect": "effect_photokin_potion", "duration": "30 hours" }, { "u_add_effect": "effect_matrix_potion_nether_boost", "duration": "30 hours" }, { "u_add_trait": "PHOTOLIXIR_LIGHT" }, - { "queue_eocs": "EOC_PHOTOKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } + { "run_eocs": "EOC_PHOTOKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } ], "false_effect": [ { "u_message": "You drink the concoction." }, @@ -127,7 +127,7 @@ { "u_lose_effect": "effect_pyrokin_potion_comedown" }, { "u_add_effect": "effect_pyrokin_potion", "duration": "30 hours" }, { "u_add_effect": "effect_matrix_potion_nether_boost", "duration": "30 hours" }, - { "queue_eocs": "EOC_PYROKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } + { "run_eocs": "EOC_PYROKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } ], "false_effect": [ { "u_message": "You drink the concoction." }, @@ -153,7 +153,7 @@ { "u_add_effect": "effect_telekin_potion", "duration": "30 hours" }, { "u_add_effect": "effect_matrix_potion_nether_boost", "duration": "30 hours" }, { "u_add_trait": "TELELIXIRDOWN" }, - { "queue_eocs": "EOC_TELEKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } + { "run_eocs": "EOC_TELEKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } ], "false_effect": [ { "u_message": "You drink the concoction." }, @@ -180,7 +180,7 @@ { "u_lose_effect": "effect_telepath_potion_comedown" }, { "u_add_effect": "effect_telepath_potion", "duration": "30 hours" }, { "u_add_effect": "effect_matrix_potion_nether_boost", "duration": "30 hours" }, - { "queue_eocs": "EOC_TELEPATH_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } + { "run_eocs": "EOC_TELEPATH_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } ], "false_effect": [ { "u_message": "You drink the concoction." }, @@ -205,7 +205,7 @@ { "u_lose_effect": "effect_teleport_potion_comedown" }, { "u_add_effect": "effect_teleport_potion", "duration": "30 hours" }, { "u_add_effect": "effect_matrix_potion_nether_boost", "duration": "30 hours" }, - { "queue_eocs": "EOC_TELEPORT_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } + { "run_eocs": "EOC_TELEPORT_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } ], "false_effect": [ { "u_message": "You drink the concoction." }, @@ -242,7 +242,7 @@ { "u_lose_effect": "effect_vitakin_potion_comedown" }, { "u_add_effect": "effect_vitakin_potion", "duration": "30 hours" }, { "u_add_effect": "effect_matrix_potion_nether_boost", "duration": "30 hours" }, - { "queue_eocs": "EOC_VITAKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } + { "run_eocs": "EOC_VITAKIN_POTION_COMEDOWN", "time_in_future": [ "12 hours", "30 hours" ] } ], "false_effect": [ { "u_message": "You drink the concoction." }, @@ -272,7 +272,7 @@ "effect": [ { "u_lose_effect": "effect_noetic_resilience_comedown" }, { "u_add_effect": "effect_noetic_resilience", "duration": "30 hours" }, - { "queue_eocs": "EOC_DRAIN_RESIST_POTION_COMEDOWN", "time_in_future": [ "18 hours", "30 hours" ] } + { "run_eocs": "EOC_DRAIN_RESIST_POTION_COMEDOWN", "time_in_future": [ "18 hours", "30 hours" ] } ] }, { diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json b/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json index dbb25ec016c65..b1da9444c7fb0 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json @@ -29,7 +29,7 @@ "popup": true }, { - "queue_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_ACTUAL", + "run_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_ACTUAL", "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 5) + 10" ] } } ], @@ -45,7 +45,7 @@ "effect": [ { "math": [ "u_Shadow_Lurking", "--" ] }, { "u_spawn_monster": "mon_lieutenant_shadow", "real_count": 1, "min_radius": 10, "max_radius": 15 }, - { "queue_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_MESSAGE", "time_in_future": 1 } + { "run_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_MESSAGE", "time_in_future": 1 } ] }, { @@ -76,7 +76,7 @@ "popup": true }, { - "queue_eocs": "EOC_CAUSE_EARLY_PORTAL_STORM_ACTUAL", + "run_eocs": "EOC_CAUSE_EARLY_PORTAL_STORM_ACTUAL", "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 15) + 15" ] } } ], @@ -93,7 +93,7 @@ { "u_location_variable": { "global_val": "portal_storm_center" }, "min_radius": 30, "max_radius": 75 }, { "math": [ "cause_early_portal_storm", "=", "1" ] }, "next_weather", - { "queue_eocs": "EOC_CAUSE_PORTAL_STORM", "time_in_future": [ "30 seconds", "1 minutes" ] }, + { "run_eocs": "EOC_CAUSE_PORTAL_STORM", "time_in_future": [ "30 seconds", "1 minutes" ] }, { "assign_mission": "MISSION_INVESTIGATE_PORTAL_STORM_CENTER" }, { "u_message": "You suddenly register a buzzing in your senses. It's getting louder, and your head starts to throb. Somewhere nearby, a tiny cataclysm has begun (check mission log for details).", @@ -135,7 +135,7 @@ "popup": true }, { - "queue_eocs": "EOC_BANDIT_ASSASSIN_1_ACTUAL_FAR", + "run_eocs": "EOC_BANDIT_ASSASSIN_1_ACTUAL_FAR", "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], @@ -208,7 +208,7 @@ "popup": true }, { - "queue_eocs": "EOC_BANDIT_ASSASSIN_2_ACTUAL_NEAR", + "run_eocs": "EOC_BANDIT_ASSASSIN_2_ACTUAL_NEAR", "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], @@ -282,7 +282,7 @@ "popup": true }, { - "queue_eocs": "EOC_BANDIT_ASSASSIN_3_ACTUAL_NEAR", + "run_eocs": "EOC_BANDIT_ASSASSIN_3_ACTUAL_NEAR", "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], @@ -356,7 +356,7 @@ "popup": true }, { - "queue_eocs": "EOC_OLD_GUARD_ASSASSIN_ACTUAL_NEAR", + "run_eocs": "EOC_OLD_GUARD_ASSASSIN_ACTUAL_NEAR", "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], diff --git a/data/mods/MindOverMatter/mod_interactions/defense_mode/premonition_instances.json b/data/mods/MindOverMatter/mod_interactions/defense_mode/premonition_instances.json index 8c8a71ff37fa4..2b58c03e5ee76 100644 --- a/data/mods/MindOverMatter/mod_interactions/defense_mode/premonition_instances.json +++ b/data/mods/MindOverMatter/mod_interactions/defense_mode/premonition_instances.json @@ -20,7 +20,7 @@ "popup": true }, { - "queue_eocs": "DEFENSE_MODE_WAVE_CONTROL_ACTUAL", + "run_eocs": "DEFENSE_MODE_WAVE_CONTROL_ACTUAL", "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ], @@ -53,7 +53,7 @@ "popup": true }, { - "queue_eocs": "EOC_DEFENSE_MODE_RANDOM_NPC_ROBBER_ACTUAL", + "run_eocs": "EOC_DEFENSE_MODE_RANDOM_NPC_ROBBER_ACTUAL", "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ] @@ -83,7 +83,7 @@ "popup": true }, { - "queue_eocs": "EOC_DEFENSE_MODE_BANDIT_ATTACK_ACTUAL", + "run_eocs": "EOC_DEFENSE_MODE_BANDIT_ATTACK_ACTUAL", "time_in_future": { "math": [ "(u_spell_level('clair_danger_sense') * 4) + 5" ] } } ] diff --git a/data/mods/MindOverMatter/npcs/dialogue/follower_dialogue.json b/data/mods/MindOverMatter/npcs/dialogue/follower_dialogue.json index 001ce2e780a2a..326cc2e126c55 100644 --- a/data/mods/MindOverMatter/npcs/dialogue/follower_dialogue.json +++ b/data/mods/MindOverMatter/npcs/dialogue/follower_dialogue.json @@ -240,7 +240,7 @@ "effect": [ { "npc_lose_effect": "pre_common_cold" }, { "u_add_effect": "pre_common_cold", "duration": "36 hours" }, - { "queue_eocs": "EOC_MINDOVERMATTER_PRE_COLD_TO_COLD", "time_in_future": [ "18 hours", "36 hours" ] }, + { "run_eocs": "EOC_MINDOVERMATTER_PRE_COLD_TO_COLD", "time_in_future": [ "18 hours", "36 hours" ] }, { "u_message": "You touch and reach out with your powers, looking for the illness within them. You soon find it, a shadow over their lungs, and draw it into yourself.", "popup": true @@ -269,7 +269,7 @@ "effect": [ { "npc_lose_effect": "pre_flu" }, { "u_add_effect": "pre_flu", "duration": "36 hours" }, - { "queue_eocs": "EOC_MINDOVERMATTER_PRE_FLU_TO_FLU", "time_in_future": [ "18 hours", "36 hours" ] }, + { "run_eocs": "EOC_MINDOVERMATTER_PRE_FLU_TO_FLU", "time_in_future": [ "18 hours", "36 hours" ] }, { "u_message": "You touch and reach out with your powers, looking for the illness within them. You soon find it, a shadow over their lungs, and draw it into yourself.", "popup": true @@ -299,7 +299,7 @@ { "npc_lose_effect": "pre_conjunctivitis_viral" }, { "u_add_effect": "pre_conjunctivitis_viral", "duration": "72 hours" }, { - "queue_eocs": "EOC_MINDOVERMATTER_PRE_CONJUNCTIVITIS_VIRAL_TO_CONJUNCTIVITIS_VIRAL", + "run_eocs": "EOC_MINDOVERMATTER_PRE_CONJUNCTIVITIS_VIRAL_TO_CONJUNCTIVITIS_VIRAL", "time_in_future": [ "24 hours", "72 hours" ] }, { @@ -331,7 +331,7 @@ { "npc_lose_effect": "pre_conjunctivitis_bacterial" }, { "u_add_effect": "pre_conjunctivitis_bacterial", "duration": "72 hours" }, { - "queue_eocs": "EOC_MINDOVERMATTER_PRE_CONJUNCTIVITIS_BACTERIAL_TO_CONJUNCTIVITIS_BACTERIAL", + "run_eocs": "EOC_MINDOVERMATTER_PRE_CONJUNCTIVITIS_BACTERIAL_TO_CONJUNCTIVITIS_BACTERIAL", "time_in_future": [ "24 hours", "72 hours" ] }, { diff --git a/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_traitor.json b/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_traitor.json index a1d6a1163829d..c92c21b70300f 100644 --- a/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_traitor.json +++ b/data/mods/MindOverMatter/npcs/dialogue/refugee_guards_traitor.json @@ -231,7 +231,7 @@ "topic": "TALK_DONE", "effect": [ { "npc_add_effect": "stunned", "duration": "2 s" }, - { "queue_eocs": [ "EOC_REMOVE_REFUGEE_CENTER_TRAITOR_BANISHED" ], "time_in_future": "0 seconds" }, + { "run_eocs": [ "EOC_REMOVE_REFUGEE_CENTER_TRAITOR_BANISHED" ], "time_in_future": "0 seconds" }, { "finish_mission": "MISSION_OLD_GUARD_REP_2", "step": 1 }, { "u_message": " seems ready to attack you but suddenly freezes in place. For a moment, caught between worlds, they stare straight ahead. As the cold and the darkness of a teleport begin to overtake them and the air around them wavers like summer heat, they open their mouth to scream.\n\nAnd then, they are gone.", @@ -278,7 +278,7 @@ "text": "Good.", "topic": "TALK_DONE", "effect": [ - { "queue_eocs": [ "EOC_REMOVE_REFUGEE_CENTER_TRAITOR_BANISHED" ], "time_in_future": "4 seconds" }, + { "run_eocs": [ "EOC_REMOVE_REFUGEE_CENTER_TRAITOR_BANISHED" ], "time_in_future": "4 seconds" }, { "finish_mission": "MISSION_OLD_GUARD_REP_2", "step": 1 } ] }, @@ -298,7 +298,7 @@ "text": "…", "topic": "TALK_DONE", "effect": [ - { "queue_eocs": [ "EOC_REMOVE_REFUGEE_CENTER_TRAITOR_BANISHED" ], "time_in_future": "4 seconds" }, + { "run_eocs": [ "EOC_REMOVE_REFUGEE_CENTER_TRAITOR_BANISHED" ], "time_in_future": "4 seconds" }, { "finish_mission": "MISSION_OLD_GUARD_REP_2", "step": 1 } ] } diff --git a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json index a69263718ed73..a84019128d23a 100644 --- a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json @@ -8,7 +8,7 @@ { "u_add_effect": "effect_biokin_overcome_pain", "duration": "PERMANENT" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_BIOKIN_OVERCOME_PAIN_SWITCHER" ] }, { - "queue_eocs": "EOC_BIOKIN_OVERCOME_PAIN_DRAIN", + "run_eocs": "EOC_BIOKIN_OVERCOME_PAIN_DRAIN", "time_in_future": [ { "math": [ @@ -65,7 +65,7 @@ { "math": [ "u_spell_exp('biokin_overcome_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_BIOKIN_OVERCOME_PAIN_DRAIN", + "run_eocs": "EOC_BIOKIN_OVERCOME_PAIN_DRAIN", "time_in_future": [ { "math": [ @@ -91,7 +91,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_biokin_physical", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_BIOKIN_PHYSICAL_ENHANCE_DRAIN", + "run_eocs": "EOC_BIOKIN_PHYSICAL_ENHANCE_DRAIN", "time_in_future": [ { "math": [ @@ -124,7 +124,7 @@ { "math": [ "u_spell_exp('biokin_physical_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_BIOKIN_PHYSICAL_ENHANCE_DRAIN", + "run_eocs": "EOC_BIOKIN_PHYSICAL_ENHANCE_DRAIN", "time_in_future": [ { "math": [ @@ -152,7 +152,7 @@ { "u_spawn_item": "biokin_breathe_skin_item", "suppress_message": true, "force_equip": true }, { "u_lose_effect": "biokin_sealed_system" }, { - "queue_eocs": "EOC_BIOKIN_BREATH_SKIN_DRAIN", + "run_eocs": "EOC_BIOKIN_BREATH_SKIN_DRAIN", "time_in_future": [ { "math": [ @@ -189,7 +189,7 @@ { "math": [ "u_spell_exp('biokin_breathe_skin')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_BIOKIN_BREATH_SKIN_DRAIN", + "run_eocs": "EOC_BIOKIN_BREATH_SKIN_DRAIN", "time_in_future": [ { "math": [ @@ -215,7 +215,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_biokin_armor_skin", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_BIOKIN_HARDENED_SKIN_DRAIN", + "run_eocs": "EOC_BIOKIN_HARDENED_SKIN_DRAIN", "time_in_future": [ { "math": [ @@ -248,7 +248,7 @@ { "math": [ "u_spell_exp('biokin_armor_skin')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_BIOKIN_HARDENED_SKIN_DRAIN", + "run_eocs": "EOC_BIOKIN_HARDENED_SKIN_DRAIN", "time_in_future": [ { "math": [ @@ -275,7 +275,7 @@ { "u_add_effect": "effect_biokin_climate_control", "duration": "PERMANENT" }, { "u_lose_effect": "biokin_sealed_system" }, { - "queue_eocs": "EOC_BIOKIN_CLIMATE_CONTROL_DRAIN", + "run_eocs": "EOC_BIOKIN_CLIMATE_CONTROL_DRAIN", "time_in_future": [ { "math": [ @@ -308,7 +308,7 @@ { "math": [ "u_spell_exp('biokin_climate_control')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_BIOKIN_CLIMATE_CONTROL_DRAIN", + "run_eocs": "EOC_BIOKIN_CLIMATE_CONTROL_DRAIN", "time_in_future": [ { "math": [ @@ -334,7 +334,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_BIOKIN_ENHANCE_MOBILITY_SWITCHER" ] }, { "u_add_effect": "effect_biokin_enhance_mobility", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_BIOKIN_ENHANCE_MOBILITY_DRAIN", + "run_eocs": "EOC_BIOKIN_ENHANCE_MOBILITY_DRAIN", "time_in_future": [ { "math": [ @@ -397,7 +397,7 @@ { "math": [ "u_spell_exp('biokin_enhance_mobility')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_BIOKIN_ENHANCE_MOBILITY_DRAIN", + "run_eocs": "EOC_BIOKIN_ENHANCE_MOBILITY_DRAIN", "time_in_future": [ { "math": [ @@ -424,7 +424,7 @@ { "u_add_effect": "effect_biokin_hammerhand", "duration": "PERMANENT" }, { "u_spawn_item": "biokin_hammerhand_item", "suppress_message": true, "force_equip": true }, { - "queue_eocs": "EOC_BIOKIN_HAMMERHAND_DRAIN", + "run_eocs": "EOC_BIOKIN_HAMMERHAND_DRAIN", "time_in_future": [ { "math": [ @@ -461,7 +461,7 @@ { "math": [ "u_spell_exp('biokin_hammerhand')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_BIOKIN_HAMMERHAND_DRAIN", + "run_eocs": "EOC_BIOKIN_HAMMERHAND_DRAIN", "time_in_future": [ { "math": [ @@ -487,7 +487,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_biokin_reflex", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_BIOKIN_REFLEX_ENHANCE_DRAIN", + "run_eocs": "EOC_BIOKIN_REFLEX_ENHANCE_DRAIN", "time_in_future": [ { "math": [ @@ -520,7 +520,7 @@ { "math": [ "u_spell_exp('biokin_reflex_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_BIOKIN_REFLEX_ENHANCE_DRAIN", + "run_eocs": "EOC_BIOKIN_REFLEX_ENHANCE_DRAIN", "time_in_future": [ { "math": [ @@ -546,7 +546,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_biokin_metabolism_enhance", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_BIOKIN_METABOLISM_ENHANCE_DRAIN", + "run_eocs": "EOC_BIOKIN_METABOLISM_ENHANCE_DRAIN", "time_in_future": [ { "math": [ @@ -580,7 +580,7 @@ { "math": [ "u_val('sleep_deprivation')", "-=", "10" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_BIOKIN_METABOLISM_ENHANCE_DRAIN", + "run_eocs": "EOC_BIOKIN_METABOLISM_ENHANCE_DRAIN", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json b/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json index 1d270a36de3dd..868f53405139b 100644 --- a/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json @@ -8,7 +8,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE" ] }, { "u_add_effect": "effect_clair_night_eyes", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_CLAIR_NIGHT_EYES_DRAIN", + "run_eocs": "EOC_CLAIR_NIGHT_EYES_DRAIN", "time_in_future": [ { "math": [ @@ -52,7 +52,7 @@ { "math": [ "u_spell_exp('clair_night_vision')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_CLAIR_NIGHT_EYES_DRAIN", + "run_eocs": "EOC_CLAIR_NIGHT_EYES_DRAIN", "time_in_future": [ { "math": [ @@ -78,7 +78,7 @@ { "u_message": "You feel like sitting down with a good book.", "type": "good" }, { "u_add_effect": "effect_clair_speed_reader", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_CLAIR_SPEED_READING_DRAIN", + "run_eocs": "EOC_CLAIR_SPEED_READING_DRAIN", "time_in_future": [ { "math": [ @@ -115,7 +115,7 @@ { "math": [ "u_spell_exp('clair_speed_reading')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_CLAIR_SPEED_READING_DRAIN", + "run_eocs": "EOC_CLAIR_SPEED_READING_DRAIN", "time_in_future": [ { "math": [ @@ -141,7 +141,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_clair_see_auras", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_CLAIR_SEE_AURAS_DRAIN", + "run_eocs": "EOC_CLAIR_SEE_AURAS_DRAIN", "time_in_future": [ { "math": [ @@ -174,7 +174,7 @@ { "math": [ "u_spell_exp('clair_see_auras')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_CLAIR_SEE_AURAS_DRAIN", + "run_eocs": "EOC_CLAIR_SEE_AURAS_DRAIN", "time_in_future": [ { "math": [ @@ -200,7 +200,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_clair_premonition", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_CLAIR_DANGER_SENSE_DRAIN", + "run_eocs": "EOC_CLAIR_DANGER_SENSE_DRAIN", "time_in_future": [ { "math": [ @@ -233,7 +233,7 @@ { "math": [ "u_spell_exp('clair_danger_sense')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_CLAIR_DANGER_SENSE_DRAIN", + "run_eocs": "EOC_CLAIR_DANGER_SENSE_DRAIN", "time_in_future": [ { "math": [ @@ -262,7 +262,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_clair_ranged_enhance", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_CLAIR_RANGED_ENHANCE_DRAIN", + "run_eocs": "EOC_CLAIR_RANGED_ENHANCE_DRAIN", "time_in_future": [ { "math": [ @@ -295,7 +295,7 @@ { "math": [ "u_spell_exp('clair_ranged_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_CLAIR_RANGED_ENHANCE_DRAIN", + "run_eocs": "EOC_CLAIR_RANGED_ENHANCE_DRAIN", "time_in_future": [ { "math": [ @@ -321,7 +321,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_clair_dodge", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_CLAIR_DODGE_POWER_DRAIN", + "run_eocs": "EOC_CLAIR_DODGE_POWER_DRAIN", "time_in_future": [ { "math": [ @@ -354,7 +354,7 @@ { "math": [ "u_spell_exp('clair_dodge_power')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_CLAIR_DODGE_POWER_DRAIN", + "run_eocs": "EOC_CLAIR_DODGE_POWER_DRAIN", "time_in_future": [ { "math": [ @@ -380,7 +380,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_CLAIR_CRAFT_BONUS_SWITCHER" ] }, { "u_add_effect": "effect_clair_craft_bonus", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_CLAIR_CRAFT_BONUS_DRAIN", + "run_eocs": "EOC_CLAIR_CRAFT_BONUS_DRAIN", "time_in_future": [ { "math": [ @@ -437,7 +437,7 @@ { "math": [ "u_spell_exp('clair_craft_bonus')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_CLAIR_CRAFT_BONUS_DRAIN", + "run_eocs": "EOC_CLAIR_CRAFT_BONUS_DRAIN", "time_in_future": [ { "math": [ @@ -463,7 +463,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_clair_clear_sight", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_CLAIR_CLEAR_SIGHT_DRAIN", + "run_eocs": "EOC_CLAIR_CLEAR_SIGHT_DRAIN", "time_in_future": [ { "math": [ @@ -496,7 +496,7 @@ { "math": [ "u_spell_exp('clair_clear_sight')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_CLAIR_CLEAR_SIGHT_DRAIN", + "run_eocs": "EOC_CLAIR_CLEAR_SIGHT_DRAIN", "time_in_future": [ { "math": [ @@ -525,7 +525,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_POWER_MAINTENANCE_PLUS_ONE" ] }, { "u_add_effect": "effect_clair_group_tactics_self", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_CLAIR_GROUP_TACTICS_DRAIN", + "run_eocs": "EOC_CLAIR_GROUP_TACTICS_DRAIN", "time_in_future": [ { "math": [ @@ -561,7 +561,7 @@ { "math": [ "u_spell_exp('clair_group_tactics')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_CLAIR_GROUP_TACTICS_DRAIN", + "run_eocs": "EOC_CLAIR_GROUP_TACTICS_DRAIN", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json index 19ecefcb79962..3cfefe1bf1d5a 100644 --- a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json @@ -8,7 +8,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_electrokin_see_electricity", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_ELECTROKIN_SEE_ELECTRICITY_DRAIN", + "run_eocs": "EOC_ELECTROKIN_SEE_ELECTRICITY_DRAIN", "time_in_future": [ { "math": [ @@ -41,7 +41,7 @@ { "math": [ "u_spell_exp('electrokinetic_see_electric')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_ELECTROKIN_SEE_ELECTRICITY_DRAIN", + "run_eocs": "EOC_ELECTROKIN_SEE_ELECTRICITY_DRAIN", "time_in_future": [ { "math": [ @@ -67,7 +67,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_electrokin_zap_enemies", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_ELECTROKIN_ZAP_ENEMIES_DRAIN", + "run_eocs": "EOC_ELECTROKIN_ZAP_ENEMIES_DRAIN", "time_in_future": [ { "math": [ @@ -100,7 +100,7 @@ { "math": [ "u_spell_exp('electrokinetic_zap_enemies')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_ELECTROKIN_ZAP_ENEMIES_DRAIN", + "run_eocs": "EOC_ELECTROKIN_ZAP_ENEMIES_DRAIN", "time_in_future": [ { "math": [ @@ -126,7 +126,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_electrokin_melee_attacks", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_ELECTROKIN_MELEE_ATTACKS_DRAIN", + "run_eocs": "EOC_ELECTROKIN_MELEE_ATTACKS_DRAIN", "time_in_future": [ { "math": [ @@ -159,7 +159,7 @@ { "math": [ "u_spell_exp('electrokinetic_melee_attacks')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_ELECTROKIN_MELEE_ATTACKS_DRAIN", + "run_eocs": "EOC_ELECTROKIN_MELEE_ATTACKS_DRAIN", "time_in_future": [ { "math": [ @@ -185,7 +185,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_ELECTROKIN_HACKING_INTERFACE_SWITCHER" ] }, { "u_add_effect": "effect_electrokin_hacking_interface", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_ELECTROKIN_HACKING_INTERFACE_DRAIN", + "run_eocs": "EOC_ELECTROKIN_HACKING_INTERFACE_DRAIN", "time_in_future": [ { "math": [ @@ -257,7 +257,7 @@ }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_ELECTROKIN_HACKING_INTERFACE_DRAIN", + "run_eocs": "EOC_ELECTROKIN_HACKING_INTERFACE_DRAIN", "time_in_future": [ { "math": [ @@ -283,7 +283,7 @@ { "u_add_effect": "effect_electrokin_personal_battery", "duration": "PERMANENT" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_ELECTROKIN_PERSONAL_BATTERY_EFFECT_BEGIN" ] }, { - "queue_eocs": "EOC_ELECTROKIN_PERSONAL_BATTERY_DRAIN", + "run_eocs": "EOC_ELECTROKIN_PERSONAL_BATTERY_DRAIN", "time_in_future": [ { "math": [ @@ -312,7 +312,7 @@ "condition": { "u_has_effect": "effect_electrokin_personal_battery" }, "effect": [ { - "queue_eocs": "EOC_ELECTROKIN_PERSONAL_BATTERY_EFFECT_BEGIN", + "run_eocs": "EOC_ELECTROKIN_PERSONAL_BATTERY_EFFECT_BEGIN", "time_in_future": [ { "math": [ @@ -462,7 +462,7 @@ }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_ELECTROKIN_PERSONAL_BATTERY_DRAIN", + "run_eocs": "EOC_ELECTROKIN_PERSONAL_BATTERY_DRAIN", "time_in_future": [ { "math": [ @@ -487,7 +487,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_electrokin_reduce_pain", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_ELECTROKIN_REDUCE_PAIN_DRAIN", + "run_eocs": "EOC_ELECTROKIN_REDUCE_PAIN_DRAIN", "time_in_future": [ { "math": [ @@ -520,7 +520,7 @@ { "math": [ "u_spell_exp('electrokinetic_reduce_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_ELECTROKIN_REDUCE_PAIN_DRAIN", + "run_eocs": "EOC_ELECTROKIN_REDUCE_PAIN_DRAIN", "time_in_future": [ { "math": [ @@ -546,7 +546,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_electrokinetic_speed_boost", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_ELECTROKIN_SPEED_BOOST_DRAIN", + "run_eocs": "EOC_ELECTROKIN_SPEED_BOOST_DRAIN", "time_in_future": [ { "math": [ @@ -579,7 +579,7 @@ { "math": [ "u_spell_exp('electrokinetic_speed_boost')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_ELECTROKIN_SPEED_BOOST_DRAIN", + "run_eocs": "EOC_ELECTROKIN_SPEED_BOOST_DRAIN", "time_in_future": [ { "math": [ @@ -604,9 +604,9 @@ { "u_message": "The air around you begins crackling with electricity!", "type": "good" }, { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_electrokinetic_lightning_aura", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_ELECTROKIN_LIGHTNING_AURA_EFFECTS" }, + { "run_eocs": "EOC_ELECTROKIN_LIGHTNING_AURA_EFFECTS" }, { - "queue_eocs": "EOC_ELECTROKIN_LIGHTNING_AURA_DRAIN", + "run_eocs": "EOC_ELECTROKIN_LIGHTNING_AURA_DRAIN", "time_in_future": [ { "math": [ @@ -643,7 +643,7 @@ { "math": [ "u_spell_exp('electrokinetic_lightning_aura')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_ELECTROKIN_LIGHTNING_AURA_DRAIN", + "run_eocs": "EOC_ELECTROKIN_LIGHTNING_AURA_DRAIN", "time_in_future": [ { "math": [ @@ -680,7 +680,7 @@ "loc": { "global_val": "lightning_aura_nearby_target" } }, { "u_cast_spell": { "id": "electrokinetic_lightning_aura_spark" } }, - { "queue_eocs": "EOC_ELECTROKIN_LIGHTNING_AURA_EFFECTS", "time_in_future": "5 seconds" } + { "run_eocs": "EOC_ELECTROKIN_LIGHTNING_AURA_EFFECTS", "time_in_future": "5 seconds" } ] } ] diff --git a/data/mods/MindOverMatter/powers/electrokinesis_eoc.json b/data/mods/MindOverMatter/powers/electrokinesis_eoc.json index d9e265fe0c90d..6db7f86c9f06f 100644 --- a/data/mods/MindOverMatter/powers/electrokinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/electrokinesis_eoc.json @@ -8,7 +8,7 @@ { "math": [ "u_pain()", "=", "0" ] }, { "u_add_effect": "effect_electrokinetic_pain_immune", "duration": "1 hours" }, { - "queue_eocs": "EOC_ELECTROKIN_PAIN_IMMUNE_OFF", + "run_eocs": "EOC_ELECTROKIN_PAIN_IMMUNE_OFF", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/powers/learning_eocs/overall.json b/data/mods/MindOverMatter/powers/learning_eocs/overall.json index 9e9d777819e71..161563679520d 100644 --- a/data/mods/MindOverMatter/powers/learning_eocs/overall.json +++ b/data/mods/MindOverMatter/powers/learning_eocs/overall.json @@ -28,7 +28,7 @@ { "math": [ "u_psi_studying_tick_experience_counter", "=", "0" ] }, { "u_add_effect": "effect_psi_studying_power", "duration": "24 hours" }, { "u_assign_activity": "ACT_PSI_STUDYING_POWER", "duration": "24 hours" }, - { "queue_eocs": "EOC_PSI_STUDYING_POWER_METAPHYSICS_GAIN", "time_in_future": [ "30 seconds", "5 minutes" ] } + { "run_eocs": "EOC_PSI_STUDYING_POWER_METAPHYSICS_GAIN", "time_in_future": [ "30 seconds", "5 minutes" ] } ], "false_effect": [ { "u_message": "You are too exhausted to contemplate anything.", "type": "bad" } ] }, @@ -43,16 +43,16 @@ }, "effect": [ { "math": [ "u_skill_exp('metaphysics', 'format': 'raw')", "+=", "(35 * u_latest_studied_power_difficulty)" ] }, - { "queue_eocs": "EOC_PSI_STUDYING_POWER_METAPHYSICS_GAIN", "time_in_future": [ "30 seconds", "5 minutes" ] } + { "run_eocs": "EOC_PSI_STUDYING_POWER_METAPHYSICS_GAIN", "time_in_future": [ "30 seconds", "5 minutes" ] } ] }, { "type": "effect_on_condition", "id": "EOC_PSI_STUDYING_POWER_SIDE_EFFECTS", "effect": [ - { "queue_eocs": "EOC_PSI_STUDYING_POWER_FOCUS_REDUCTION", "time_in_future": [ "1 minutes", "1 minutes" ] }, - { "queue_eocs": "EOC_PSI_STUDYING_POWER_ADD_PROFICIENCY", "time_in_future": [ "1 minutes", "1 minutes" ] }, - { "queue_eocs": "EOC_PSI_STUDYING_POWER_NETHER_ATTUNEMENT", "time_in_future": [ "3 minutes", "3 minutes" ] } + { "run_eocs": "EOC_PSI_STUDYING_POWER_FOCUS_REDUCTION", "time_in_future": [ "1 minutes", "1 minutes" ] }, + { "run_eocs": "EOC_PSI_STUDYING_POWER_ADD_PROFICIENCY", "time_in_future": [ "1 minutes", "1 minutes" ] }, + { "run_eocs": "EOC_PSI_STUDYING_POWER_NETHER_ATTUNEMENT", "time_in_future": [ "3 minutes", "3 minutes" ] } ] }, { @@ -69,7 +69,7 @@ } ] }, - { "queue_eocs": "EOC_PSI_STUDYING_POWER_FOCUS_REDUCTION", "time_in_future": [ "1 minutes", "1 minutes" ] } + { "run_eocs": "EOC_PSI_STUDYING_POWER_FOCUS_REDUCTION", "time_in_future": [ "1 minutes", "1 minutes" ] } ] }, { @@ -78,7 +78,7 @@ "condition": { "u_has_effect": "effect_psi_studying_power" }, "effect": [ { "math": [ "u_proficiency(u_latest_studied_power_proficiency, 'format': 'percent')", "+=", "(rand(4) / 66)" ] }, - { "queue_eocs": "EOC_PSI_STUDYING_POWER_ADD_PROFICIENCY", "time_in_future": [ "1 minutes", "1 minutes" ] } + { "run_eocs": "EOC_PSI_STUDYING_POWER_ADD_PROFICIENCY", "time_in_future": [ "1 minutes", "1 minutes" ] } ] }, { @@ -88,7 +88,7 @@ "effect": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rand(2)" ] }, { "math": [ "u_calories()", "-=", "psionics_contemplation_kcal_cost(u_latest_studied_power_difficulty)" ] }, - { "queue_eocs": "EOC_PSI_STUDYING_POWER_NETHER_ATTUNEMENT", "time_in_future": [ "3 minutes", "3 minutes" ] } + { "run_eocs": "EOC_PSI_STUDYING_POWER_NETHER_ATTUNEMENT", "time_in_future": [ "3 minutes", "3 minutes" ] } ] }, { diff --git a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json index da5642df92ea2..0a717b3498089 100644 --- a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json @@ -8,7 +8,7 @@ { "u_add_effect": "effect_photokin_light_local", "duration": "PERMANENT" }, { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { - "queue_eocs": "EOC_PHOTOKIN_LIGHT_LOCAL_DRAIN", + "run_eocs": "EOC_PHOTOKIN_LIGHT_LOCAL_DRAIN", "time_in_future": [ { "math": [ @@ -41,7 +41,7 @@ { "math": [ "u_spell_exp('photokinetic_light_local')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PHOTOKIN_LIGHT_LOCAL_DRAIN", + "run_eocs": "EOC_PHOTOKIN_LIGHT_LOCAL_DRAIN", "time_in_future": [ { "math": [ @@ -67,7 +67,7 @@ { "u_add_effect": "effect_photokin_dodge", "duration": "PERMANENT" }, { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { - "queue_eocs": "EOC_PHOTOKIN_LIGHT_DODGE_DRAIN", + "run_eocs": "EOC_PHOTOKIN_LIGHT_DODGE_DRAIN", "time_in_future": [ { "math": [ @@ -100,7 +100,7 @@ { "math": [ "u_spell_exp('photokinetic_light_dodge')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PHOTOKIN_LIGHT_DODGE_DRAIN", + "run_eocs": "EOC_PHOTOKIN_LIGHT_DODGE_DRAIN", "time_in_future": [ { "math": [ @@ -126,7 +126,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_photokin_light_barrier", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_PHOTOKIN_RAD_IMMUNITY_DRAIN", + "run_eocs": "EOC_PHOTOKIN_RAD_IMMUNITY_DRAIN", "time_in_future": [ { "math": [ @@ -159,7 +159,7 @@ { "math": [ "u_spell_exp('photokinetic_rad_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PHOTOKIN_RAD_IMMUNITY_DRAIN", + "run_eocs": "EOC_PHOTOKIN_RAD_IMMUNITY_DRAIN", "time_in_future": [ { "math": [ @@ -185,7 +185,7 @@ { "u_add_effect": "effect_photokin_camouflage", "duration": "PERMANENT" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE" ] }, { - "queue_eocs": "EOC_PHOTOKIN_CAMOUFLAGE_DRAIN", + "run_eocs": "EOC_PHOTOKIN_CAMOUFLAGE_DRAIN", "time_in_future": [ { "math": [ @@ -227,7 +227,7 @@ { "math": [ "u_spell_exp('photokinetic_camouflage')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PHOTOKIN_CAMOUFLAGE_DRAIN", + "run_eocs": "EOC_PHOTOKIN_CAMOUFLAGE_DRAIN", "time_in_future": [ { "math": [ @@ -253,7 +253,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_PHOTOKIN_HIDE_UGLY_REMOVE_GODCO_VARS" ] }, { "u_add_effect": "effect_photokin_hide_ugly", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_PHOTOKIN_HIDE_UGLY_DRAIN", + "run_eocs": "EOC_PHOTOKIN_HIDE_UGLY_DRAIN", "time_in_future": [ { "math": [ @@ -296,7 +296,7 @@ { "math": [ "u_spell_exp('photokinetic_hide_ugly')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PHOTOKIN_HIDE_UGLY_DRAIN", + "run_eocs": "EOC_PHOTOKIN_HIDE_UGLY_DRAIN", "time_in_future": [ { "math": [ @@ -323,7 +323,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_spawn_item": "item_photokinetic_radio_on", "suppress_message": true, "force_equip": true }, { - "queue_eocs": "EOC_PHOTOKIN_RADIO_DRAIN", + "run_eocs": "EOC_PHOTOKIN_RADIO_DRAIN", "time_in_future": [ { "math": [ @@ -361,7 +361,7 @@ { "math": [ "u_spell_exp('photokinetic_radio')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PHOTOKIN_RADIO_DRAIN", + "run_eocs": "EOC_PHOTOKIN_RADIO_DRAIN", "time_in_future": [ { "math": [ @@ -390,7 +390,7 @@ { "u_add_effect": "effect_photokin_invisibility", "duration": "PERMANENT" }, { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { - "queue_eocs": "EOC_PHOTOKIN_INVISIBILITY_DRAIN", + "run_eocs": "EOC_PHOTOKIN_INVISIBILITY_DRAIN", "time_in_future": [ { "math": [ @@ -423,7 +423,7 @@ { "math": [ "u_spell_exp('photokinetic_invisibility')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PHOTOKIN_INVISIBILITY_DRAIN", + "run_eocs": "EOC_PHOTOKIN_INVISIBILITY_DRAIN", "time_in_future": [ { "math": [ @@ -449,7 +449,7 @@ { "u_add_effect": "effect_photokin_blinding_glare", "duration": "PERMANENT" }, { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { - "queue_eocs": "EOC_PHOTOKIN_BLINDING_GLARE_DRAIN", + "run_eocs": "EOC_PHOTOKIN_BLINDING_GLARE_DRAIN", "time_in_future": [ { "math": [ @@ -482,7 +482,7 @@ { "math": [ "u_spell_exp('photokinetic_blinding_glare')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PHOTOKIN_BLINDING_GLARE_DRAIN", + "run_eocs": "EOC_PHOTOKIN_BLINDING_GLARE_DRAIN", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json index 34fffc7110baf..7d345c958b4f0 100644 --- a/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json @@ -8,7 +8,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_PYROKIN_CALL_FLAME_GRANT_ITEM" ] }, { "u_add_effect": "effect_pyrokinetic_fire_tool", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_PYROKIN_CALL_FLAME_DRAIN", + "run_eocs": "EOC_PYROKIN_CALL_FLAME_DRAIN", "time_in_future": [ { "math": [ @@ -78,7 +78,7 @@ { "math": [ "u_spell_exp('pyrokinetic_call_flames')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PYROKIN_CALL_FLAME_DRAIN", + "run_eocs": "EOC_PYROKIN_CALL_FLAME_DRAIN", "time_in_future": [ { "math": [ @@ -104,7 +104,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_pyrokinetic_cloak", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_PYROKIN_WARMTH_CLOAK_DRAIN", + "run_eocs": "EOC_PYROKIN_WARMTH_CLOAK_DRAIN", "time_in_future": [ { "math": [ @@ -137,7 +137,7 @@ { "math": [ "u_spell_exp('pyrokinetic_cloak')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PYROKIN_WARMTH_CLOAK_DRAIN", + "run_eocs": "EOC_PYROKIN_WARMTH_CLOAK_DRAIN", "time_in_future": [ { "math": [ @@ -164,7 +164,7 @@ { "u_add_effect": "effect_pyrokinetic_torch_weld", "duration": "PERMANENT" }, { "u_spawn_item": "pyrokinetic_torch_weld", "suppress_message": true, "force_equip": true }, { - "queue_eocs": "EOC_PYROKIN_TORCH_WELD_DRAIN", + "run_eocs": "EOC_PYROKIN_TORCH_WELD_DRAIN", "time_in_future": [ { "math": [ @@ -202,7 +202,7 @@ { "math": [ "u_spell_exp('pyrokinetic_lance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PYROKIN_TORCH_WELD_DRAIN", + "run_eocs": "EOC_PYROKIN_TORCH_WELD_DRAIN", "time_in_future": [ { "math": [ @@ -228,7 +228,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_pyrokinetic_aura", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_PYROKIN_BLAZING_AURA_DRAIN", + "run_eocs": "EOC_PYROKIN_BLAZING_AURA_DRAIN", "time_in_future": [ { "math": [ @@ -261,7 +261,7 @@ { "math": [ "u_spell_exp('pyrokinetic_flame_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PYROKIN_BLAZING_AURA_DRAIN", + "run_eocs": "EOC_PYROKIN_BLAZING_AURA_DRAIN", "time_in_future": [ { "math": [ @@ -287,7 +287,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_pyrokinetic_flame_immunity", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_PYROKIN_FLAME_IMMUNITY_DRAIN", + "run_eocs": "EOC_PYROKIN_FLAME_IMMUNITY_DRAIN", "time_in_future": [ { "math": [ @@ -320,7 +320,7 @@ { "math": [ "u_spell_exp('pyrokinetic_flame_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_PYROKIN_FLAME_IMMUNITY_DRAIN", + "run_eocs": "EOC_PYROKIN_FLAME_IMMUNITY_DRAIN", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/powers/pyrokinesis_eoc.json b/data/mods/MindOverMatter/powers/pyrokinesis_eoc.json index beb93cfae6d2a..ac9b35d4ca473 100644 --- a/data/mods/MindOverMatter/powers/pyrokinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/pyrokinesis_eoc.json @@ -59,7 +59,7 @@ { "math": [ "u_hp('arm_l')", "-=", "1" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,2)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_LEFT_ARM_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_LEFT_ARM_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ], @@ -77,7 +77,7 @@ { "math": [ "u_hp('arm_l')", "-=", "3" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,3)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_LEFT_ARM_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_LEFT_ARM_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ] @@ -118,7 +118,7 @@ { "math": [ "u_hp('arm_r')", "-=", "1" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,2)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_RIGHT_ARM_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_RIGHT_ARM_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ], @@ -136,7 +136,7 @@ { "math": [ "u_hp('arm_r')", "-=", "3" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,3)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_RIGHT_ARM_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_RIGHT_ARM_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ] @@ -177,7 +177,7 @@ { "math": [ "u_hp('head')", "-=", "1" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,4)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_HEAD_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_HEAD_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ], @@ -195,7 +195,7 @@ { "math": [ "u_hp('head')", "-=", "3" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(2,6)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_HEAD_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_HEAD_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ] @@ -236,7 +236,7 @@ { "math": [ "u_hp('leg_l')", "-=", "1" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,2)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_LEFT_LEG_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_LEFT_LEG_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ], @@ -254,7 +254,7 @@ { "math": [ "u_hp('leg_l')", "-=", "3" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,3)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_LEFT_LEG_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_LEFT_LEG_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ] @@ -295,7 +295,7 @@ { "math": [ "u_hp('leg_r')", "-=", "1" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,2)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_RIGHT_LEG_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_RIGHT_LEG_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ], @@ -313,7 +313,7 @@ { "math": [ "u_hp('leg_r')", "-=", "3" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,3)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_RIGHT_LEG_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_RIGHT_LEG_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ] @@ -354,7 +354,7 @@ { "math": [ "u_hp('torso')", "-=", "1" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,3)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_TORSO_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_TORSO_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ], @@ -372,7 +372,7 @@ { "math": [ "u_hp('torso')", "-=", "3" ] }, { "math": [ "u_pain('type': 'perceived')", "+=", "rng(1,3)" ] }, { - "queue_eocs": "EOC_PYROKIN_CAUTERIZE_TORSO_INFECTION_CHECK", + "run_eocs": "EOC_PYROKIN_CAUTERIZE_TORSO_INFECTION_CHECK", "time_in_future": [ "6 hours", "24 hours" ] } ] diff --git a/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json index e675ebf222399..25422acadfca4 100644 --- a/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json @@ -8,7 +8,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_telekinetic_momentum", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_TELEKIN_MOMENTUM_DRAIN", + "run_eocs": "EOC_TELEKIN_MOMENTUM_DRAIN", "time_in_future": [ { "math": [ @@ -41,7 +41,7 @@ { "math": [ "u_spell_exp('telekinetic_momentum')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEKIN_MOMENTUM_DRAIN", + "run_eocs": "EOC_TELEKIN_MOMENTUM_DRAIN", "time_in_future": [ { "math": [ @@ -67,7 +67,7 @@ { "u_add_effect": "effect_telekinetic_lifting_field", "duration": "PERMANENT" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_TELEKIN_LIFTING_FIELD_SWITCHER" ] }, { - "queue_eocs": "EOC_TELEKIN_LIFTING_FIELD_DRAIN", + "run_eocs": "EOC_TELEKIN_LIFTING_FIELD_DRAIN", "time_in_future": [ { "math": [ @@ -181,7 +181,7 @@ { "math": [ "u_spell_exp('telekinetic_lifting_field')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEKIN_LIFTING_FIELD_DRAIN", + "run_eocs": "EOC_TELEKIN_LIFTING_FIELD_DRAIN", "time_in_future": [ { "math": [ @@ -207,7 +207,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_telekinetic_strength", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_TELEKIN_STRENGTH_DRAIN", + "run_eocs": "EOC_TELEKIN_STRENGTH_DRAIN", "time_in_future": [ { "math": [ @@ -240,7 +240,7 @@ { "math": [ "u_spell_exp('telekinetic_strength')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEKIN_STRENGTH_DRAIN", + "run_eocs": "EOC_TELEKIN_STRENGTH_DRAIN", "time_in_future": [ { "math": [ @@ -266,7 +266,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_telekinetic_armor", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_TELEKIN_SHIELD_DRAIN", + "run_eocs": "EOC_TELEKIN_SHIELD_DRAIN", "time_in_future": [ { "math": [ @@ -299,7 +299,7 @@ { "math": [ "u_spell_exp('telekinetic_shield')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEKIN_SHIELD_DRAIN", + "run_eocs": "EOC_TELEKIN_SHIELD_DRAIN", "time_in_future": [ { "math": [ @@ -325,7 +325,7 @@ { "u_add_effect": "effect_telekinetic_vehicle_lift", "duration": "PERMANENT" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_TELEKIN_SUMMON_JACKING_TOOL_SWITCHER" ] }, { - "queue_eocs": "EOC_TELEKIN_SUMMON_JACKING_TOOL_DRAIN", + "run_eocs": "EOC_TELEKIN_SUMMON_JACKING_TOOL_DRAIN", "time_in_future": [ { "math": [ @@ -468,7 +468,7 @@ { "math": [ "u_spell_exp('telekinetic_vehicle_lift')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEKIN_SUMMON_JACKING_TOOL_DRAIN", + "run_eocs": "EOC_TELEKIN_SUMMON_JACKING_TOOL_DRAIN", "time_in_future": [ { "math": [ @@ -494,7 +494,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_POWER_MAINTENANCE_PLUS_ONE" ] }, { "u_add_effect": "effect_telekinetic_levitation", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_TELEKIN_LEVITATION_DRAIN", + "run_eocs": "EOC_TELEKIN_LEVITATION_DRAIN", "time_in_future": [ { "math": [ @@ -530,7 +530,7 @@ { "math": [ "u_spell_exp('telekinetic_levitation')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEKIN_LEVITATION_DRAIN", + "run_eocs": "EOC_TELEKIN_LEVITATION_DRAIN", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json b/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json index 32734bf7d1573..3d93aa74cf71e 100644 --- a/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json @@ -8,7 +8,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_telepathic_learning_bonus", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_TELEPATH_CONCENTRATION_DRAIN", + "run_eocs": "EOC_TELEPATH_CONCENTRATION_DRAIN", "time_in_future": [ { "math": [ @@ -41,7 +41,7 @@ { "math": [ "u_spell_exp('telepathic_concentration')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEPATH_CONCENTRATION_DRAIN", + "run_eocs": "EOC_TELEPATH_CONCENTRATION_DRAIN", "time_in_future": [ { "math": [ @@ -67,7 +67,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_telepathic_psi_armor", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_TELEPATH_SHIELD_DRAIN", + "run_eocs": "EOC_TELEPATH_SHIELD_DRAIN", "time_in_future": [ { "math": [ @@ -100,7 +100,7 @@ { "math": [ "u_spell_exp('telepathic_shield')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEPATH_SHIELD_DRAIN", + "run_eocs": "EOC_TELEPATH_SHIELD_DRAIN", "time_in_future": [ { "math": [ @@ -126,7 +126,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_telepath_sense_minds", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_TELEPATH_SENSE_MINDS_DRAIN", + "run_eocs": "EOC_TELEPATH_SENSE_MINDS_DRAIN", "time_in_future": [ { "math": [ @@ -159,7 +159,7 @@ { "math": [ "u_spell_exp('telepathic_mind_sense')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEPATH_SENSE_MINDS_DRAIN", + "run_eocs": "EOC_TELEPATH_SENSE_MINDS_DRAIN", "time_in_future": [ { "math": [ @@ -204,7 +204,7 @@ } }, { - "queue_eocs": "EOC_TELEPATH_MORALE_DRAIN", + "run_eocs": "EOC_TELEPATH_MORALE_DRAIN", "time_in_future": [ { "math": [ @@ -256,7 +256,7 @@ } }, { - "queue_eocs": "EOC_TELEPATH_MORALE_DRAIN", + "run_eocs": "EOC_TELEPATH_MORALE_DRAIN", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json b/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json index ccff973172fee..fa0785b5e2de9 100644 --- a/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json @@ -8,7 +8,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_teleport_stride", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_TELEPORT_STRIDE_DRAIN", + "run_eocs": "EOC_TELEPORT_STRIDE_DRAIN", "time_in_future": [ { "math": [ @@ -41,7 +41,7 @@ { "math": [ "u_spell_exp('teleport_stride')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEPORT_STRIDE_DRAIN", + "run_eocs": "EOC_TELEPORT_STRIDE_DRAIN", "time_in_future": [ { "math": [ @@ -67,7 +67,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_teleport_ephemeral_walk", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_TELEPORT_EPHEMERAL_WALK_DRAIN", + "run_eocs": "EOC_TELEPORT_EPHEMERAL_WALK_DRAIN", "time_in_future": [ { "math": [ @@ -100,7 +100,7 @@ { "math": [ "u_spell_exp('teleport_ephemeral_walk')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_TELEPORT_EPHEMERAL_WALK_DRAIN", + "run_eocs": "EOC_TELEPORT_EPHEMERAL_WALK_DRAIN", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/powers/teleportation_eoc.json b/data/mods/MindOverMatter/powers/teleportation_eoc.json index 41b20471e34cd..56fb710558d18 100644 --- a/data/mods/MindOverMatter/powers/teleportation_eoc.json +++ b/data/mods/MindOverMatter/powers/teleportation_eoc.json @@ -215,7 +215,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_01_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_01_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] @@ -274,7 +274,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_02_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_02_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] @@ -333,7 +333,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_03_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_03_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] @@ -392,7 +392,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_04_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_04_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] @@ -451,7 +451,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_05_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_05_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] @@ -510,7 +510,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_06_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_06_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] @@ -569,7 +569,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_07_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_07_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] @@ -628,7 +628,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_08_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_08_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] @@ -687,7 +687,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_09_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_09_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] @@ -746,7 +746,7 @@ { "u_add_effect": "effect_teleporter_attuning_to_area", "duration": "8 hours" }, { "u_assign_activity": "ACT_PSI_TELEPORTER_ATTUNING", "duration": "8 hours" }, { - "queue_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_10_SUCCESS", + "run_eocs": "EOC_TELEPORT_GATEWAY_ATTUNE_10_SUCCESS", "time_in_future": { "math": [ "28800 - clamp(( u_spell_level('teleport_gateway') * 1080), 0, 27000)" ] } } ] diff --git a/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json index 34d6ccb5cf701..17da1873e7ca8 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json @@ -8,7 +8,7 @@ { "u_add_effect": "effect_vitakin_slow_bleeding", "duration": "PERMANENT" }, { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_VITAKIN_SLOW_BLEEDING_SWITCHER" ] }, { - "queue_eocs": "EOC_VITAKIN_SLOW_BLEEDING_DRAIN", + "run_eocs": "EOC_VITAKIN_SLOW_BLEEDING_DRAIN", "time_in_future": [ { "math": [ @@ -59,7 +59,7 @@ { "math": [ "u_spell_exp('vita_slow_bleeding')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_VITAKIN_SLOW_BLEEDING_DRAIN", + "run_eocs": "EOC_VITAKIN_SLOW_BLEEDING_DRAIN", "time_in_future": [ { "math": [ @@ -85,7 +85,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_VITAKIN_REMOVE_CONCENTRATED_HEALING" ] }, { "u_add_effect": "effect_vita_health", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_VITAKIN_HEALTH_POWER_DRAIN", + "run_eocs": "EOC_VITAKIN_HEALTH_POWER_DRAIN", "time_in_future": [ { "math": [ @@ -118,7 +118,7 @@ { "math": [ "u_spell_exp('vita_health_power')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_VITAKIN_HEALTH_POWER_DRAIN", + "run_eocs": "EOC_VITAKIN_HEALTH_POWER_DRAIN", "time_in_future": [ { "math": [ @@ -146,7 +146,7 @@ "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_VITAKIN_CONCENTRATED_HEALING_SELECTOR", "EOC_VITAKIN_REMOVE_HEALTH_POWER" ] }, { - "queue_eocs": "EOC_VITAKIN_CONCENTRATED_HEALING_DRAIN", + "run_eocs": "EOC_VITAKIN_CONCENTRATED_HEALING_DRAIN", "time_in_future": [ { "math": [ @@ -161,7 +161,7 @@ ] }, { - "queue_eocs": "EOC_VITAKIN_CONCENTRATED_HEALING_DERMATIK_CHECK", + "run_eocs": "EOC_VITAKIN_CONCENTRATED_HEALING_DERMATIK_CHECK", "time_in_future": [ { "math": [ @@ -376,7 +376,7 @@ { "math": [ "u_spell_exp('vita_slow_bleeding')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_VITAKIN_CONCENTRATED_HEALING_DRAIN", + "run_eocs": "EOC_VITAKIN_CONCENTRATED_HEALING_DRAIN", "time_in_future": [ { "math": [ @@ -402,7 +402,7 @@ { "run_eocs": "EOC_POWER_MAINTENANCE_PLUS_ONE" }, { "u_add_effect": "effect_vita_cure_disease", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_VITAKIN_CURE_DISEASE_DRAIN", + "run_eocs": "EOC_VITAKIN_CURE_DISEASE_DRAIN", "time_in_future": [ { "math": [ @@ -417,7 +417,7 @@ ] }, { - "queue_eocs": "EOC_VITAKIN_CURE_DISEASE_CHECKS", + "run_eocs": "EOC_VITAKIN_CURE_DISEASE_CHECKS", "time_in_future": [ { "math": [ "max( ( 600 - (u_spell_level('vita_cure_disease') * 5 ) ), 1)" ] }, { "math": [ "max( ( 3600 - (u_spell_level('vita_cure_disease') * 30) ), 1)" ] } @@ -442,7 +442,7 @@ { "math": [ "u_spell_exp('vita_cure_disease')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_VITAKIN_CURE_DISEASE_DRAIN", + "run_eocs": "EOC_VITAKIN_CURE_DISEASE_DRAIN", "time_in_future": [ { "math": [ @@ -468,7 +468,7 @@ { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_POWER_MAINTENANCE_PLUS_ONE" ] }, { "u_add_effect": "effect_vita_super_heal", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_VITAKIN_SUPER_HEAL_RUN_HEALING", + "run_eocs": "EOC_VITAKIN_SUPER_HEAL_RUN_HEALING", "time_in_future": [ { "math": [ @@ -483,7 +483,7 @@ ] }, { - "queue_eocs": "EOC_VITAKIN_SUPER_HEAL_DRAIN", + "run_eocs": "EOC_VITAKIN_SUPER_HEAL_DRAIN", "time_in_future": [ { "math": [ @@ -519,7 +519,7 @@ { "math": [ "u_spell_exp('vita_super_heal')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_VITAKIN_SUPER_HEAL_DRAIN", + "run_eocs": "EOC_VITAKIN_SUPER_HEAL_DRAIN", "time_in_future": [ { "math": [ @@ -546,7 +546,7 @@ { "math": [ "u_vitakin_return_from_death_kcal", "=", "u_calories()" ] }, { "u_add_effect": "effect_vita_return_from_death", "duration": "PERMANENT" }, { - "queue_eocs": "EOC_VITAKIN_RETURN_FROM_DEATH_DRAIN", + "run_eocs": "EOC_VITAKIN_RETURN_FROM_DEATH_DRAIN", "time_in_future": [ { "math": [ @@ -569,7 +569,7 @@ "condition": { "u_has_effect": "effect_vita_return_from_death" }, "effect": [ { "run_eocs": "EOC_POWER_MAINTENANCE_MINUS_ONE" }, - { "queue_eocs": "EOC_VITAKIN_REMOVE_RETURN_FROM_DEATH_2", "time_in_future": [ "2 seconds", "2 seconds" ] } + { "run_eocs": "EOC_VITAKIN_REMOVE_RETURN_FROM_DEATH_2", "time_in_future": [ "2 seconds", "2 seconds" ] } ] }, { @@ -589,7 +589,7 @@ { "math": [ "u_spell_exp('vita_return_from_death')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { - "queue_eocs": "EOC_VITAKIN_RETURN_FROM_DEATH_DRAIN", + "run_eocs": "EOC_VITAKIN_RETURN_FROM_DEATH_DRAIN", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json index 5dd8ca8ee6f21..56940c309bf15 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json @@ -42,7 +42,7 @@ ], "false_effect": [ { - "queue_eocs": "EOC_VITAKIN_CONCENTRATED_HEALING_DERMATIK_CHECK", + "run_eocs": "EOC_VITAKIN_CONCENTRATED_HEALING_DERMATIK_CHECK", "time_in_future": [ { "math": [ @@ -91,7 +91,7 @@ "effect": [ { "u_message": "Your skin tingles as the poison begins to work its way out of your body.", "type": "mixed" }, { - "queue_eocs": "EOC_VITAKIN_DEXTOXIFICATION_CHECK_2", + "run_eocs": "EOC_VITAKIN_DEXTOXIFICATION_CHECK_2", "time_in_future": [ { "math": [ "max( ( 15 - (u_spell_level('vita_remove_poison') * u_nether_attunement_power_scaling) ), 1)" ] }, { @@ -137,7 +137,7 @@ "effect": [ { "u_add_trait": "TOXICFLESH" }, { - "queue_eocs": "EOC_VITAKIN_DEXTOXIFICATION_TOXICFLESH_REMOVE", + "run_eocs": "EOC_VITAKIN_DEXTOXIFICATION_TOXICFLESH_REMOVE", "time_in_future": [ { "math": [ @@ -221,7 +221,7 @@ { "u_assign_activity": "ACT_VITAKIN_WAKEFUL_REST_MEDITATE", "duration": "510 minutes" }, { "u_add_effect": "effect_vitakin_wakeful_resting", "duration": "510 minutes" }, { - "queue_eocs": "EOC_VITAKIN_SLEEP_EXPERIENCE", + "run_eocs": "EOC_VITAKIN_SLEEP_EXPERIENCE", "time_in_future": [ { "math": [ "1800 - (u_spell_level('vita_sleeping_trance') * 25 )" ] }, { "math": [ "3600 - (u_spell_level('vita_sleeping_trance') * 50)" ] } @@ -238,7 +238,7 @@ { "if": { "math": [ "u_val('focus')", ">=", "25" ] }, "then": { "math": [ "u_val('focus')", "-=", "rand(10) + 5" ] } }, { "math": [ "u_spell_exp('vita_sleeping_trance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { - "queue_eocs": "EOC_VITAKIN_SLEEP_EXPERIENCE", + "run_eocs": "EOC_VITAKIN_SLEEP_EXPERIENCE", "time_in_future": [ { "math": [ "1800 - (u_spell_level('vita_sleeping_trance') * 25 )" ] }, { "math": [ "3600 - (u_spell_level('vita_sleeping_trance') * 50)" ] } @@ -300,21 +300,21 @@ { "u_assign_activity": "ACT_VITAKIN_HEALING_TRANCE_MEDITATE", "duration": "2400 minutes" }, { "u_add_effect": "effect_vitakin_healing_trance", "duration": "2400 minutes" }, { - "queue_eocs": "EOC_VITAKIN_HEALING_TRANCE_ONGOING_KAL_COSTS", + "run_eocs": "EOC_VITAKIN_HEALING_TRANCE_ONGOING_KAL_COSTS", "time_in_future": [ { "math": [ "180 + (u_spell_level('vita_healing_trance') * 12)" ] }, { "math": [ "900 + (u_spell_level('vita_healing_trance') * 48)" ] } ] }, { - "queue_eocs": "EOC_VITAKIN_HEALING_TRANCE_ONGOING_NETHER_ATTUNEMENT", + "run_eocs": "EOC_VITAKIN_HEALING_TRANCE_ONGOING_NETHER_ATTUNEMENT", "time_in_future": [ { "math": [ "120 + (u_spell_level('vita_healing_trance') * 2)" ] }, { "math": [ "300 + (u_spell_level('vita_healing_trance') * 5)" ] } ] }, { - "queue_eocs": "EOC_VITAKIN_HEALING_TRANCE_EXPERIENCE", + "run_eocs": "EOC_VITAKIN_HEALING_TRANCE_EXPERIENCE", "time_in_future": [ { "math": [ "900 - (u_spell_level('vita_healing_trance') * 12 )" ] }, { "math": [ "1800 - (u_spell_level('vita_healing_trance') * 25)" ] } @@ -330,7 +330,7 @@ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, { "run_eocs": [ "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { - "queue_eocs": "EOC_VITAKIN_HEALING_TRANCE_ONGOING_KAL_COSTS", + "run_eocs": "EOC_VITAKIN_HEALING_TRANCE_ONGOING_KAL_COSTS", "time_in_future": [ { "math": [ "120 + (u_spell_level('vita_healing_trance') * 12)" ] }, { "math": [ "300 + (u_spell_level('vita_healing_trance') * 48)" ] } @@ -345,7 +345,7 @@ "effect": [ { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rand(4)" ] }, { - "queue_eocs": "EOC_VITAKIN_HEALING_TRANCE_ONGOING_NETHER_ATTUNEMENT", + "run_eocs": "EOC_VITAKIN_HEALING_TRANCE_ONGOING_NETHER_ATTUNEMENT", "time_in_future": [ { "math": [ "120 + (u_spell_level('vita_healing_trance') * 2)" ] }, { "math": [ "300 + (u_spell_level('vita_healing_trance') * 5)" ] } @@ -361,7 +361,7 @@ { "if": { "math": [ "u_val('focus')", ">=", "25" ] }, "then": { "math": [ "u_val('focus')", "-=", "rand(10) + 5" ] } }, { "math": [ "u_spell_exp('vita_healing_trance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { - "queue_eocs": "EOC_VITAKIN_HEALING_TRANCE_EXPERIENCE", + "run_eocs": "EOC_VITAKIN_HEALING_TRANCE_EXPERIENCE", "time_in_future": [ { "math": [ "900 - (u_spell_level('vita_healing_trance') * 12 )" ] }, { "math": [ "1800 - (u_spell_level('vita_healing_trance') * 25)" ] } @@ -415,7 +415,7 @@ ] }, { - "queue_eocs": "EOC_VITAKIN_CURE_DISEASE_CHECKS", + "run_eocs": "EOC_VITAKIN_CURE_DISEASE_CHECKS", "time_in_future": [ { "math": [ "max( ( 600 - (u_spell_level('vita_cure_disease') * 5 ) ), 1)" ] }, { "math": [ "max( ( 3600 - (u_spell_level('vita_cure_disease') * 30) ), 1)" ] } @@ -1056,7 +1056,7 @@ "effect": [ { "run_eocs": [ "EOC_VITAKIN_SUPER_HEAL_EFFECTS", "EOC_VITA_SUPER_HEAL_DRAIN" ] }, { - "queue_eocs": "EOC_VITAKIN_SUPER_HEAL_RUN_HEALING", + "run_eocs": "EOC_VITAKIN_SUPER_HEAL_RUN_HEALING", "time_in_future": [ { "math": [ @@ -1187,7 +1187,7 @@ }, { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rand(10) + 2" ] }, { - "queue_eocs": "EOC_VITAKIN_RETURN_FROM_DEATH_RUN_HEALING", + "run_eocs": "EOC_VITAKIN_RETURN_FROM_DEATH_RUN_HEALING", "time_in_future": [ 1, { @@ -1263,7 +1263,7 @@ { "u_lose_effect": "effect_vita_return_from_death" }, { "u_add_effect": "effect_vita_super_heal_return_from_death", "duration": "20 seconds" }, { - "queue_eocs": "EOC_VITAKIN_RETURN_FROM_DEATH_RUN_HEALING", + "run_eocs": "EOC_VITAKIN_RETURN_FROM_DEATH_RUN_HEALING", "time_in_future": [ { "math": [ diff --git a/data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json b/data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json index ae2e444c912c4..6154cf8579a20 100644 --- a/data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json @@ -132,7 +132,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_BREATHE_SKIN_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_BREATHE_SKIN_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -220,7 +220,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_FLEXIBILITY_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_FLEXIBILITY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -304,7 +304,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_DASH_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_DASH_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -389,7 +389,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_ARMOR_SKIN_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_ARMOR_SKIN_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -474,7 +474,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_CLIMATE_CONTROL_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_CLIMATE_CONTROL_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -559,7 +559,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_ADRENALINE_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_ADRENALINE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -644,7 +644,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_ENHANCE_MOBILITY_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_ENHANCE_MOBILITY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -729,7 +729,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_HAMMERHAND_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_HAMMERHAND_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -814,7 +814,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_REFLEX_ENHANCE_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_REFLEX_ENHANCE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -899,7 +899,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_SEALED_SYSTEM_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_SEALED_SYSTEM_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -984,7 +984,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_METABOLISM_ENHANCE_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_METABOLISM_ENHANCE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -1069,7 +1069,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_COMBAT_DANCE_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_COMBAT_DANCE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] @@ -1154,7 +1154,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_PERFECTED_MOTION_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_PERFECTED_MOTION_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(9)" ] }, { "math": [ "learn_new_power_upper_time_bound(9)" ] } ] } ] @@ -1239,7 +1239,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_BIOKIN_HURRICANE_BLOWS_LEARNING", + "run_eocs": "EOC_PRACTICE_BIOKIN_HURRICANE_BLOWS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(10)" ] }, { "math": [ "learn_new_power_upper_time_bound(10)" ] } ] } ] diff --git a/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json b/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json index 9598a30da27ab..2aa755ee2bd60 100644 --- a/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json @@ -106,7 +106,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_DANGER_SENSE_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_DANGER_SENSE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -235,7 +235,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_SPOT_WEAKNESS_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_SPOT_WEAKNESS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -364,7 +364,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_SEE_AURAS_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_SEE_AURAS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -457,7 +457,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_RANGED_ENHANCE_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_RANGED_ENHANCE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -550,7 +550,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_VOYANCE_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_VOYANCE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -643,7 +643,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_COMBAT_SENSE_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_COMBAT_SENSE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -736,7 +736,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_CRAFT_BONUS_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_CRAFT_BONUS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -829,7 +829,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_SEE_MAP_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_SEE_MAP_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -922,7 +922,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_PERFECT_SHOT_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_PERFECT_SHOT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -1015,7 +1015,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_CLEAR_SIGHT_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_CLEAR_SIGHT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] @@ -1108,7 +1108,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_ASTRAL_PROJECTION_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_ASTRAL_PROJECTION_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] @@ -1201,7 +1201,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_GROUP_TACTICS_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_GROUP_TACTICS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(9)" ] }, { "math": [ "learn_new_power_upper_time_bound(9)" ] } ] } ] @@ -1294,7 +1294,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_CLAIR_OMNISCENCE_LEARNING", + "run_eocs": "EOC_PRACTICE_CLAIR_OMNISCENCE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(10)" ] }, { "math": [ "learn_new_power_upper_time_bound(10)" ] } ] } ] diff --git a/data/mods/MindOverMatter/recipes/practice/electrokinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/electrokinesis_practice.json index bb00c3ac2c284..496d2c3869ad4 100644 --- a/data/mods/MindOverMatter/recipes/practice/electrokinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/electrokinesis_practice.json @@ -144,7 +144,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_ZAP_ENEMIES_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_ZAP_ENEMIES_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -236,7 +236,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_MELEE_ATTACKS_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_MELEE_ATTACKS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -329,7 +329,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTRO_HACKING_INTERFACE_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTRO_HACKING_INTERFACE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -422,7 +422,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTRO_ROBOT_INTERFACE_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTRO_ROBOT_INTERFACE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] @@ -514,7 +514,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTRO_PERSONAL_BATTERY_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTRO_PERSONAL_BATTERY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -607,7 +607,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_PARALYSIS_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_PARALYSIS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -700,7 +700,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_REDUCE_PAIN_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_REDUCE_PAIN_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -793,7 +793,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_BOLT_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_BOLT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -886,7 +886,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_RECHARGE_VEHICLE_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_RECHARGE_VEHICLE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -979,7 +979,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_SPEED_BOOST_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_SPEED_BOOST_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -1072,7 +1072,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_PAIN_IMMUNE_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_PAIN_IMMUNE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -1165,7 +1165,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_KILL_ROBOT_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_KILL_ROBOT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -1258,7 +1258,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_AURA_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_AURA_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] @@ -1351,7 +1351,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_BLAST_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_LIGHTNING_BLAST_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(9)" ] }, { "math": [ "learn_new_power_upper_time_bound(9)" ] } ] } ] @@ -1444,7 +1444,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_ELECTROKIN_REVIVE_LEARNING", + "run_eocs": "EOC_PRACTICE_ELECTROKIN_REVIVE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(10)" ] }, { "math": [ "learn_new_power_upper_time_bound(10)" ] } ] } ] diff --git a/data/mods/MindOverMatter/recipes/practice/photokinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/photokinesis_practice.json index a2de085ea40e7..1f80b2b1bd94c 100644 --- a/data/mods/MindOverMatter/recipes/practice/photokinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/photokinesis_practice.json @@ -132,7 +132,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_SNUFF_LIGHT_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_SNUFF_LIGHT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -220,7 +220,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_UP_ENEMY_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_UP_ENEMY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -308,7 +308,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_DODGE_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_DODGE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -396,7 +396,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_BEAM_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_BEAM_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -484,7 +484,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_CAMOUFLAGE_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_CAMOUFLAGE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -572,7 +572,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_RAD_IMMUNITY_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_RAD_IMMUNITY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -661,7 +661,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_ARMS_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_ARMS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -750,7 +750,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_HIDE_UGLY_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_HIDE_UGLY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -839,7 +839,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_IMAGE_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_IMAGE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -927,7 +927,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_RADIO_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_RADIO_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -1015,7 +1015,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_STUN_ROBOTS_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_STUN_ROBOTS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -1104,7 +1104,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_INVISIBILITY_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_INVISIBILITY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -1193,7 +1193,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_FLASH_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_FLASH_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -1282,7 +1282,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_BLINDING_GLARE_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_BLINDING_GLARE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -1371,7 +1371,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_DISINTEGRATE_LEARNING", + "run_eocs": "EOC_PRACTICE_PHOTOKIN_LIGHT_DISINTEGRATE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] diff --git a/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json index 5923706599120..1aed723036771 100644 --- a/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json @@ -129,7 +129,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_CAUTERIZE_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_CAUTERIZE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -217,7 +217,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_QUELL_FIRE_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_QUELL_FIRE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -305,7 +305,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_CALL_FLAMES_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_CALL_FLAMES_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -394,7 +394,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_CLOAK_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_CLOAK_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -483,7 +483,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_FLAMETHROWER_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_FLAMETHROWER_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -572,7 +572,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_LANCE_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_LANCE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -661,7 +661,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_THERMOGENESIS_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_THERMOGENESIS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -750,7 +750,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_AURA_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_AURA_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -839,7 +839,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_FLAME_IMMUNITY_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_FLAME_IMMUNITY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -928,7 +928,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_BLAST_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_BLAST_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -1017,7 +1017,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_AOE_BLAST_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_AOE_BLAST_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(9)" ] }, { "math": [ "learn_new_power_upper_time_bound(9)" ] } ] } ] @@ -1106,7 +1106,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_PYROKIN_INCINERATION_LEARNING", + "run_eocs": "EOC_PRACTICE_PYROKIN_INCINERATION_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(10)" ] }, { "math": [ "learn_new_power_upper_time_bound(10)" ] } ] } ] diff --git a/data/mods/MindOverMatter/recipes/practice/telekinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/telekinesis_practice.json index 7f210e9928c91..05ed44c9cc38e 100644 --- a/data/mods/MindOverMatter/recipes/practice/telekinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/telekinesis_practice.json @@ -130,7 +130,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_NOISEMAKER_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_NOISEMAKER_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -214,7 +214,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_SLAM_DOWN_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_SLAM_DOWN_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -298,7 +298,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_MOMENTUM_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_MOMENTUM_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -383,7 +383,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_SLOWFALL_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_SLOWFALL_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -468,7 +468,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_FORCE_WAVE_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_FORCE_WAVE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -553,7 +553,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_LIFTING_FIELD_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_LIFTING_FIELD_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -638,7 +638,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_ENHANCE_STRENGTH_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_ENHANCE_STRENGTH_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -723,7 +723,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_MINDHAMMER_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_MINDHAMMER_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -808,7 +808,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_VEHICLE_LIFT_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_VEHICLE_LIFT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -893,7 +893,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_BARRIER_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_BARRIER_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -978,7 +978,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_BLAST_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_BLAST_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -1063,7 +1063,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_LEVITATION_LEARNING", + "run_eocs": "EOC_PRACTICE_LEVITATION_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -1146,7 +1146,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_MOVE_LARGE_WEIGHT_LEARNING", + "run_eocs": "EOC_PRACTICE_MOVE_LARGE_WEIGHT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] @@ -1231,7 +1231,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_AEGIS_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_AEGIS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(9)" ] }, { "math": [ "learn_new_power_upper_time_bound(9)" ] } ] } ] @@ -1316,7 +1316,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEKIN_EARTHSHAKER_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEKIN_EARTHSHAKER_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(10)" ] }, { "math": [ "learn_new_power_upper_time_bound(10)" ] } ] } ] diff --git a/data/mods/MindOverMatter/recipes/practice/telepathy_practice.json b/data/mods/MindOverMatter/recipes/practice/telepathy_practice.json index 1ba13cafdfc6d..eeab63bcbc485 100644 --- a/data/mods/MindOverMatter/recipes/practice/telepathy_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/telepathy_practice.json @@ -123,7 +123,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATH_SHIELD_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATH_SHIELD_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -205,7 +205,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATHIC_MESMERIZE_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATHIC_MESMERIZE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -287,7 +287,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATH_MORALE_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATH_MORALE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -370,7 +370,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATHIC_BLAST_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATHIC_BLAST_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -453,7 +453,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATHIC_ANIMAL_MIND_CONTROL_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATHIC_ANIMAL_MIND_CONTROL_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -536,7 +536,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATH_CONFUSION_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATH_CONFUSION_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -619,7 +619,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATH_OBSCURITY_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATH_OBSCURITY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -702,7 +702,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATH_PRIMAL_FEAR_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATH_PRIMAL_FEAR_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -785,7 +785,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATH_SCREAM_RADIUS_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATH_SCREAM_RADIUS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -868,7 +868,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATH_BEAST_TAMING_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATH_BEAST_TAMING_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -951,7 +951,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATH_MIND_CONTROL_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATH_MIND_CONTROL_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] @@ -1034,7 +1034,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPATH_NETWORK_EFFECT_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPATH_NETWORK_EFFECT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(9)" ] }, { "math": [ "learn_new_power_upper_time_bound(9)" ] } ] } ] diff --git a/data/mods/MindOverMatter/recipes/practice/teleportation_practice.json b/data/mods/MindOverMatter/recipes/practice/teleportation_practice.json index 88e7ff4fe8d4a..c4e20d4e1c4fd 100644 --- a/data/mods/MindOverMatter/recipes/practice/teleportation_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/teleportation_practice.json @@ -128,7 +128,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_PHASE_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_PHASE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -216,7 +216,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_EPHEMERAL_WALK_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_EPHEMERAL_WALK_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -304,7 +304,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_STRIDE_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_STRIDE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -392,7 +392,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_TRANSPOSE_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_TRANSPOSE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -481,7 +481,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_DISPLACEMENT_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_DISPLACEMENT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -570,7 +570,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_COLLAPSE_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_COLLAPSE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -659,7 +659,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_FARSTEP_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_FARSTEP_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -748,7 +748,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_BANISH_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_BANISH_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -837,7 +837,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_GATEWAY_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_GATEWAY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] @@ -926,7 +926,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_BREACH_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_BREACH_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(9)" ] }, { "math": [ "learn_new_power_upper_time_bound(9)" ] } ] } ] @@ -1015,7 +1015,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_TELEPORT_REALITY_TEAR_LEARNING", + "run_eocs": "EOC_PRACTICE_TELEPORT_REALITY_TEAR_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(10)" ] }, { "math": [ "learn_new_power_upper_time_bound(10)" ] } ] } ] diff --git a/data/mods/MindOverMatter/recipes/practice/vitakinesis_practice.json b/data/mods/MindOverMatter/recipes/practice/vitakinesis_practice.json index 2422b47ce4b2d..8e1aa2d1642b9 100644 --- a/data/mods/MindOverMatter/recipes/practice/vitakinesis_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/vitakinesis_practice.json @@ -133,7 +133,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_CONCENTRATED_HEALING_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_CONCENTRATED_HEALING_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -221,7 +221,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_STAUNCHING_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_STAUNCHING_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(2)" ] }, { "math": [ "learn_new_power_upper_time_bound(2)" ] } ] } ] @@ -309,7 +309,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_HURT_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_HURT_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -397,7 +397,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_HEAL_TOUCH_ALLY_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_HEAL_TOUCH_ALLY_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -485,7 +485,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_REMOVE_POISON_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_REMOVE_POISON_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(3)" ] }, { "math": [ "learn_new_power_upper_time_bound(3)" ] } ] } ] @@ -574,7 +574,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_SLEEP_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_SLEEP_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -663,7 +663,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_CURE_DISEASE_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_CURE_DISEASE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(4)" ] }, { "math": [ "learn_new_power_upper_time_bound(4)" ] } ] } ] @@ -752,7 +752,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_STOP_INFECTION_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_STOP_INFECTION_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(5)" ] }, { "math": [ "learn_new_power_upper_time_bound(5)" ] } ] } ] @@ -841,7 +841,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_HEALING_TRANCE_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_HEALING_TRANCE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -963,7 +963,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_ATTACK_TOUCH_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_ATTACK_TOUCH_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(6)" ] }, { "math": [ "learn_new_power_upper_time_bound(6)" ] } ] } ] @@ -1052,7 +1052,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_PURGE_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_PURGE_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(7)" ] }, { "math": [ "learn_new_power_upper_time_bound(7)" ] } ] } ] @@ -1141,7 +1141,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_BANISH_ILLNESS_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_BANISH_ILLNESS_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(8)" ] }, { "math": [ "learn_new_power_upper_time_bound(8)" ] } ] } ] @@ -1230,7 +1230,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_SUPER_HEAL_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_SUPER_HEAL_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(9)" ] }, { "math": [ "learn_new_power_upper_time_bound(9)" ] } ] } ] @@ -1353,7 +1353,7 @@ { "u_add_effect": "effect_psi_learning_new_power", "duration": "16 hours" }, { "run_eocs": "EOC_PSI_PRACTICE_FOCUS_MOD" }, { - "queue_eocs": "EOC_PRACTICE_VITAKIN_RETURN_FROM_DEATH_LEARNING", + "run_eocs": "EOC_PRACTICE_VITAKIN_RETURN_FROM_DEATH_LEARNING", "time_in_future": [ { "math": [ "learn_new_power_lower_time_bound(9)" ] }, { "math": [ "learn_new_power_upper_time_bound(9)" ] } ] } ] diff --git a/data/mods/Perk_melee/EOC/Insight_eocs.json b/data/mods/Perk_melee/EOC/Insight_eocs.json index fe959396fe66b..19da11b96570a 100644 --- a/data/mods/Perk_melee/EOC/Insight_eocs.json +++ b/data/mods/Perk_melee/EOC/Insight_eocs.json @@ -14,7 +14,7 @@ "then": [ { "if": { "math": [ "u_monsters_nearby('radius': 15)", ">", "0" ] }, - "then": [ { "run_eoc_with": "EOC_GAIN_INSIGHT", "beta_talker": "avatar" } ] + "then": [ { "run_eocs": "EOC_GAIN_INSIGHT", "beta_talker": "avatar" } ] } ], "else": [ { "u_cast_spell": { "id": "perk_insight_spell" }, "targeted": true } ] diff --git a/data/mods/Perk_melee/EOC/shared_eocs.json b/data/mods/Perk_melee/EOC/shared_eocs.json index 338a3b1bfa011..dbd3f68fca4fa 100644 --- a/data/mods/Perk_melee/EOC/shared_eocs.json +++ b/data/mods/Perk_melee/EOC/shared_eocs.json @@ -69,7 +69,7 @@ "condition": { "and": [ { "u_has_flag": "MELEE_PERK_MOVING_DODGE" } ] }, "effect": [ { - "run_eoc_until": "EOC_PERK_TRY_RETREAT", + "run_eocs": "EOC_PERK_TRY_RETREAT", "condition": { "math": [ "u_monsters_nearby('radius': 1)", ">", "0" ] }, "iterations": 10 } diff --git a/data/mods/Perk_melee/martial_arts.json b/data/mods/Perk_melee/martial_arts.json index 594a061a409ea..2d0e86f7e4fe5 100644 --- a/data/mods/Perk_melee/martial_arts.json +++ b/data/mods/Perk_melee/martial_arts.json @@ -70,7 +70,7 @@ }, "effect": [ { - "run_eoc_until": "EOC_PERK_TRY_RETREAT", + "run_eocs": "EOC_PERK_TRY_RETREAT", "condition": { "math": [ "u_monsters_nearby('radius': 1)", ">", "0" ] }, "iterations": 10 } diff --git a/data/mods/Sky_Island/EOCs.json b/data/mods/Sky_Island/EOCs.json index 3b8b0290b51e4..ef66cd6d2107b 100644 --- a/data/mods/Sky_Island/EOCs.json +++ b/data/mods/Sky_Island/EOCs.json @@ -252,7 +252,7 @@ "max_radius": 10, "true_eocs": [ { "id": "EOC_map_item_run", "effect": [ { "npc_teleport": { "global_val": "OM_HQ_origin" } } ] } ] }, - { "queue_eocs": [ "EOC_return_OM_teleport" ], "time_in_future": "1 s" }, + { "run_eocs": [ "EOC_return_OM_teleport" ], "time_in_future": "1 s" }, { "u_message": "Now teleporting back home. Please wait…" } ] }, @@ -300,7 +300,7 @@ { "run_eocs": [ "EOC_death_heal" ] }, { "u_spawn_item": "corpse_painful" }, { "math": [ "raidslost", "++" ] }, - { "queue_eocs": "EOC_return_OM_teleport", "time_in_future": "1 s" }, + { "run_eocs": "EOC_return_OM_teleport", "time_in_future": "1 s" }, { "u_message": "You feel the icy grip of death begin to take you, and the world whirls and rushes past. Reality bends and at the peak of your last mortal moment, something snags you and hauls you through space and time. Your mind has been preserved, at cost, and your body is not far behind.", "popup": true diff --git a/data/mods/TEST_DATA/EOC.json b/data/mods/TEST_DATA/EOC.json index 97c6e894f171d..3decfec61aa91 100644 --- a/data/mods/TEST_DATA/EOC.json +++ b/data/mods/TEST_DATA/EOC.json @@ -200,11 +200,7 @@ "id": "EOC_run_until_test", "effect": [ { "math": [ "u_context", "=", "0" ] }, - { - "run_eoc_until": "EOC_until_nested", - "condition": { "math": [ "u_context", "<", "10000" ] }, - "iterations": 10000 - } + { "run_eocs": "EOC_until_nested", "condition": { "math": [ "u_context", "<", "10000" ] }, "iterations": 10000 } ] }, { @@ -218,7 +214,7 @@ "effect": [ { "set_condition": "to_test", "condition": { "math": [ "_context", ">", "0" ] } }, { "run_eocs": "EOC_stored_condition_test_nested" }, - { "run_eoc_with": "EOC_stored_condition_test_nested_var", "variables": { "condition_name": "to_test" } } + { "run_eocs": "EOC_stored_condition_test_nested_var", "variables": { "condition_name": "to_test" } } ] }, { @@ -241,7 +237,7 @@ "effect": [ { "math": [ "u_ukey", "=", "3" ] }, { - "run_eoc_with": "EOC_run_with_test_nested", + "run_eocs": "EOC_run_with_test_nested", "variables": { "key1": "1", "key2": "2", "key3": { "u_val": "ukey" } } } ] @@ -252,7 +248,7 @@ "effect": [ { "math": [ "u_ukey", "=", "3" ] }, { - "queue_eoc_with": "EOC_run_with_test_nested", + "run_eocs": "EOC_run_with_test_nested", "variables": { "key1": "1", "key2": "2", "key3": { "u_val": "ukey" } }, "time_in_future": "1 seconds" } @@ -269,7 +265,7 @@ "effect": [ { "math": [ "u_ukey", "=", "3" ] }, { - "run_eoc_with": "EOC_run_with_test_nested2", + "run_eocs": "EOC_run_with_test_nested2", "variables": { "key1": "1", "key2": "2", "key3": { "u_val": "ukey" } } } ] @@ -277,7 +273,7 @@ { "type": "effect_on_condition", "id": "EOC_run_with_test_expects_fail", - "effect": [ { "run_eoc_with": "EOC_run_with_test_nested2" } ] + "effect": [ { "run_eocs": "EOC_run_with_test_nested2" } ] }, { "type": "effect_on_condition", @@ -290,7 +286,7 @@ "id": "EOC_try_kill", "effect": [ { "set_string_var": { "mutator": "u_loc_relative", "target": "(0,1,0)" }, "target_var": { "context_val": "kill_loc" } }, - { "run_eoc_with": "EOC_kill", "beta_loc": { "context_val": "kill_loc" } } + { "run_eocs": "EOC_kill", "beta_loc": { "context_val": "kill_loc" } } ] }, { @@ -866,7 +862,7 @@ "effect": [ { "message": "collection: ", "popup": true }, { - "run_eoc_with": { + "run_eocs": { "id": "_EOC_spawn_item_group_test_collection", "effect": { "u_spawn_item": "test_EOC_spawn_item_group_collection", @@ -880,7 +876,7 @@ }, { "message": "distribution: ", "popup": true }, { - "run_eoc_with": { + "run_eocs": { "id": "_EOC_spawn_item_group_test_distribution", "effect": { "u_spawn_item": "test_EOC_spawn_item_group_distribution", diff --git a/data/mods/Xedra_Evolved/effects/vampvirus.json b/data/mods/Xedra_Evolved/effects/vampvirus.json index 1580dc3f09ca7..7968752a11b23 100644 --- a/data/mods/Xedra_Evolved/effects/vampvirus.json +++ b/data/mods/Xedra_Evolved/effects/vampvirus.json @@ -208,7 +208,7 @@ "true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER" ], "false_eocs": [ "EOC_COMPLETED_ROLL_REMAINDER_VAMPVIRUS", "EOC_VAMPVIRUS1" ] }, - { "queue_eocs": "EOC_ADD_VAMPIRUS_INTENSITY1", "time_in_future": [ "5 days", "8 hours" ] } + { "run_eocs": "EOC_ADD_VAMPIRUS_INTENSITY1", "time_in_future": [ "5 days", "8 hours" ] } ], "false_effect": [ { "u_add_trait": "VAMPIRE" }, @@ -253,7 +253,7 @@ "true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER" ], "false_eocs": [ "EOC_COMPLETED_ROLL_REMAINDER_VAMPVIRUS", "EOC_VAMPVIRUS2" ] }, - { "queue_eocs": "EOC_ADD_VAMPIRUS_INTENSITY2", "time_in_future": [ "15 days", "8 hours" ] } + { "run_eocs": "EOC_ADD_VAMPIRUS_INTENSITY2", "time_in_future": [ "15 days", "8 hours" ] } ], "false_effect": [ { "u_add_trait": "VAMPIRE2" }, diff --git a/data/mods/Xedra_Evolved/eocs/hedge_research_eocs.json b/data/mods/Xedra_Evolved/eocs/hedge_research_eocs.json index f5e9558663543..0fc0556e70a1f 100644 --- a/data/mods/Xedra_Evolved/eocs/hedge_research_eocs.json +++ b/data/mods/Xedra_Evolved/eocs/hedge_research_eocs.json @@ -45,7 +45,7 @@ "condition": { "u_has_effect": "effect_xe_deciphering_hedge_tome" }, "effect": [ { "if": { "math": [ "u_val('focus')", ">", "5" ] }, "then": { "math": [ "u_val('focus')", "-=", "1" ] } }, - { "queue_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ "1 minutes", "3 minutes" ] } + { "run_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ "1 minutes", "3 minutes" ] } ] }, { @@ -91,7 +91,7 @@ "then": { "math": [ "u_val('focus')", "-=", "5" ] } }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_FARM", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_FARM", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -179,7 +179,7 @@ "then": { "math": [ "u_val('focus')", "-=", "5" ] } }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_WARD_DEMONS", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_WARD_DEMONS", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -270,7 +270,7 @@ "then": { "math": [ "u_val('focus')", "-=", "5" ] } }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_DOCTOR_BOOK", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_DOCTOR_BOOK", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -361,7 +361,7 @@ "then": { "math": [ "u_val('focus')", "-=", "5" ] } }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_BLOOD_BOOK", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_BLOOD_BOOK", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -452,7 +452,7 @@ "then": { "math": [ "u_val('focus')", "-=", "5" ] } }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_WARD_DREAMS", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_WARD_DREAMS", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -543,7 +543,7 @@ "then": { "math": [ "u_val('focus')", "-=", "5" ] } }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_SNARE_CHANGELINGS", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_SNARE_CHANGELINGS", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -634,7 +634,7 @@ "then": { "math": [ "u_val('focus')", "-=", "5" ] } }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_BATHHOUSE_AT_MIDNIGHT", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_BATHHOUSE_AT_MIDNIGHT", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -725,7 +725,7 @@ "then": { "math": [ "u_val('focus')", "-=", "5" ] } }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_ABRAMELIN_THE_MAGE", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_ABRAMELIN_THE_MAGE", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } diff --git a/data/mods/Xedra_Evolved/eocs/initialization.json b/data/mods/Xedra_Evolved/eocs/initialization.json index 5bfbf2ab1e08f..6a922691663d1 100644 --- a/data/mods/Xedra_Evolved/eocs/initialization.json +++ b/data/mods/Xedra_Evolved/eocs/initialization.json @@ -5,7 +5,7 @@ "eoc_type": "EVENT", "required_event": "game_begin", "condition": { "math": [ "XE_INITIALIZATION", "!=", "1" ] }, - "effect": [ { "queue_eocs": "EOC_XE_VARIABLE_INITIALIZATION" } ] + "effect": [ { "run_eocs": "EOC_XE_VARIABLE_INITIALIZATION" } ] }, { "type": "effect_on_condition", diff --git a/data/mods/Xedra_Evolved/eocs/magic_weather_control.json b/data/mods/Xedra_Evolved/eocs/magic_weather_control.json index 2a0470ac7af36..46290e0d5a44f 100644 --- a/data/mods/Xedra_Evolved/eocs/magic_weather_control.json +++ b/data/mods/Xedra_Evolved/eocs/magic_weather_control.json @@ -32,7 +32,7 @@ { "math": [ "magic_weather_light_drizzle", "=", "1" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { - "queue_eocs": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_DRIZZLE", + "run_eocs": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_DRIZZLE", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ], @@ -41,7 +41,7 @@ { "math": [ "magic_weather_light_drizzle", "=", "1" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { - "queue_eocs": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_DRIZZLE", + "run_eocs": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_DRIZZLE", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ] @@ -84,7 +84,7 @@ { "math": [ "magic_weather_drizzle", "=", "1" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { - "queue_eocs": "EOC_WEATHER_CONTROL_DRIZZLE_TO_RAIN", + "run_eocs": "EOC_WEATHER_CONTROL_DRIZZLE_TO_RAIN", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ] @@ -99,7 +99,7 @@ { "math": [ "magic_weather_rain", "=", "1" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { - "queue_eocs": "EOC_WEATHER_CONTROL_RAIN_TO_RAINSTORM", + "run_eocs": "EOC_WEATHER_CONTROL_RAIN_TO_RAINSTORM", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ] @@ -114,7 +114,7 @@ { "math": [ "magic_weather_rainstorm", "=", "1" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { - "queue_eocs": "EOC_WEATHER_CONTROL_RAINSTORM_TO_THUNDERSTORM", + "run_eocs": "EOC_WEATHER_CONTROL_RAINSTORM_TO_THUNDERSTORM", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ] @@ -129,7 +129,7 @@ { "math": [ "magic_weather_thunder", "=", "1" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { - "queue_eocs": "EOC_WEATHER_CONTROL_THUNDERSTORM_TO_LIGHTNINGSTORM", + "run_eocs": "EOC_WEATHER_CONTROL_THUNDERSTORM_TO_LIGHTNINGSTORM", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ] @@ -156,7 +156,7 @@ "condition": { "compare_string": [ "effect_controlling_weather", { "context_val": "effect" } ] }, "effect": [ { "math": [ "u_weather_change_limit", "=", "0" ] }, - { "queue_eocs": "EOC_WEATHER_CONTROL_DOWNGRADE", "time_in_future": 3 } + { "run_eocs": "EOC_WEATHER_CONTROL_DOWNGRADE", "time_in_future": 3 } ] }, { @@ -211,11 +211,11 @@ { "if": { "u_has_effect": "effect_controlling_weather" }, "then": { - "queue_eocs": "EOC_WEATHER_CONTROL_THUNDERSTORM_TO_RAINSTORM", + "run_eocs": "EOC_WEATHER_CONTROL_THUNDERSTORM_TO_RAINSTORM", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] }, "else": { - "queue_eocs": "EOC_WEATHER_CONTROL_THUNDERSTORM_TO_RAINSTORM", + "run_eocs": "EOC_WEATHER_CONTROL_THUNDERSTORM_TO_RAINSTORM", "time_in_future": [ { "math": [ "min( (u_weather_stage_up_lower_bound * rng(2,5) ), 1800)" ] }, { "math": [ "min( (u_weather_stage_up_upper_bound * rng(2,5) ), 1800)" ] } @@ -235,11 +235,11 @@ { "if": { "u_has_effect": "effect_controlling_weather" }, "then": { - "queue_eocs": "EOC_WEATHER_CONTROL_RAINSTORM_TO_RAIN", + "run_eocs": "EOC_WEATHER_CONTROL_RAINSTORM_TO_RAIN", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] }, "else": { - "queue_eocs": "EOC_WEATHER_CONTROL_RAINSTORM_TO_RAIN", + "run_eocs": "EOC_WEATHER_CONTROL_RAINSTORM_TO_RAIN", "time_in_future": [ { "math": [ "min( (u_weather_stage_up_lower_bound * rng(2,5) ), 1800)" ] }, { "math": [ "min( (u_weather_stage_up_upper_bound * rng(2,5) ), 1800)" ] } @@ -259,11 +259,11 @@ { "if": { "u_has_effect": "effect_controlling_weather" }, "then": { - "queue_eocs": "EOC_WEATHER_CONTROL_RAIN_TO_DRIZZLE", + "run_eocs": "EOC_WEATHER_CONTROL_RAIN_TO_DRIZZLE", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] }, "else": { - "queue_eocs": "EOC_WEATHER_CONTROL_RAIN_TO_DRIZZLE", + "run_eocs": "EOC_WEATHER_CONTROL_RAIN_TO_DRIZZLE", "time_in_future": [ { "math": [ "min( (u_weather_stage_up_lower_bound * rng(2,5) ), 1800)" ] }, { "math": [ "min( (u_weather_stage_up_upper_bound * rng(2,5) ), 1800)" ] } @@ -283,11 +283,11 @@ { "if": { "u_has_effect": "effect_controlling_weather" }, "then": { - "queue_eocs": "EOC_WEATHER_CONTROL_DRIZZLE_TO_LIGHT_DRIZZLE", + "run_eocs": "EOC_WEATHER_CONTROL_DRIZZLE_TO_LIGHT_DRIZZLE", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] }, "else": { - "queue_eocs": "EOC_WEATHER_CONTROL_DRIZZLE_TO_LIGHT_DRIZZLE", + "run_eocs": "EOC_WEATHER_CONTROL_DRIZZLE_TO_LIGHT_DRIZZLE", "time_in_future": [ { "math": [ "min( (u_weather_stage_up_lower_bound * rng(2,5) ), 1800)" ] }, { "math": [ "min( (u_weather_stage_up_upper_bound * rng(2,5) ), 1800)" ] } @@ -307,11 +307,11 @@ { "if": { "u_has_effect": "effect_controlling_weather" }, "then": { - "queue_eocs": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_NOTHING", + "run_eocs": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_NOTHING", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] }, "else": { - "queue_eocs": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_NOTHING", + "run_eocs": "EOC_WEATHER_CONTROL_LIGHT_DRIZZLE_TO_NOTHING", "time_in_future": [ { "math": [ "min( (u_weather_stage_up_lower_bound * rng(2,5) ), 1800)" ] }, { "math": [ "min( (u_weather_stage_up_upper_bound * rng(2,5) ), 1800)" ] } @@ -349,7 +349,7 @@ { "math": [ "magic_weather_flurries", "=", "1" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { - "queue_eocs": "EOC_WEATHER_CONTROL_FLURRIES_TO_SNOWING", + "run_eocs": "EOC_WEATHER_CONTROL_FLURRIES_TO_SNOWING", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ], @@ -358,7 +358,7 @@ { "math": [ "magic_weather_flurries", "=", "1" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { - "queue_eocs": "EOC_WEATHER_CONTROL_FLURRIES_TO_SNOWING", + "run_eocs": "EOC_WEATHER_CONTROL_FLURRIES_TO_SNOWING", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ] @@ -384,7 +384,7 @@ { "math": [ "magic_weather_snowing", "=", "1" ] }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { - "queue_eocs": "EOC_WEATHER_CONTROL_SNOWING_TO_SNOWSTORM", + "run_eocs": "EOC_WEATHER_CONTROL_SNOWING_TO_SNOWSTORM", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ] @@ -430,11 +430,11 @@ { "if": { "u_has_effect": "effect_controlling_weather" }, "then": { - "queue_eocs": "EOC_WEATHER_CONTROL_SNOWING_TO_FLURRIES", + "run_eocs": "EOC_WEATHER_CONTROL_SNOWING_TO_FLURRIES", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] }, "else": { - "queue_eocs": "EOC_WEATHER_CONTROL_SNOWING_TO_FLURRIES", + "run_eocs": "EOC_WEATHER_CONTROL_SNOWING_TO_FLURRIES", "time_in_future": [ { "math": [ "min( (u_weather_stage_up_lower_bound * rng(2,5) ), 1800)" ] }, { "math": [ "min( (u_weather_stage_up_upper_bound * rng(2,5) ), 1800)" ] } @@ -454,11 +454,11 @@ { "if": { "u_has_effect": "effect_controlling_weather" }, "then": { - "queue_eocs": "EOC_WEATHER_CONTROL_FLURRIES_TO_NOTHING", + "run_eocs": "EOC_WEATHER_CONTROL_FLURRIES_TO_NOTHING", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] }, "else": { - "queue_eocs": "EOC_WEATHER_CONTROL_FLURRIES_TO_NOTHING", + "run_eocs": "EOC_WEATHER_CONTROL_FLURRIES_TO_NOTHING", "time_in_future": [ { "math": [ "min( (u_weather_stage_up_lower_bound * rng(2,5) ), 1800)" ] }, { "math": [ "min( (u_weather_stage_up_upper_bound * rng(2,5) ), 1800)" ] } diff --git a/data/mods/Xedra_Evolved/eocs/misc_eoc.json b/data/mods/Xedra_Evolved/eocs/misc_eoc.json index 97baf2ddd96de..5bec9e2384869 100644 --- a/data/mods/Xedra_Evolved/eocs/misc_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/misc_eoc.json @@ -233,7 +233,7 @@ }, { "u_remove_item_with": "revenant_effigy" }, { "assign_mission": "MISSION_KILL_LUNA_ATTUNED" }, - { "queue_eocs": "EOC_REMOVE_LUNA_MISSION", "time_in_future": [ "1 d", "1 d" ] } + { "run_eocs": "EOC_REMOVE_LUNA_MISSION", "time_in_future": [ "1 d", "1 d" ] } ], "false_effect": [ { diff --git a/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json b/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json index 39693b5ba7ab7..93b030d701e8a 100644 --- a/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json +++ b/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json @@ -28,7 +28,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a wolf.", "type": "bad" }, - { "queue_eocs": "EOC_WEREWOLF_WOLF_FORM_deactivated_future", "time_in_future": 0 } + { "run_eocs": "EOC_WEREWOLF_WOLF_FORM_deactivated_future", "time_in_future": 0 } ] } ] @@ -96,7 +96,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into your war form.", "type": "bad" }, - { "queue_eocs": "EOC_WEREWOLF_HYBRID_FORM_deactivated_future", "time_in_future": 0 } + { "run_eocs": "EOC_WEREWOLF_HYBRID_FORM_deactivated_future", "time_in_future": 0 } ] } ] diff --git a/data/mods/Xedra_Evolved/eocs/vanilla_overwrites.json b/data/mods/Xedra_Evolved/eocs/vanilla_overwrites.json index 8ef62fd2681d4..62d1fcfe5aa77 100644 --- a/data/mods/Xedra_Evolved/eocs/vanilla_overwrites.json +++ b/data/mods/Xedra_Evolved/eocs/vanilla_overwrites.json @@ -15,7 +15,7 @@ { "u_message": "nightmares", "snippet": true, "type": "bad" }, { "u_add_morale": "morale_nightmare", "bonus": [ -15, -30 ], "max_bonus": -30 }, { "math": [ "dream_counter", "=", "1" ] }, - { "queue_eocs": "EOC_RESET_DREAM_COUNTER", "time_in_future": 1 } + { "run_eocs": "EOC_RESET_DREAM_COUNTER", "time_in_future": 1 } ] }, { @@ -45,7 +45,7 @@ { "assign_mission": "MISSION_KILL_SHADOW" }, { "u_spawn_monster": "mon_lieutenant_shadow", "real_count": 1, "min_radius": 10, "max_radius": 15 }, { "u_location_variable": { "global_val": "shadow_encounter_XYZ_pos" }, "min_radius": 1, "max_radius": 1 }, - { "queue_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_MESSAGE", "time_in_future": 1 } + { "run_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_MESSAGE", "time_in_future": 1 } ], "false_effect": [ { "run_eocs": [ "EOC_LIEUTENANT_SHADOW_WARN" ] } ] }, @@ -84,7 +84,7 @@ "target_min_radius": 0, "target_max_radius": 60 }, - { "run_eoc_with": "EOC_KILL_SHADOW", "beta_loc": { "global_val": "Shadow_monster" } }, + { "run_eocs": "EOC_KILL_SHADOW", "beta_loc": { "global_val": "Shadow_monster" } }, { "u_message": "…but it grows more distant for now.", "type": "good" } ] }, diff --git a/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json b/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json index 8e5bf9a0029d5..cd78aae7baeb1 100644 --- a/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json +++ b/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json @@ -485,7 +485,7 @@ ] }, { "u_add_trait": "GOBLIN_FRUIT_GIANT_GROWTH" }, - { "queue_eocs": "EOC_GOBLIN_FRUIT_GIANT_GROWTH_REMOVE", "time_in_future": { "math": [ "3000 + rand(10000)" ] } } + { "run_eocs": "EOC_GOBLIN_FRUIT_GIANT_GROWTH_REMOVE", "time_in_future": { "math": [ "3000 + rand(10000)" ] } } ], "false_effect": [ { "u_message": "You eat the goblin fruit but nothing happens. Oh well." } ] }, diff --git a/data/mods/Xedra_Evolved/items/hedge_magic_items.json b/data/mods/Xedra_Evolved/items/hedge_magic_items.json index 6b95ffb00a5cb..0959594d3b829 100644 --- a/data/mods/Xedra_Evolved/items/hedge_magic_items.json +++ b/data/mods/Xedra_Evolved/items/hedge_magic_items.json @@ -78,7 +78,7 @@ "effect_on_conditions": [ { "id": "EOC_ITEM_HEDGE_WITCHLIGHT_DISMISS", - "effect": [ { "queue_eocs": "EOC_ITEM_HEDGE_WITCHLIGHT_DISMISS_ACTUAL", "time_in_future": 1 } ] + "effect": [ { "run_eocs": "EOC_ITEM_HEDGE_WITCHLIGHT_DISMISS_ACTUAL", "time_in_future": 1 } ] } ] } diff --git a/data/mods/Xedra_Evolved/items/spell_learning_items/spellbooks_hedge.json b/data/mods/Xedra_Evolved/items/spell_learning_items/spellbooks_hedge.json index 55a3b603d4391..f5e55eb5c63c5 100644 --- a/data/mods/Xedra_Evolved/items/spell_learning_items/spellbooks_hedge.json +++ b/data/mods/Xedra_Evolved/items/spell_learning_items/spellbooks_hedge.json @@ -50,14 +50,14 @@ { "u_assign_activity": "ACT_XE_DECIPHERING_HEDGE_TOME", "duration": "8 hours" }, { "u_add_effect": "effect_xe_deciphering_hedge_tome", "duration": "8 hours" }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_FARM", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_FARM", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } ] }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", + "run_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -146,14 +146,14 @@ { "u_assign_activity": "ACT_XE_DECIPHERING_HEDGE_TOME", "duration": "8 hours" }, { "u_add_effect": "effect_xe_deciphering_hedge_tome", "duration": "8 hours" }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_WARD_DEMONS", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_WARD_DEMONS", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } ] }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", + "run_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -242,14 +242,14 @@ { "u_assign_activity": "ACT_XE_DECIPHERING_HEDGE_TOME", "duration": "8 hours" }, { "u_add_effect": "effect_xe_deciphering_hedge_tome", "duration": "8 hours" }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_DOCTOR_BOOK", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_DOCTOR_BOOK", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } ] }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", + "run_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -341,14 +341,14 @@ { "u_assign_activity": "ACT_XE_DECIPHERING_HEDGE_TOME", "duration": "8 hours" }, { "u_add_effect": "effect_xe_deciphering_hedge_tome", "duration": "8 hours" }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_BLOOD_BOOK", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_BLOOD_BOOK", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } ] }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", + "run_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -440,14 +440,14 @@ { "u_assign_activity": "ACT_XE_DECIPHERING_HEDGE_TOME", "duration": "8 hours" }, { "u_add_effect": "effect_xe_deciphering_hedge_tome", "duration": "8 hours" }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_WARD_DREAMS", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_WARD_DREAMS", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } ] }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", + "run_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -536,14 +536,14 @@ { "u_assign_activity": "ACT_XE_DECIPHERING_HEDGE_TOME", "duration": "8 hours" }, { "u_add_effect": "effect_xe_deciphering_hedge_tome", "duration": "8 hours" }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_SNARE_CHANGELINGS", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_SNARE_CHANGELINGS", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } ] }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", + "run_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -651,14 +651,14 @@ { "u_assign_activity": "ACT_XE_DECIPHERING_HEDGE_TOME", "duration": "8 hours" }, { "u_add_effect": "effect_xe_deciphering_hedge_tome", "duration": "8 hours" }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_BATHHOUSE_AT_MIDNIGHT", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_BATHHOUSE_AT_MIDNIGHT", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } ] }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", + "run_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } @@ -752,14 +752,14 @@ { "u_assign_activity": "ACT_XE_DECIPHERING_HEDGE_TOME", "duration": "8 hours" }, { "u_add_effect": "effect_xe_deciphering_hedge_tome", "duration": "8 hours" }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_ABRAMELIN_THE_MAGE", + "run_eocs": "EOC_HEDGE_RESEARCH_PROGRESS_ABRAMELIN_THE_MAGE", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } ] }, { - "queue_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", + "run_eocs": "EOC_HEDGE_RESEARCH_FOCUS_DRAIN", "time_in_future": [ { "math": [ "3000 / min( scaling_factor(u_val('intelligence') ),2)" ] }, { "math": [ "4200 / min( scaling_factor(u_val('intelligence') ),2)" ] } diff --git a/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json index ac10a6ff1cbd3..f10854b37793c 100644 --- a/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/gracken_trait_eocs.json @@ -21,7 +21,7 @@ "id": "EOC_GRACKEN_ARM_PUSH1_activated", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "prep_time": "1", "spell_to_cast": "gracken_arm_push_spell", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json index d1f8de1dc68bd..17d714dcf1ce7 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json @@ -367,7 +367,7 @@ "id": "EOC_ARVORE_VINE_DRAG_activated", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "prep_time": "1", "spell_to_cast": "arvore_vine_drag_spell", @@ -452,7 +452,7 @@ { "u_add_effect": "downed", "duration": 1 }, { "run_eocs": [ "EOC_PERENNIAL_REBIRTH_HEAL" ] }, { "u_spawn_item": "corpse_painful" }, - { "queue_eocs": "EOC_PERENNIAL_REBIRTH_FINALIZE", "time_in_future": "1 seconds" } + { "run_eocs": "EOC_PERENNIAL_REBIRTH_FINALIZE", "time_in_future": "1 seconds" } ] }, { @@ -756,7 +756,7 @@ }, { "u_cast_spell": { "id": "arvore_turn_into_tree_banish", "message": "" } }, { - "run_eoc_with": "EOC_NULL", + "run_eocs": "EOC_NULL", "beta_loc": { "global_val": "arvore_tree_transform_target" }, "false_eocs": "EOC_ARVORE_VERDANT_IMPRISONMENT_SUCCESS" } @@ -793,7 +793,7 @@ "true_eocs": [ { "id": "EOC_ARVORE_VERDANT_IMPRISONMENT_DELETE_NPC_ITEMS", "effect": [ "npc_die" ] } ] }, { - "run_eoc_with": "EOC_NULL", + "run_eocs": "EOC_NULL", "beta_loc": { "global_val": "arvore_tree_transform_target" }, "false_eocs": "EOC_ARVORE_VERDANT_IMPRISONMENT_SUCCESS" } diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json index ac3c2669d3841..4bbd29c56fd2d 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json @@ -318,7 +318,7 @@ "effect": [ { "u_lose_trait": "HOMULLUS_DOLL_FORM_ANGER_RELATIONS" }, { "u_add_trait": "HOMULLUS_DOLL_FORM_ANGER_RELATIONS_ATTACKER" }, - { "queue_eocs": "EOC_HOMULLUS_DOLL_FORM_ANGER_RELATIONS_REGAIN", "time_in_future": [ 180, 360 ] } + { "run_eocs": "EOC_HOMULLUS_DOLL_FORM_ANGER_RELATIONS_REGAIN", "time_in_future": [ 180, 360 ] } ] }, { diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 1efa7953f0a46..726b5f4ff7359 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -303,7 +303,7 @@ "id": "EOC_IERDE_SMASHING_PUNCH_activated", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "prep_time": "0.5", "spell_to_cast": "ierde_smashing_punch_spell", @@ -319,7 +319,7 @@ "condition": { "math": [ "u_val('pos_z')", "<=", "-1" ] }, "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "prep_time": "1", "spell_to_cast": "ierde_no_sleep_meditate_spell", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json index 33f300e6de247..9e9d59b751a74 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json @@ -31,7 +31,7 @@ "condition": { "or": [ { "u_has_trait": "THRESH_ARVORE" }, { "u_has_trait": "ARVORE_NURTURING_THE_GREEN" } ] }, "effect": [ { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN" }, - { "queue_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, + { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, { "u_message": "You feel a stabbing pain as the tree falls. One of your own, murdered by your hand.", "type": "bad" @@ -59,7 +59,7 @@ }, "effect": [ { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN" }, - { "queue_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, + { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, { "u_message": "Your heart races as you spark the fire. A fire, outdoors, in the view of the trees and the grasses. Visions of charred wood, of blackened trunks and broken branches, fill your mind.", "type": "bad" @@ -84,7 +84,7 @@ }, "effect": [ { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN" }, - { "queue_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, + { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, { "math": [ "u_val('sleepiness')", "+=", "150" ] }, { "u_message": "You awaken with a groggy head, blinking bleary eyes. Sleeping near the remnants of civilization away from the bounty of nature, your sleep was not as restful as it should have been.", @@ -142,7 +142,7 @@ }, "effect": [ { "run_eocs": [ "EOC_PARACLESIAN_BROKE_FAE_BAN" ] }, - { "queue_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, + { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, { "math": [ "u_val('sleepiness')", "+=", "150" ] }, { "u_message": "You awaken in pain, your muscles stiff, your body groaning in protest. Away from the depths of the living earth, your sleep was not as restful as it should have been.", @@ -170,7 +170,7 @@ }, "effect": [ { "run_eocs": [ "EOC_PARACLESIAN_BROKE_FAE_BAN" ] }, - { "queue_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, + { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, { "u_message": "You feel a stabbing pain as your tools dig into the living earth. Tools made of material torn from the earth by humans. You should not be using them.", "type": "bad" @@ -223,7 +223,7 @@ "condition": { "u_has_trait": "THRESH_HOMULLUS" }, "effect": [ { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN" }, - { "queue_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, + { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, { "u_message": "You feel a stab of pain as the human collapses in a puddle of their own blood. A human, slain by your hand, in defiance of your nature.", "type": "bad" @@ -248,7 +248,7 @@ }, "effect": [ { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN" }, - { "queue_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, + { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, { "u_message": "You feel a stab of pain as the human collapses in a puddle of their own blood. A human, slain by your hand, in defiance of your nature.", "type": "bad" @@ -317,7 +317,7 @@ }, "effect": [ { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN" }, - { "queue_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, + { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, { "u_message": "Accursed water! The touch of it burns you like acid, reminding you of your nature. Your flames must not be dowsed.", "type": "bad" @@ -378,7 +378,7 @@ "effect": [ { "u_add_effect": "effect_sylph_underground_timer", "duration": "61 minutes" }, { - "queue_eocs": "EOC_SYLPH_FAE_BAN_TOO_LONG_UNDERGROUND_APPLY_PENALTY", + "run_eocs": "EOC_SYLPH_FAE_BAN_TOO_LONG_UNDERGROUND_APPLY_PENALTY", "time_in_future": [ "60 minutes", "60 minutes" ] } ] @@ -535,7 +535,7 @@ "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_RESULT_TRUE", "effect": [ { "u_add_effect": "effect_arvore_sylph_undine_wearing_iron", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_FOLLOWUP", "time_in_future": 60 } + { "run_eocs": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_FOLLOWUP", "time_in_future": 60 } ] } ], @@ -577,7 +577,7 @@ "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_STEEL_RESULT_TRUE", "effect": [ { "u_add_effect": "effect_arvore_sylph_undine_wearing_steel", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 } + { "run_eocs": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 } ], "false_effect": [ { "u_lose_effect": "effect_arvore_sylph_undine_wearing_steel" } ] } @@ -625,7 +625,7 @@ "id": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_IRON_RESULT_TRUE", "effect": [ { "u_add_effect": "effect_ierde_salamander_wearing_iron", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_IRON_FOLLOWUP", "time_in_future": 60 } + { "run_eocs": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_IRON_FOLLOWUP", "time_in_future": 60 } ] } ], @@ -667,7 +667,7 @@ "id": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_STEEL_RESULT_TRUE", "effect": [ { "u_add_effect": "effect_ierde_salamander_wearing_steel", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 } + { "run_eocs": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 } ], "false_effect": [ { "u_lose_effect": "effect_ierde_salamander_wearing_steel" } ] } diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json index 6c7ca1bbc78c6..bdf56e0a18de0 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json @@ -15,7 +15,7 @@ "false_effect": [ { "u_message": "You do not have enough mana to maintain your fulgurating strikes!", "type": "bad" }, { "u_lose_trait": "SYLPH_LIGHTNING_MELEE_ATTACKS_ACTIVE" }, - { "queue_eocs": "EOC_SYLPH_LIGHTNING_MELEE_ATTACKS_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_SYLPH_LIGHTNING_MELEE_ATTACKS_deactivate_future", "time_in_future": 0 } ] }, { diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json index 52dd31f709c1c..baf412d307a87 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json @@ -88,7 +88,7 @@ "id": "EOC_UNKNOWING_CHANGELING_WEARING_IRON_RESULT_TRUE", "effect": [ { "u_add_effect": "effect_changeling_wearing_iron", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_UNKNOWING_CHANGELING_WEARING_IRON_FOLLOWUP", "time_in_future": 60 } + { "run_eocs": "EOC_UNKNOWING_CHANGELING_WEARING_IRON_FOLLOWUP", "time_in_future": 60 } ] } ], @@ -130,7 +130,7 @@ "id": "EOC_UNKNOWING_CHANGELING_WEARING_STEEL_RESULT_TRUE", "effect": [ { "u_add_effect": "effect_changeling_wearing_steel", "duration": "PERMANENT" }, - { "queue_eocs": "EOC_UNKNOWING_CHANGELING_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 } + { "run_eocs": "EOC_UNKNOWING_CHANGELING_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 } ], "false_effect": [ { "u_lose_effect": "effect_changeling_wearing_steel" } ] } @@ -261,7 +261,7 @@ }, "effect": [ { "u_add_effect": "effect_changeling_noble_broken_right_of_passage", "duration": 3600 }, - { "queue_eocs": "EOC_CHANGELING_NOBLE_RIGHT_OF_PASSAGE_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_CHANGELING_NOBLE_RIGHT_OF_PASSAGE_deactivate_future", "time_in_future": 0 } ] }, { @@ -289,7 +289,7 @@ }, "effect": [ { "u_add_effect": "effect_changeling_noble_broken_right_of_passage", "duration": 3600 }, - { "queue_eocs": "EOC_CHANGELING_NOBLE_RIGHT_OF_PASSAGE_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_CHANGELING_NOBLE_RIGHT_OF_PASSAGE_deactivate_future", "time_in_future": 0 } ] }, { @@ -309,7 +309,7 @@ }, { "u_message": "You wrap yourself up in a glamour.", "type": "good" }, { - "queue_eocs": "EOC_CHANGELING_DISGUISE_AS_NATURE_END", + "run_eocs": "EOC_CHANGELING_DISGUISE_AS_NATURE_END", "time_in_future": [ { "math": [ "(changeling_common_traits() * 22.5) + (u_skill('deduction') * 230) + 351" ] }, { "math": [ "(changeling_common_traits() * 57.5) + (u_skill('deduction') * 560) + 789" ] } @@ -533,7 +533,7 @@ "effect": [ { "u_add_trait": "CHANGELING_NOBLE_RIGHT_OF_PASSAGE_MECHANICS" } ], "false_effect": [ { "u_message": "After your actions you may not invoke the right of passage.", "type": "bad" }, - { "queue_eocs": "EOC_CHANGELING_NOBLE_RIGHT_OF_PASSAGE_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_CHANGELING_NOBLE_RIGHT_OF_PASSAGE_deactivate_future", "time_in_future": 0 } ] }, { @@ -800,7 +800,7 @@ ], "false_effect": [ { "u_message": "You do not have enough mana to maintain all of your shapeshifts!", "type": "bad" }, - { "queue_eocs": "EOC_POOKA_SHAPESHIFTS_REMOVE_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_POOKA_SHAPESHIFTS_REMOVE_deactivate_future", "time_in_future": 0 } ] }, { @@ -1196,7 +1196,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a bat.", "type": "bad" }, - { "queue_eocs": "EOC_POOKA_SHAPESHIFT_FULL_BAT_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_POOKA_SHAPESHIFT_FULL_BAT_deactivate_future", "time_in_future": 0 } ] } ] @@ -1256,7 +1256,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a raven.", "type": "bad" }, - { "queue_eocs": "EOC_POOKA_SHAPESHIFT_FULL_RAVEN_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_POOKA_SHAPESHIFT_FULL_RAVEN_deactivate_future", "time_in_future": 0 } ] } ] @@ -1315,7 +1315,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a bear.", "type": "bad" }, - { "queue_eocs": "EOC_POOKA_SHAPESHIFT_FULL_BEAR_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_POOKA_SHAPESHIFT_FULL_BEAR_deactivate_future", "time_in_future": 0 } ] } ] @@ -1373,7 +1373,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a deer.", "type": "bad" }, - { "queue_eocs": "EOC_POOKA_SHAPESHIFT_FULL_DEER_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_POOKA_SHAPESHIFT_FULL_DEER_deactivate_future", "time_in_future": 0 } ] } ] @@ -1430,7 +1430,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a wolf.", "type": "bad" }, - { "queue_eocs": "EOC_POOKA_SHAPESHIFT_FULL_WOLF_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_POOKA_SHAPESHIFT_FULL_WOLF_deactivate_future", "time_in_future": 0 } ] } ] @@ -1486,7 +1486,7 @@ ], "false_effect": [ { "u_message": "You don't have enough mana to transform into a cougar.", "type": "bad" }, - { "queue_eocs": "EOC_POOKA_SHAPESHIFT_FULL_COUGAR_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_POOKA_SHAPESHIFT_FULL_COUGAR_deactivate_future", "time_in_future": 0 } ] } ] @@ -1543,9 +1543,9 @@ { "u_message": "A thick fog begins to rise.", "type": "neutral" }, { "math": [ "magic_weather_dense_fog", "=", "1" ] }, { "u_add_effect": "effect_controlling_weather_fog", "duration": "6 hours" }, - { "queue_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] }, + { "run_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] }, { - "queue_eocs": "EOC_SELKIE_CHANGE_WEATHER_DENSE_FOG_REMOVE", + "run_eocs": "EOC_SELKIE_CHANGE_WEATHER_DENSE_FOG_REMOVE", "time_in_future": [ { "math": [ @@ -1564,7 +1564,7 @@ { "u_message": "You release your command over the fog and it begins to disperse.", "type": "neutral" }, { "math": [ "magic_weather_dense_fog", "=", "0" ] }, { "u_lose_effect": "effect_controlling_weather_fog" }, - { "queue_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] } + { "run_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] } ] }, { @@ -1574,7 +1574,7 @@ "effect": [ { "u_message": "The thick fog begins to disperse.", "type": "neutral" }, { "u_lose_effect": "effect_controlling_weather_fog" }, - { "queue_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] }, + { "run_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] }, { "math": [ "magic_weather_dense_fog", "=", "0" ] } ] }, @@ -1615,7 +1615,7 @@ } }, { - "queue_eocs": "EOC_WEATHER_CONTROL_INITIATE", + "run_eocs": "EOC_WEATHER_CONTROL_INITIATE", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ] @@ -1668,7 +1668,7 @@ } }, { - "queue_eocs": "EOC_WEATHER_CONTROL_INITIATE", + "run_eocs": "EOC_WEATHER_CONTROL_INITIATE", "time_in_future": [ { "math": [ "u_weather_stage_up_lower_bound" ] }, { "math": [ "u_weather_stage_up_upper_bound" ] } ] } ] @@ -1696,10 +1696,7 @@ { "u_add_effect": "effect_controlling_weather", "duration": "30 minutes" }, { "run_eocs": "EOC_CALL_NEXT_WEATHER" }, { "u_message": "The sky explodes in a frenzy of lightning!", "type": "mixed" }, - { - "queue_eocs": "EOC_SELKIE_CHANGE_WEATHER_LIGHTNINGSTORM_END", - "time_in_future": [ "10 minutes", "30 minutes" ] - } + { "run_eocs": "EOC_SELKIE_CHANGE_WEATHER_LIGHTNINGSTORM_END", "time_in_future": [ "10 minutes", "30 minutes" ] } ], "false_effect": [ { "u_message": "You need a heavy rainstorm to agitate it into lightning.", "type": "bad" } ] }, diff --git a/data/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json b/data/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json index 4f566d1a37ed6..9040c114576e7 100644 --- a/data/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json @@ -86,7 +86,7 @@ { "u_add_effect": "eyegleam", "duration": "PERMANENT" }, { "u_message": "Your eyes gleam red momentarily as they drink in all available light.", "type": "good" }, { - "queue_eocs": [ "EOC_EYEGLEAM_maintenance" ], + "run_eocs": [ "EOC_EYEGLEAM_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (1000 + (vampire_total_tier_one_traits() * 100) + (vampire_total_tier_two_traits() * 225) + (vampire_total_tier_three_traits() * 350) + (vampire_total_tier_four_traits_plus_potence() * 500) + (vampire_total_tier_five_traits() * 750))" @@ -120,7 +120,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to activate your gleaming eyes.", "type": "bad" }, - { "queue_eocs": "EOC_EYEGLEAM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_EYEGLEAM_deactivate_future", "time_in_future": 0 } ] } ] @@ -165,7 +165,7 @@ "type": "mixed" }, { - "queue_eocs": [ "EOC_EYEGLEAM_maintenance" ], + "run_eocs": [ "EOC_EYEGLEAM_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (1000 + (vampire_total_tier_one_traits() * 100) + (vampire_total_tier_two_traits() * 225) + (vampire_total_tier_three_traits() * 350) + (vampire_total_tier_four_traits_plus_potence() * 500) + (vampire_total_tier_five_traits() * 750))" @@ -200,7 +200,7 @@ { "u_add_effect": "effect_vampiric_strength", "duration": "PERMANENT" }, { "u_message": "You feel a surge of power as blood floods your muscles.", "type": "good" }, { - "queue_eocs": [ "EOC_VAMPIRIC_STRENGTH_maintenance" ], + "run_eocs": [ "EOC_VAMPIRIC_STRENGTH_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (750 + (vampire_total_tier_one_traits() * 100) + (vampire_total_tier_two_traits() * 200) + (vampire_total_tier_three_traits() * 300) + (vampire_total_tier_four_traits_plus_potence() * 400) + (vampire_total_tier_five_traits() * 500))" @@ -210,7 +210,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to activate vigor mortis.", "type": "bad" }, - { "queue_eocs": "EOC_VAMPIRIC_STRENGTH_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRIC_STRENGTH_deactivate_future", "time_in_future": 0 } ] } ] @@ -254,7 +254,7 @@ "type": "mixed" }, { - "queue_eocs": [ "EOC_VAMPIRIC_STRENGTH_maintenance" ], + "run_eocs": [ "EOC_VAMPIRIC_STRENGTH_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (750 + (vampire_total_tier_one_traits() * 100) + (vampire_total_tier_two_traits() * 200) + (vampire_total_tier_three_traits() * 300) + (vampire_total_tier_four_traits_plus_potence() * 400) + (vampire_total_tier_five_traits() * 500))" @@ -288,7 +288,7 @@ { "u_add_effect": "effect_vampiric_resilience", "duration": "PERMANENT" }, { "u_message": "You feel a surge of power as blood fortifies your flesh.", "type": "good" }, { - "queue_eocs": [ "EOC_VAMPIRIC_RESILIENCE_maintenance" ], + "run_eocs": [ "EOC_VAMPIRIC_RESILIENCE_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (750 + (vampire_total_tier_one_traits() * 100) + (vampire_total_tier_two_traits() * 200) + (vampire_total_tier_three_traits() * 300) + (vampire_total_tier_four_traits_plus_potence() * 400) + (vampire_total_tier_five_traits() * 500))" @@ -298,7 +298,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to activate sanguine resilience.", "type": "bad" }, - { "queue_eocs": "EOC_VAMPIRIC_RESILIENCE_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRIC_RESILIENCE_deactivate_future", "time_in_future": 0 } ] } ] @@ -342,7 +342,7 @@ "type": "mixed" }, { - "queue_eocs": [ "EOC_VAMPIRIC_RESILIENCE_maintenance" ], + "run_eocs": [ "EOC_VAMPIRIC_RESILIENCE_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (750 + (vampire_total_tier_one_traits() * 100) + (vampire_total_tier_two_traits() * 200) + (vampire_total_tier_three_traits() * 300) + (vampire_total_tier_four_traits_plus_potence() * 400) + (vampire_total_tier_five_traits() * 500))" @@ -427,7 +427,7 @@ { "u_lose_effect": "bleed", "target_part": "arm_l" }, { "u_lose_effect": "bleed", "target_part": "arm_r" }, { - "queue_eocs": [ "EOC_COAGULANTWEAVE_maintenance" ], + "run_eocs": [ "EOC_COAGULANTWEAVE_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (300 + (vampire_total_tier_one_traits() * 33) + (vampire_total_tier_two_traits() * 75) + (vampire_total_tier_three_traits() * 125) + (vampire_total_tier_four_traits_plus_potence() * 200) + (vampire_total_tier_five_traits() * 275))" @@ -437,7 +437,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to activate coagulant weave.", "type": "bad" }, - { "queue_eocs": "EOC_COAGULANTWEAVE_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_COAGULANTWEAVE_deactivate_future", "time_in_future": 0 } ] } ] @@ -481,7 +481,7 @@ "type": "mixed" }, { - "queue_eocs": [ "EOC_COAGULANTWEAVE_maintenance" ], + "run_eocs": [ "EOC_COAGULANTWEAVE_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (300 + (vampire_total_tier_one_traits() * 33) + (vampire_total_tier_two_traits() * 75) + (vampire_total_tier_three_traits() * 125) + (vampire_total_tier_four_traits_plus_potence() * 200) + (vampire_total_tier_five_traits() * 275))" @@ -567,7 +567,7 @@ { "u_add_effect": "effect_vampiric_dodge", "duration": "PERMANENT" }, { "u_message": "You begin dodging with preternatural agility.", "type": "good" }, { - "queue_eocs": [ "EOC_VAMPIRIC_DODGE_maintenance" ], + "run_eocs": [ "EOC_VAMPIRIC_DODGE_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (60 + (vampire_total_tier_one_traits() * 5) + (vampire_total_tier_two_traits() * 12) + (vampire_total_tier_three_traits() * 20) + (vampire_total_tier_four_traits_plus_potence() * 30) + (vampire_total_tier_five_traits() * 40))" @@ -577,7 +577,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to activate flow like blood.", "type": "bad" }, - { "queue_eocs": "EOC_VAMPIRIC_DODGE_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRIC_DODGE_deactivate_future", "time_in_future": 0 } ] } ] @@ -621,7 +621,7 @@ "type": "mixed" }, { - "queue_eocs": [ "EOC_VAMPIRIC_DODGE_maintenance" ], + "run_eocs": [ "EOC_VAMPIRIC_DODGE_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (60 + (vampire_total_tier_one_traits() * 5) + (vampire_total_tier_two_traits() * 12) + (vampire_total_tier_three_traits() * 20) + (vampire_total_tier_four_traits_plus_potence() * 30) + (vampire_total_tier_five_traits() * 40))" @@ -699,7 +699,7 @@ { "u_add_trait": "VAMPIRE_BEAST_CLAWS_active" }, { "u_message": "Your fingers twist into sharp claws.", "type": "good" }, { - "queue_eocs": [ "EOC_VAMPIRE_BEAST_CLAWS_maintenance" ], + "run_eocs": [ "EOC_VAMPIRE_BEAST_CLAWS_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (800 + (vampire_total_tier_one_traits() * 60) + (vampire_total_tier_two_traits() * 100) + (vampire_total_tier_three_traits() * 150) + (vampire_total_tier_four_traits_plus_potence() * 225) + (vampire_total_tier_five_traits() * 300))" @@ -709,7 +709,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to activate your claws of the beast.", "type": "bad" }, - { "queue_eocs": "EOC_VAMPIRE_BEAST_CLAWS_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRE_BEAST_CLAWS_deactivate_future", "time_in_future": 0 } ] } ] @@ -750,7 +750,7 @@ { "math": [ "u_vitamin('human_blood_vitamin')", "-=", "62" ] }, { "u_message": "You feel a momentary warmth as you maintain your sharp claws.", "type": "mixed" }, { - "queue_eocs": [ "EOC_VAMPIRE_BEAST_CLAWS_maintenance" ], + "run_eocs": [ "EOC_VAMPIRE_BEAST_CLAWS_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (800 + (vampire_total_tier_one_traits() * 60) + (vampire_total_tier_two_traits() * 100) + (vampire_total_tier_three_traits() * 150) + (vampire_total_tier_four_traits_plus_potence() * 225) + (vampire_total_tier_five_traits() * 300))" @@ -829,7 +829,7 @@ { "u_add_effect": "haste", "duration": "PERMANENT" }, { "u_message": "You movements accelerate to superhuman levels.", "type": "good" }, { - "queue_eocs": [ "EOC_BLOODHASTE_maintenance" ], + "run_eocs": [ "EOC_BLOODHASTE_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (60 + (vampire_total_tier_one_traits() * 5) + (vampire_total_tier_two_traits() * 12) + (vampire_total_tier_three_traits() * 20) + (vampire_total_tier_four_traits_plus_potence() * 30) + (vampire_total_tier_five_traits() * 40))" @@ -839,7 +839,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to activate blood-driven speed.", "type": "bad" }, - { "queue_eocs": "EOC_BLOODHASTE_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_BLOODHASTE_deactivate_future", "time_in_future": 0 } ] } ] @@ -877,7 +877,7 @@ { "math": [ "u_vitamin('human_blood_vitamin')", "-=", "375" ] }, { "u_message": "You feel a momentary warmth as you maintain your superhuman speed.", "type": "mixed" }, { - "queue_eocs": [ "EOC_BLOODHASTE_maintenance" ], + "run_eocs": [ "EOC_BLOODHASTE_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (60 + (vampire_total_tier_one_traits() * 5) + (vampire_total_tier_two_traits() * 12) + (vampire_total_tier_three_traits() * 20) + (vampire_total_tier_four_traits_plus_potence() * 30) + (vampire_total_tier_five_traits() * 40))" @@ -1065,7 +1065,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to transform into a bat.", "type": "bad" }, - { "queue_eocs": "EOC_VAMPIRE_BAT_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRE_BAT_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -1079,7 +1079,7 @@ "condition": { "u_has_trait": "VAMPIRE_BAT_FORM_TRAITS" }, "effect": [ { "run_eocs": "EOC_VAMPIRE_SHADOW_FORM_deactivated" }, - { "queue_eocs": "EOC_VAMPIRE_SHADOW_FORM_deactivate_future", "time_in_future": 0 }, + { "run_eocs": "EOC_VAMPIRE_SHADOW_FORM_deactivate_future", "time_in_future": 0 }, { "u_message": "Your wings recede and you land on now-humanoid legs.", "type": "neutral" }, { "u_lose_trait": "VAMPIRE_BAT_FORM_TRAITS" }, { "u_lose_trait": "ECHOLOCATION" }, @@ -1121,7 +1121,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to transform into a wolf.", "type": "bad" }, - { "queue_eocs": "EOC_VAMPIRE_WOLF_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRE_WOLF_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -1172,7 +1172,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to transform into mist.", "type": "bad" }, - { "queue_eocs": "EOC_VAMPIRE_MIST_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRE_MIST_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -1218,7 +1218,7 @@ "false_effect": [ { "u_message": "You don't have enough blood to maintain your mist form.", "type": "bad" }, { "run_eocs": "EOC_VAMPIRE_MIST_FORM_deactivated" }, - { "queue_eocs": "EOC_VAMPIRE_MIST_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRE_MIST_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -1336,7 +1336,7 @@ ], "false_effect": [ { "u_message": "You don't have enough blood to shroud yourself in shadow.", "type": "bad" }, - { "queue_eocs": "EOC_VAMPIRE_SHADOW_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRE_SHADOW_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -1379,7 +1379,7 @@ "false_effect": [ { "u_message": "You don't have enough blood to maintain the shadows surrounding you.", "type": "bad" }, { "run_eocs": "EOC_VAMPIRE_SHADOW_FORM_deactivated" }, - { "queue_eocs": "EOC_VAMPIRE_SHADOW_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_VAMPIRE_SHADOW_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -1505,7 +1505,7 @@ ] }, { "run_eocs": [ "EOC_BLOT_THE_SUN" ] }, - { "queue_eocs": "EOC_UNBLOT_THE_SUN", "time_in_future": { "math": [ "sunless_time" ] } }, + { "run_eocs": "EOC_UNBLOT_THE_SUN", "time_in_future": { "math": [ "sunless_time" ] } }, { "u_message": "Using your mastery over the Shadowed Path, you blot out the sun, covering the region around you in darkness for a short period of time.", "type": "good" diff --git a/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json b/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json index 5d0025643260e..ca3c919ae3187 100644 --- a/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json @@ -130,7 +130,7 @@ "and": [ "u_is_outside", { "u_has_trait": "LILIN_TRAITS" }, { "not": { "u_has_effect": "effect_gained_lilin_power" } } ] }, "deactivate_condition": { "not": { "u_has_trait": "LILIN_TRAITS" } }, - "effect": [ { "queue_eocs": "EOC_LILIN_GAIN_POWERS_AT_NIGHT_ACTIVE", "time_in_future": [ "1 hours", "2 hours" ] } ] + "effect": [ { "run_eocs": "EOC_LILIN_GAIN_POWERS_AT_NIGHT_ACTIVE", "time_in_future": [ "1 hours", "2 hours" ] } ] }, { "type": "effect_on_condition", @@ -168,7 +168,7 @@ ] } ], - "false_effect": [ { "queue_eocs": "EOC_LILIN_GAIN_POWERS_AT_NIGHT_ACTIVE", "time_in_future": [ "1 hours", "2 hours" ] } ] + "false_effect": [ { "run_eocs": "EOC_LILIN_GAIN_POWERS_AT_NIGHT_ACTIVE", "time_in_future": [ "1 hours", "2 hours" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/Xedra_Evolved/mutations/xe_lilin_trait_eocs.json b/data/mods/Xedra_Evolved/mutations/xe_lilin_trait_eocs.json index 51a6f852ea349..792c4028ee1f5 100644 --- a/data/mods/Xedra_Evolved/mutations/xe_lilin_trait_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/xe_lilin_trait_eocs.json @@ -17,20 +17,20 @@ { "u_add_effect": "effect_lilin_temporary_glorious", "duration": "PERMANENT" }, { "u_message": "You spin a beguiling web of illusion around yourself.", "type": "good" }, { - "queue_eocs": [ "EOC_LILIN_TEMPORARY_GLORIOUS_maintenance" ], + "run_eocs": [ "EOC_LILIN_TEMPORARY_GLORIOUS_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (3600 + (u_has_trait('LILIN_TEMPORARY_GLORIOUS_2') * 601200 ) )" ] } } ], "false_effect": [ { "u_message": "You don't have enough ruach to enhance your appearance.", "type": "bad" }, - { "queue_eocs": "EOC_LILIN_TEMPORARY_GLORIOUS_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_LILIN_TEMPORARY_GLORIOUS_deactivate_future", "time_in_future": 0 } ] } ] }, "else": [ { "u_message": "You are already so beautiful no illusion could enhance your appearance", "type": "mixed" }, - { "queue_eocs": "EOC_LILIN_TEMPORARY_GLORIOUS_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_LILIN_TEMPORARY_GLORIOUS_deactivate_future", "time_in_future": 0 } ] } ], @@ -73,7 +73,7 @@ "type": "mixed" }, { - "queue_eocs": [ "EOC_LILIN_TEMPORARY_GLORIOUS_maintenance" ], + "run_eocs": [ "EOC_LILIN_TEMPORARY_GLORIOUS_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * (3600 + (u_has_trait('LILIN_TEMPORARY_GLORIOUS_2') * 601200 ) )" ] } } ], @@ -114,7 +114,7 @@ { "u_add_effect": "effect_lilin_attribute_bonuses", "duration": "PERMANENT" }, { "u_message": "You draw on your ruach to enhance your physical abilities.", "type": "good" }, { - "queue_eocs": [ "EOC_LILIN_ATTRIBUTE_BONUSES_maintenance" ], + "run_eocs": [ "EOC_LILIN_ATTRIBUTE_BONUSES_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * 1 + ( (u_has_trait('LILIN_ATTRIBUTE_BONUSES_STRENGTH') * 280) + (u_has_trait('LILIN_ATTRIBUTE_BONUSES_DEXTERITY') * 280) + (u_has_trait('LILIN_ATTRIBUTE_BONUSES_PERCEPTION') * 280) )" @@ -124,7 +124,7 @@ ], "false_effect": [ { "u_message": "You don't have enough ruach to enhance your physical abilities.", "type": "bad" }, - { "queue_eocs": "EOC_LILIN_ATTRIBUTE_BONUSES_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_LILIN_ATTRIBUTE_BONUSES_deactivate_future", "time_in_future": 0 } ] } ] @@ -168,7 +168,7 @@ "type": "mixed" }, { - "queue_eocs": [ "EOC_LILIN_ATTRIBUTE_BONUSES_maintenance" ], + "run_eocs": [ "EOC_LILIN_ATTRIBUTE_BONUSES_maintenance" ], "time_in_future": { "math": [ "rng(0.75,1.25) * 1 + ( (u_has_trait('LILIN_ATTRIBUTE_BONUSES_STRENGTH') * 280) + (u_has_trait('LILIN_ATTRIBUTE_BONUSES_DEXTERITY') * 280) + (u_has_trait('LILIN_ATTRIBUTE_BONUSES_PERCEPTION') * 280) )" @@ -207,7 +207,7 @@ ], "false_effect": [ { "u_message": "You don't have enough ruach to transform into an owl.", "type": "bad" }, - { "queue_eocs": "EOC_LILIN_TURN_INTO_OWL_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_LILIN_TURN_INTO_OWL_deactivate_future", "time_in_future": 0 } ] } ] @@ -249,11 +249,11 @@ { "math": [ "u_vitamin('lilin_ruach_vitamin')", "-=", "50" ] }, { "u_add_effect": "effect_lilin_bonus_healing_active", "duration": "PERMANENT" }, { "u_message": "You pour ruach into your wounds and your body begins healing.", "type": "good" }, - { "queue_eocs": [ "EOC_LILIN_BONUS_HEALING_ACTIVE_maintenance" ], "time_in_future": [ 8, 15 ] } + { "run_eocs": [ "EOC_LILIN_BONUS_HEALING_ACTIVE_maintenance" ], "time_in_future": [ 8, 15 ] } ], "false_effect": [ { "u_message": "You don't have enough ruach to heal your wounds.", "type": "bad" }, - { "queue_eocs": "EOC_LILIN_BONUS_HEALING_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_LILIN_BONUS_HEALING_deactivate_future", "time_in_future": 0 } ] } ] @@ -317,11 +317,11 @@ "if": { "math": [ "u_hp('leg_r')", "<", "u_hp_max('leg_r')" ] }, "then": { "math": [ "u_hp('leg_r')", "++" ] } }, - { "queue_eocs": [ "EOC_LILIN_BONUS_HEALING_ACTIVE_maintenance" ], "time_in_future": [ 8, 15 ] } + { "run_eocs": [ "EOC_LILIN_BONUS_HEALING_ACTIVE_maintenance" ], "time_in_future": [ 8, 15 ] } ], "false_effect": [ { "u_message": "You don't have enough ruach accelerate your healing.", "type": "neutral" }, - { "queue_eocs": "EOC_LILIN_BONUS_HEALING_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_LILIN_BONUS_HEALING_deactivate_future", "time_in_future": 0 } ] } ] @@ -397,7 +397,7 @@ ], "false_effect": [ { "u_message": "You don't have enough ruach to transform into a strix.", "type": "bad" }, - { "queue_eocs": "EOC_LILIN_TRANSFORM_INTO_WAR_OWL_FORM_deactivate_future", "time_in_future": 0 } + { "run_eocs": "EOC_LILIN_TRANSFORM_INTO_WAR_OWL_FORM_deactivate_future", "time_in_future": 0 } ] } ] @@ -431,7 +431,7 @@ "id": "EOC_LILIN_STRIX_LEAP", "effect": [ { - "run_eoc_with": "EOC_GENERIC_SPELL_MUTATION", + "run_eocs": "EOC_GENERIC_SPELL_MUTATION", "variables": { "energy_amount": "2000", "prep_time": "1", diff --git a/data/mods/Xedra_Evolved/obsoletion_and_migration/spells.json b/data/mods/Xedra_Evolved/obsoletion_and_migration/spells.json index 3455881a620b5..0ad8a6c472027 100644 --- a/data/mods/Xedra_Evolved/obsoletion_and_migration/spells.json +++ b/data/mods/Xedra_Evolved/obsoletion_and_migration/spells.json @@ -324,7 +324,7 @@ "effect": [ { "u_message": "The trees whisper their secrets to you. [Check mutations to activate]", "type": "good" }, { "u_add_trait": "TREE_COMMUNION" }, - { "queue_eocs": "EOC_LOSE_COMMUNE_OAKS", "time_in_future": [ "60 seconds", "60 seconds" ] } + { "run_eocs": "EOC_LOSE_COMMUNE_OAKS", "time_in_future": [ "60 seconds", "60 seconds" ] } ], "false_effect": [ { diff --git a/data/mods/Xedra_Evolved/recipes/vampire.json b/data/mods/Xedra_Evolved/recipes/vampire.json index b8d3b3360c727..e77db5fd5b885 100644 --- a/data/mods/Xedra_Evolved/recipes/vampire.json +++ b/data/mods/Xedra_Evolved/recipes/vampire.json @@ -43,10 +43,7 @@ { "math": [ "u_vitamin('human_blood_vitamin')", "-=", "3000" ] }, { "u_add_effect": "effect_vampire_studying_blood_gifts", "duration": "8 hours" }, { "u_assign_activity": "ACT_VAMPIRE_STUDYING_BLOOD_GIFTS", "duration": "8 hours" }, - { - "queue_eocs": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_SWITCHER", - "time_in_future": [ "120 minutes", "180 minutes" ] - } + { "run_eocs": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_SWITCHER", "time_in_future": [ "120 minutes", "180 minutes" ] } ], "false_effect": [ { "u_message": "You do not have enough blood to experiment with your gifts.", "type": "bad" } ] } @@ -67,7 +64,7 @@ "cases": [ { "case": 0, - "effect": [ { "queue_eocs": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_SWITCHER", "time_in_future": [ "90 minutes", "150 minutes" ] } ] + "effect": [ { "run_eocs": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_SWITCHER", "time_in_future": [ "90 minutes", "150 minutes" ] } ] }, { "case": 17, "effect": [ { "run_eocs": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_RESULTS_01" } ] }, { "case": 20, "effect": [ { "run_eocs": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_RESULTS_02" } ] }, diff --git a/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json b/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json index 810394427fd97..4d2cc40cdc67a 100644 --- a/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json +++ b/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json @@ -116,7 +116,7 @@ "u_message": "As you finish the words of the charm, the magic takes hold. (E)xamine a nearby crop to fertilize it.", "type": "good" }, - { "queue_eocs": "EOC_HEDGE_MAKE_PLANTS_GROW_REMOVE", "time_in_future": 3 } + { "run_eocs": "EOC_HEDGE_MAKE_PLANTS_GROW_REMOVE", "time_in_future": 3 } ], "false_effect": [ { "u_message": "You must complete the charm within one hour of noon for it to be effective.", "type": "bad" } ] } @@ -272,7 +272,7 @@ "search_data": [ { "flags": [ "SKINCHANGED" ], "worn_only": true } ], "true_eocs": [ { "id": "EOC_HEDGE_TURN_INTO_BEAR_WEAR_ITEM_INTANGIBLE", "effect": [ { "npc_set_flag": "SEMITANGIBLE" } ] } ] }, - { "queue_eocs": "EOC_HEDGE_TURN_INTO_BEAR_SIDE_EFFECTS", "time_in_future": [ "6 hours", "24 hours" ] } + { "run_eocs": "EOC_HEDGE_TURN_INTO_BEAR_SIDE_EFFECTS", "time_in_future": [ "6 hours", "24 hours" ] } ] }, { @@ -286,10 +286,10 @@ "intensity": { "math": [ "u_effect_intensity('effect_skinchanged_penalties') + 1" ] } }, { - "queue_eocs": "EOC_HEDGE_TURN_INTO_BEAR_SIDE_EFFECTS_CURE_FAST", + "run_eocs": "EOC_HEDGE_TURN_INTO_BEAR_SIDE_EFFECTS_CURE_FAST", "time_in_future": [ "15 minutes", "45 minutes" ] }, - { "queue_eocs": "EOC_HEDGE_TURN_INTO_BEAR_SIDE_EFFECTS", "time_in_future": [ "6 hours", "24 hours" ] }, + { "run_eocs": "EOC_HEDGE_TURN_INTO_BEAR_SIDE_EFFECTS", "time_in_future": [ "6 hours", "24 hours" ] }, { "if": { "math": [ "u_val('intelligence')", "<=", "3" ] }, "then": [ @@ -328,7 +328,7 @@ ] }, { - "queue_eocs": "EOC_HEDGE_TURN_INTO_BEAR_SIDE_EFFECTS_CURE_FAST", + "run_eocs": "EOC_HEDGE_TURN_INTO_BEAR_SIDE_EFFECTS_CURE_FAST", "time_in_future": [ "15 minutes", "45 minutes" ] } ] diff --git a/data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json b/data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json index 5f32ed13597d0..184f7d89bd455 100644 --- a/data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json +++ b/data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json @@ -389,9 +389,9 @@ { "u_message": "A thick fog begins to rise.", "type": "neutral" }, { "math": [ "magic_weather_dense_fog", "=", "1" ] }, { "u_add_effect": "effect_controlling_weather_fog", "duration": "6 hours" }, - { "queue_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] }, + { "run_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] }, { - "queue_eocs": "EOC_LILIN_CHANGE_WEATHER_DENSE_FOG_REMOVE", + "run_eocs": "EOC_LILIN_CHANGE_WEATHER_DENSE_FOG_REMOVE", "time_in_future": [ { "math": [ @@ -415,7 +415,7 @@ { "u_message": "You release your command over the fog and it begins to disperse.", "type": "neutral" }, { "math": [ "magic_weather_dense_fog", "=", "0" ] }, { "u_lose_effect": "effect_controlling_weather_fog" }, - { "queue_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] } + { "run_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] } ] }, { @@ -425,7 +425,7 @@ "effect": [ { "u_message": "The thick fog begins to disperse.", "type": "neutral" }, { "u_lose_effect": "effect_controlling_weather_fog" }, - { "queue_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] }, + { "run_eocs": "EOC_CALL_NEXT_WEATHER", "time_in_future": [ "15 seconds", "45 seconds" ] }, { "math": [ "magic_weather_dense_fog", "=", "0" ] } ] }, diff --git a/data/mods/Xedra_Evolved/spells/spell_eocs.json b/data/mods/Xedra_Evolved/spells/spell_eocs.json index 19f59e85fdd7c..f49722fc9f6a2 100644 --- a/data/mods/Xedra_Evolved/spells/spell_eocs.json +++ b/data/mods/Xedra_Evolved/spells/spell_eocs.json @@ -73,7 +73,7 @@ { "u_message": "Ethereal wings grow from your back.", "type": "good" }, { "u_add_trait": "ethereal_wings" }, { - "queue_eocs": "EOC_ETHEREAL_WINGS_CONTINUE", + "run_eocs": "EOC_ETHEREAL_WINGS_CONTINUE", "time_in_future": { "math": [ "((u_spell_level('spell_ethereal_wings')+1)*500)" ] } } ], @@ -93,7 +93,7 @@ "type": "good" }, { - "queue_eocs": "EOC_ETHEREAL_WINGS_CONTINUE", + "run_eocs": "EOC_ETHEREAL_WINGS_CONTINUE", "time_in_future": { "math": [ "((u_spell_level('spell_ethereal_wings')+1)*500)" ] } }, { @@ -117,7 +117,7 @@ { "u_message": "Ethereal, transparent arms appear behind your shoulders and glow.", "type": "good" }, { "u_add_trait": "karma_arms" }, { - "queue_eocs": "EOC_KARMA_ARMS_CONTINUE", + "run_eocs": "EOC_KARMA_ARMS_CONTINUE", "time_in_future": { "math": [ "((u_spell_level('spell_karma_arms')+1)*500)" ] } } ], @@ -137,7 +137,7 @@ "type": "good" }, { - "queue_eocs": "EOC_KARMA_ARMS_CONTINUE", + "run_eocs": "EOC_KARMA_ARMS_CONTINUE", "time_in_future": { "math": [ "((u_spell_level('spell_karma_arms')+1)*500)" ] } }, { @@ -157,7 +157,7 @@ { "u_message": "You feel like your spine stretched enormously.", "type": "good" }, { "u_add_trait": "devil_tail" }, { - "queue_eocs": "EOC_DEVIL_TAIL_CONTINUE", + "run_eocs": "EOC_DEVIL_TAIL_CONTINUE", "time_in_future": { "math": [ "((u_spell_level('spell_devil_tail')+1)*900)" ] } } ], @@ -171,7 +171,7 @@ { "math": [ "u_val('mana')", "-=", "100" ] }, { "u_message": "Your devilish tail stretches and twists playfully.", "type": "good" }, { - "queue_eocs": "EOC_DEVIL_TAIL_CONTINUE", + "run_eocs": "EOC_DEVIL_TAIL_CONTINUE", "time_in_future": { "math": [ "((u_spell_level('spell_devil_tail')+1)*900)" ] } }, { @@ -191,7 +191,7 @@ }, { "u_add_trait": "stalker_eyes" }, { - "queue_eocs": "EOC_STALKER_EYES_CONTINUE", + "run_eocs": "EOC_STALKER_EYES_CONTINUE", "time_in_future": { "math": [ "((u_spell_level('spell_stalker_eyes')+1)*1300)" ] } } ], @@ -208,7 +208,7 @@ { "math": [ "u_val('mana')", "-=", "200" ] }, { "u_message": "Your sight darkens for a second, but it quickly turns back.", "type": "good" }, { - "queue_eocs": "EOC_STALKER_EYES_CONTINUE", + "run_eocs": "EOC_STALKER_EYES_CONTINUE", "time_in_future": { "math": [ "((u_spell_level('spell_stalker_eyes')+1)*1300)" ] } }, { @@ -272,8 +272,8 @@ "type": "effect_on_condition", "id": "EOC_LUCID_DREAM_SWITCH", "condition": { "u_has_effect": "effect_lucid_dream" }, - "effect": [ { "queue_eocs": "EOC_LUCID_DREAM_FORCE_END" } ], - "false_effect": { "queue_eocs": "EOC_LUCID_DREAM_FORCE_START" } + "effect": [ { "run_eocs": "EOC_LUCID_DREAM_FORCE_END" } ], + "false_effect": { "run_eocs": "EOC_LUCID_DREAM_FORCE_START" } }, { "type": "effect_on_condition", @@ -296,7 +296,7 @@ { "math": [ "u_vitamin('blood')", "=", "u_blood_before_lucid" ] }, "u_prevent_death", { "math": [ "u_hp('ALL')", "=", "1" ] }, - { "queue_eocs": "EOC_LUCID_DREAM_FORCE_END" } + { "run_eocs": "EOC_LUCID_DREAM_FORCE_END" } ] }, { diff --git a/data/mods/desert_region/weather/weather_eoc.json b/data/mods/desert_region/weather/weather_eoc.json index a0e4a11fcc167..914be692ea472 100644 --- a/data/mods/desert_region/weather/weather_eoc.json +++ b/data/mods/desert_region/weather/weather_eoc.json @@ -67,7 +67,7 @@ "effect": [ { "math": [ "cause_early_dust_storm", "=", "1" ] }, "next_weather", - { "queue_eocs": "EOC_CAUSE_DUST_STORM", "time_in_future": [ "5 minutes", "30 minutes" ] }, + { "run_eocs": "EOC_CAUSE_DUST_STORM", "time_in_future": [ "5 minutes", "30 minutes" ] }, { "run_eocs": [ { @@ -105,7 +105,7 @@ { "math": [ "cause_dust_storm", "=", "1" ] }, "next_weather", { - "queue_eocs": "EOC_CANCEL_DUST_STORM", + "run_eocs": "EOC_CANCEL_DUST_STORM", "time_in_future": [ { "global_val": "ds_min_length", "default": "1 hours" }, { "global_val": "ds_max_length", "default": "5 hours" } ] }, { diff --git a/doc/EFFECT_ON_CONDITION.md b/doc/EFFECT_ON_CONDITION.md index ad14bdd643d7e..effe943855299 100644 --- a/doc/EFFECT_ON_CONDITION.md +++ b/doc/EFFECT_ON_CONDITION.md @@ -1707,8 +1707,8 @@ Runs another EoC. It can be a separate EoC, or an inline EoC inside `run_eocs` e | "run_eocs" | **mandatory** | string (eoc id or inline eoc) or [variable object](#variable-object)) or array of eocs | EoC or EoCs that would be run | | "iterations" | optional | int or [variable object](#variable-object)) | if used, all eocs in run_eocs would be repeated this amount of times. Eocs are repeated in order; having `"run_eocs": [ "A", "B" ], "repeat": 3` would look like `A, B, A, B, A, B`. Default 1 | | "condition" | optional | int or [variable object](#variable-object)) | if used, eoc would be run as long as this condition will return true. if "condition" is used, "iterations" can be used to limit amount of runs to specific amount (default is 100 runs until terminated) | -| "time_in_future" | optional | int, duration, [variable object](#variable-object) or value between two | if used, EoC would be activated this amount of time in future; default 0, meaning it would run instantly. If eoc is global, the avatar will be u and npc will be invalid. If eoc is not global, it will be queued for the current alpha if they are a character (avatar or npc) and not be queued otherwise. Works with "iterations", doesn't work with "condition" | -| "randomize_time_in_future" | optional | bool | used with time_in_future, and if "iterations" is bigger than 1; if false, entire eoc array would run at the exact same moment; if true, each eoc in array would pick it's own time again and again | +| "time_in_future" | optional | int, duration, [variable object](#variable-object) or value between two | if used, EoC would be activated this amount of time in future; default 0, meaning it would run instantly. If eoc is global, the avatar will be u and npc will be invalid. If eoc is not global, it will be queued for the current alpha if they are a character (avatar or npc) and not be queued otherwise. Doesn't work with "condition" and "iterations" | +| "randomize_time_in_future" | optional | bool | used with time_in_future; if false, entire eoc array would run at the exact same moment; if true, each eoc in array would pick it's own time again and again | | "alpha_loc","beta_loc" | optional | string, [variable object](#variable-object) | Allows to swap talker by defining `u_location_variable`, where the EoC should be run. Set the alpha/beta talker to the creature at the location. | | "alpha_talker","beta_talker" | optional (If you use both "alpha_loc" and "alpha_talker", "alpha_talker" will be ignored, same for beta.) | string, [variable object](#variable-object) | Set alpha/beta talker. This can be either a `character_id` (you can get from [EOC event](#event-eocs) or result of [u_set_talker](#u_set_talkernpc_set_talker) ), or some hard-coded values:
`""`: null talker
`"u"/"npc": the alpha/beta talker of the EOC`(Should be Avatar/Character/NPC/Monster)
`"avatar"`: your avatar| | "false_eocs" | optional | string, [variable object](#variable-object), inline EoC, or range of all of them | false EOCs will run if
1. there is no creature at "alpha_loc"/"beta_loc",or
2. "alpha_talker" or "beta_talker" doesn't exist in the game (eg. dead NPC),or
3. alpha and beta talker are both null | diff --git a/src/npctalk.cpp b/src/npctalk.cpp index 11ed9c3a91b33..941f8128677b6 100644 --- a/src/npctalk.cpp +++ b/src/npctalk.cpp @@ -7261,11 +7261,7 @@ parsers = { { "remove_active_mission", jarg::member, &talk_effect_fun::f_remove_active_mission }, { "offer_mission", jarg::array | jarg::string, &talk_effect_fun::f_offer_mission }, { "run_eocs", jarg::member | jarg::array, &talk_effect_fun::f_run_eocs }, - { "run_eoc_until", jarg::member, &talk_effect_fun::f_run_eocs }, - { "run_eoc_with", jarg::member, &talk_effect_fun::f_run_eocs }, { "run_eoc_selector", jarg::member, &talk_effect_fun::f_run_eoc_selector }, - { "queue_eocs", jarg::member | jarg::array, &talk_effect_fun::f_run_eocs }, - { "queue_eoc_with", jarg::member, &talk_effect_fun::f_run_eocs }, { "weighted_list_eocs", jarg::array, &talk_effect_fun::f_weighted_list_eocs }, { "if", jarg::member, &talk_effect_fun::f_if }, { "switch", jarg::member, &talk_effect_fun::f_switch },