diff --git a/data/json/effects_on_condition/mapgen_eocs/lab_mapgen_eocs.json b/data/json/effects_on_condition/mapgen_eocs/lab_mapgen_eocs.json index 56632c0742106..239d63b2b466f 100644 --- a/data/json/effects_on_condition/mapgen_eocs/lab_mapgen_eocs.json +++ b/data/json/effects_on_condition/mapgen_eocs/lab_mapgen_eocs.json @@ -2,7 +2,8 @@ { "type": "effect_on_condition", "id": "lab_security_check", - "recurrence": 1, + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_1x1x2_RES_8_apartments_lower" }, { "not": { "u_has_item": "id_science_medical_red" } } ] }, @@ -11,7 +12,8 @@ { "type": "effect_on_condition", "id": "lab_security_check_surface_3", - "recurrence": [ 5, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_res_8_SWU_ground" }, { "not": { "u_has_item": "id_science_maintenance_green" } } ] }, @@ -20,7 +22,8 @@ { "type": "effect_on_condition", "id": "lab_security_check_surface_2", - "recurrence": [ 5, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_res_8_SWD_ground" }, { "not": { "u_has_item": "id_science_maintenance_green" } } ] }, @@ -29,7 +32,8 @@ { "type": "effect_on_condition", "id": "lab_security_check_surface_1", - "recurrence": 1, + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_CORE_2x1_WC_ground" }, { "not": { "u_has_item": "id_science_maintenance_green" } } ] }, @@ -41,7 +45,8 @@ { "type": "effect_on_condition", "id": "lab_check_magenta_security_drop", - "recurrence": [ 3, 5 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_security_z-1" }, @@ -57,7 +62,8 @@ { "type": "effect_on_condition", "id": "lab_1x1x2_RES_8_check_SEC", - "recurrence": [ 5, 10 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_1x1_RES_8_commons_SEC" }, { "not": { "u_has_item": "id_science_security_yellow" } } ] }, @@ -66,7 +72,8 @@ { "type": "effect_on_condition", "id": "lab_1x1x2_RES_8_check_MAINT", - "recurrence": [ 5, 10 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_1x1_RES_8_commons_MAINT" }, { "not": { "u_has_item": "id_science_maintenance_yellow" } } ] }, @@ -75,7 +82,8 @@ { "type": "effect_on_condition", "id": "lab_concourse_bot_release", - "recurrence": [ 5, 10 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_CORE_2x1_1DN" }, @@ -104,7 +112,8 @@ { "type": "effect_on_condition", "id": "lab_concourse_bot_release_2", - "recurrence": [ 5, 10 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_CORE_2x1_2DN" }, @@ -133,21 +142,24 @@ { "type": "effect_on_condition", "id": "lab_magenta_security_check", - "recurrence": [ 15, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_security_z-5" }, { "not": { "u_has_item": "id_science_security_magenta" } } ] }, "effect": [ { "mapgen_update": "release_bots_4", "om_terrain": "lab_security_z-5" } ] }, { "type": "effect_on_condition", "id": "lab_cyan_mutagen_check", - "recurrence": [ 15, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_2_NE" }, { "not": { "u_has_item": "id_science_mutagen_cyan" } } ] }, "effect": [ { "mapgen_update": "release_bots_5", "om_terrain": "lab_2x2_MUT_tier_2_NE" } ] }, { "type": "effect_on_condition", "id": "lab_cyan_mutagen_check_2", - "recurrence": [ 15, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_2_NW_final_flr" }, { "not": { "u_has_item": "id_science_mutagen_cyan" } } ] }, @@ -156,42 +168,48 @@ { "type": "effect_on_condition", "id": "lab_cyan_mutagen_check_3", - "recurrence": [ 15, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_2_SW" }, { "not": { "u_has_item": "id_science_mutagen_cyan" } } ] }, "effect": [ { "mapgen_update": "release_bots_7", "om_terrain": "lab_2x2_MUT_tier_2_SW" } ] }, { "type": "effect_on_condition", "id": "lab_cyan_mutagen_check_4", - "recurrence": [ 15, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_2_SE" }, { "not": { "u_has_item": "id_science_mutagen_cyan" } } ] }, "effect": [ { "mapgen_update": "release_bots_8", "om_terrain": "lab_2x2_MUT_tier_2_SE" } ] }, { "type": "effect_on_condition", "id": "lab_pink_mutagen_check", - "recurrence": [ 15, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_1_NE" }, { "not": { "u_has_item": "id_science_mutagen_pink" } } ] }, "effect": [ { "mapgen_update": "release_bots_5", "om_terrain": "lab_2x2_MUT_tier_1_NE" } ] }, { "type": "effect_on_condition", "id": "lab_pink_mutagen_check_2", - "recurrence": [ 15, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_1_NW" }, { "not": { "u_has_item": "id_science_mutagen_pink" } } ] }, "effect": [ { "mapgen_update": "release_bots_6", "om_terrain": "lab_2x2_MUT_tier_1_NW" } ] }, { "type": "effect_on_condition", "id": "lab_pink_mutagen_check_3", - "recurrence": [ 15, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_1_SW" }, { "not": { "u_has_item": "id_science_mutagen_pink" } } ] }, "effect": [ { "mapgen_update": "release_bots_7", "om_terrain": "lab_2x2_MUT_tier_1_SW" } ] }, { "type": "effect_on_condition", "id": "lab_pink_mutagen_check_4", - "recurrence": [ 15, 30 ], + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "u_at_om_location": "lab_2x2_MUT_tier_1_SE" }, { "not": { "u_has_item": "id_science_mutagen_pink" } } ] }, "effect": [ { "mapgen_update": "release_bots_8", "om_terrain": "lab_2x2_MUT_tier_1_SE" } ] } 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 7d5bd6ffa6a97..c349ccba2b1cf 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 @@ -2,7 +2,8 @@ { "type": "effect_on_condition", "id": "EOC_quietfarm_nearby", - "recurrence": "1 seconds", + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "or": [ { "u_near_om_location": "unvitrified_farm_0" }, { "u_near_om_location": "unvitrified_orchard" } ] }, @@ -22,7 +23,8 @@ { "type": "effect_on_condition", "id": "EOC_vitrified_farm_entry", - "recurrence": "1 seconds", + "eoc_type": "EVENT", + "required_event": "avatar_enters_omt", "condition": { "and": [ { "or": [ { "u_at_om_location": "unvitrified_farm_0" }, { "u_at_om_location": "unvitrified_orchard" } ] }, @@ -39,279 +41,204 @@ } ] }, - "effect": { - "run_eocs": [ - { - "id": "EOC_vitrified_confuse", - "effect": [ - { - "place_override": { "global_val": "place_name", "default_str": "Quiet Farmhouse" }, - "length": "1 day", - "key": "vitrified_farm_escape_key" - }, - { "custom_light_level": 70, "length": "1 day", "key": "vitrified_farm_escape_key" } - ] - }, - { - "id": "EOC_vitrified_entry_state", - "effect": [ - { "math": [ "u_glass_health_head", "=", "u_hp('head')" ] }, - { "math": [ "u_glass_health_torso", "=", "u_hp('torso')" ] }, - { "math": [ "u_glass_health_arm_l", "=", "u_hp('arm_l')" ] }, - { "math": [ "u_glass_health_arm_r", "=", "u_hp('arm_r')" ] }, - { "math": [ "u_glass_health_leg_l", "=", "u_hp('leg_l')" ] }, - { "math": [ "u_glass_health_leg_r", "=", "u_hp('leg_r')" ] }, - { "math": [ "u_glass_sleepiness", "=", "u_val('sleepiness')" ] } - ] - }, - { - "id": "EOC_setup_vitrified_farm", - "effect": [ - { - "u_location_variable": { "global_val": "vitrified_farm_ground" }, - "target_params": { "om_terrain": "unvitrified_farm_0", "search_range": 100, "min_distance": 0, "z": 0 }, - "z_adjust": 6, - "z_override": true - }, - { - "u_location_variable": { "global_val": "vitrified_farm_upper" }, - "target_params": { "om_terrain": "unvitrified_farm_1", "search_range": 100, "min_distance": 0, "z": 0 }, - "z_adjust": 7, - "z_override": true - }, - { - "u_location_variable": { "global_val": "vitrified_farm_basement" }, - "target_params": { "om_terrain": "unvitrified_farm_neg_1", "search_range": 100, "min_distance": 0, "z": 0 }, - "z_adjust": 5, - "z_override": true - }, - { - "u_location_variable": { "global_val": "vitrified_farm_roof" }, - "target_params": { "om_terrain": "unvitrified_farm_2", "search_range": 100, "min_distance": 0, "z": 0 }, - "z_adjust": 8, - "z_override": true - }, - { - "u_location_variable": { "global_val": "vitrified_sky_1" }, - "target_params": { "om_terrain": "unvitrified_farm_2", "search_range": 100, "min_distance": 0, "z": 0 }, - "z_adjust": 9, - "z_override": true - }, - { - "u_location_variable": { "global_val": "vitrified_apples" }, - "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 }, - "z_adjust": 6, - "z_override": true - }, - { - "u_location_variable": { "global_val": "vitrified_apples_sky_lower" }, - "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 }, - "z_adjust": 7, - "z_override": true - }, - { - "u_location_variable": { "global_val": "vitrified_apples_sky_upper" }, - "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 }, - "z_adjust": 8, - "z_override": true - }, - { - "u_location_variable": { "global_val": "vitrified_sky_2" }, - "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 }, - "z_adjust": 9, - "z_override": true - }, - { - "revert_location": { "global_val": "vitrified_farm_ground" }, - "time_in_future": "infinite", - "key": "vitrified_farm_escape_key" - }, - { - "revert_location": { "global_val": "vitrified_farm_upper" }, - "time_in_future": "infinite", - "key": "vitrified_farm_escape_key" - }, - { - "revert_location": { "global_val": "vitrified_farm_basement" }, - "time_in_future": "infinite", - "key": "vitrified_farm_escape_key" - }, - { - "revert_location": { "global_val": "vitrified_farm_roof" }, - "time_in_future": "infinite", - "key": "vitrified_farm_escape_key" - }, - { - "revert_location": { "global_val": "vitrified_sky_1" }, - "time_in_future": "infinite", - "key": "vitrified_farm_escape_key" - }, - { - "revert_location": { "global_val": "vitrified_apples" }, - "time_in_future": "infinite", - "key": "vitrified_farm_escape_key" - }, - { - "revert_location": { "global_val": "vitrified_apples_sky_lower" }, - "time_in_future": "infinite", - "key": "vitrified_farm_escape_key" - }, - { - "revert_location": { "global_val": "vitrified_apples_sky_upper" }, - "time_in_future": "infinite", - "key": "vitrified_farm_escape_key" - }, - { - "revert_location": { "global_val": "vitrified_sky_2" }, - "time_in_future": "infinite", - "key": "vitrified_farm_escape_key" - }, - { "mapgen_update": "vitrified_farm_0", "target_var": { "global_val": "vitrified_farm_ground" } }, - { "mapgen_update": "vitrified_farm_1", "target_var": { "global_val": "vitrified_farm_upper" } }, - { "mapgen_update": "vitrified_farm_-1", "target_var": { "global_val": "vitrified_farm_basement" } }, - { "mapgen_update": "vitrified_farm_2", "target_var": { "global_val": "vitrified_farm_roof" } }, - { "mapgen_update": "vitrified_sky", "target_var": { "global_val": "vitrified_sky_1" } }, - { "mapgen_update": "vitrified_orchard", "target_var": { "global_val": "vitrified_apples" } }, - { "mapgen_update": "vitrified_orchard_sky", "target_var": { "global_val": "vitrified_apples_sky_lower" } }, - { "mapgen_update": "vitrified_orchard_sky", "target_var": { "global_val": "vitrified_apples_sky_upper" } }, - { "mapgen_update": "vitrified_sky", "target_var": { "global_val": "vitrified_sky_2" } } - ] - }, - { - "id": "EOC_entry_tp", - "effect": [ - { "u_location_variable": { "u_val": "vitrifaction_entry" }, "x_adjust": 0, "y_adjust": 0, "z_adjust": 6 }, - { "u_teleport": { "u_val": "vitrifaction_entry" }, "fail_message": "Oops!", "force": true } - ] - }, - { - "id": "EOC_vitrifiaction_entry_message", - "effect": { - "u_message": "You arrive at the farmhouse, after what feels like an eternity. It's not quite what you were expecting, but it's very peaceful.", - "type": "good", - "popup": true - } - }, - { - "id": "EOC_enter_vitrify_effect", - "effect": [ - { "math": [ "u_vitri_vitrified", "=", "1" ] }, - { "math": [ "u_vitri_glassed", "=", "0" ] }, - { "math": [ "u_vitri_glass_entered", "=", "2" ] }, - { - "u_add_effect": "VITRIFYING", - "duration": "PERMANENT", - "intensity": { "math": [ "u_vitri_vitrified" ] } - } - ] - } - ] - } + "effect": [ + { + "place_override": { "global_val": "place_name", "default_str": "Quiet Farmhouse" }, + "length": "1 day", + "key": "vitrified_farm_escape_key" + }, + { "custom_light_level": 70, "length": "1 day", "key": "vitrified_farm_escape_key" }, + { "math": [ "u_glass_health_head", "=", "u_hp('head')" ] }, + { "math": [ "u_glass_health_torso", "=", "u_hp('torso')" ] }, + { "math": [ "u_glass_health_arm_l", "=", "u_hp('arm_l')" ] }, + { "math": [ "u_glass_health_arm_r", "=", "u_hp('arm_r')" ] }, + { "math": [ "u_glass_health_leg_l", "=", "u_hp('leg_l')" ] }, + { "math": [ "u_glass_health_leg_r", "=", "u_hp('leg_r')" ] }, + { "math": [ "u_glass_sleepiness", "=", "u_val('sleepiness')" ] }, + { + "u_location_variable": { "global_val": "vitrified_farm_ground" }, + "target_params": { "om_terrain": "unvitrified_farm_0", "search_range": 100, "min_distance": 0, "z": 0 }, + "z_adjust": 6, + "z_override": true + }, + { + "u_location_variable": { "global_val": "vitrified_farm_upper" }, + "target_params": { "om_terrain": "unvitrified_farm_1", "search_range": 100, "min_distance": 0, "z": 0 }, + "z_adjust": 7, + "z_override": true + }, + { + "u_location_variable": { "global_val": "vitrified_farm_basement" }, + "target_params": { "om_terrain": "unvitrified_farm_neg_1", "search_range": 100, "min_distance": 0, "z": 0 }, + "z_adjust": 5, + "z_override": true + }, + { + "u_location_variable": { "global_val": "vitrified_farm_roof" }, + "target_params": { "om_terrain": "unvitrified_farm_2", "search_range": 100, "min_distance": 0, "z": 0 }, + "z_adjust": 8, + "z_override": true + }, + { + "u_location_variable": { "global_val": "vitrified_sky_1" }, + "target_params": { "om_terrain": "unvitrified_farm_2", "search_range": 100, "min_distance": 0, "z": 0 }, + "z_adjust": 9, + "z_override": true + }, + { + "u_location_variable": { "global_val": "vitrified_apples" }, + "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 }, + "z_adjust": 6, + "z_override": true + }, + { + "u_location_variable": { "global_val": "vitrified_apples_sky_lower" }, + "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 }, + "z_adjust": 7, + "z_override": true + }, + { + "u_location_variable": { "global_val": "vitrified_apples_sky_upper" }, + "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 }, + "z_adjust": 8, + "z_override": true + }, + { + "u_location_variable": { "global_val": "vitrified_sky_2" }, + "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 }, + "z_adjust": 9, + "z_override": true + }, + { + "revert_location": { "global_val": "vitrified_farm_ground" }, + "time_in_future": "infinite", + "key": "vitrified_farm_escape_key" + }, + { + "revert_location": { "global_val": "vitrified_farm_upper" }, + "time_in_future": "infinite", + "key": "vitrified_farm_escape_key" + }, + { + "revert_location": { "global_val": "vitrified_farm_basement" }, + "time_in_future": "infinite", + "key": "vitrified_farm_escape_key" + }, + { + "revert_location": { "global_val": "vitrified_farm_roof" }, + "time_in_future": "infinite", + "key": "vitrified_farm_escape_key" + }, + { + "revert_location": { "global_val": "vitrified_sky_1" }, + "time_in_future": "infinite", + "key": "vitrified_farm_escape_key" + }, + { + "revert_location": { "global_val": "vitrified_apples" }, + "time_in_future": "infinite", + "key": "vitrified_farm_escape_key" + }, + { + "revert_location": { "global_val": "vitrified_apples_sky_lower" }, + "time_in_future": "infinite", + "key": "vitrified_farm_escape_key" + }, + { + "revert_location": { "global_val": "vitrified_apples_sky_upper" }, + "time_in_future": "infinite", + "key": "vitrified_farm_escape_key" + }, + { + "revert_location": { "global_val": "vitrified_sky_2" }, + "time_in_future": "infinite", + "key": "vitrified_farm_escape_key" + }, + { "mapgen_update": "vitrified_farm_0", "target_var": { "global_val": "vitrified_farm_ground" } }, + { "mapgen_update": "vitrified_farm_1", "target_var": { "global_val": "vitrified_farm_upper" } }, + { "mapgen_update": "vitrified_farm_-1", "target_var": { "global_val": "vitrified_farm_basement" } }, + { "mapgen_update": "vitrified_farm_2", "target_var": { "global_val": "vitrified_farm_roof" } }, + { "mapgen_update": "vitrified_sky", "target_var": { "global_val": "vitrified_sky_1" } }, + { "mapgen_update": "vitrified_orchard", "target_var": { "global_val": "vitrified_apples" } }, + { "mapgen_update": "vitrified_orchard_sky", "target_var": { "global_val": "vitrified_apples_sky_lower" } }, + { "mapgen_update": "vitrified_orchard_sky", "target_var": { "global_val": "vitrified_apples_sky_upper" } }, + { "mapgen_update": "vitrified_sky", "target_var": { "global_val": "vitrified_sky_2" } }, + { "u_location_variable": { "u_val": "vitrifaction_entry" }, "z_adjust": 6 }, + { "u_teleport": { "u_val": "vitrifaction_entry" }, "fail_message": "Oops!", "force": true }, + { + "u_message": "You arrive at the farmhouse, after what feels like an eternity. It's not quite what you were expecting, but it's very peaceful.", + "type": "good", + "popup": true + }, + { "math": [ "u_vitri_vitrified", "=", "1" ] }, + { "math": [ "u_vitri_glassed", "=", "0" ] }, + { "math": [ "u_vitri_glass_entered", "=", "2" ] }, + { "u_add_effect": "VITRIFYING", "duration": "PERMANENT", "intensity": { "math": [ "u_vitri_vitrified" ] } }, + { "run_eocs": "EOC_vitrified_farm_explore", "time_in_future": "1 minutes" } + ] }, { "type": "effect_on_condition", "id": "EOC_vitrified_farm_explore", - "recurrence": "1 minutes", "condition": { "u_has_effect": "VITRIFYING" }, "effect": [ + { "run_eocs": "EOC_vitrified_farm_explore", "time_in_future": "1 minutes" }, { "switch": { "math": [ "u_vitri_vitrified" ] }, "cases": [ { "case": 1, - "effect": { - "run_eocs": [ - { - "id": "EOC_vitrified_ambient_message_1", - "effect": [ - { "u_message": "Vitrifaction_Ambient_1", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, - { "u_add_morale": "morale_vitri_placid", "bonus": 3, "max_bonus": 50 } - ] - }, - "EOC_queue_vitrified_int_drain" - ] - } + "effect": [ + { "u_message": "Vitrifaction_Ambient_1", "snippet": true, "type": "good" }, + { "math": [ "u_vitri_glassed", "++" ] }, + { "u_add_morale": "morale_vitri_placid", "bonus": 3, "max_bonus": 50 }, + { "run_eocs": "EOC_queue_vitrified_int_drain" } + ] }, { "case": 2, - "effect": { - "run_eocs": [ - { - "id": "EOC_vitrified_ambient_message_2", - "effect": [ - { "u_message": "Vitrifaction_Ambient_2", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, - { "u_add_morale": "morale_vitri_placid", "bonus": 5, "max_bonus": 99 } - ] - }, - "EOC_queue_vitrified_int_drain" - ] - } + "effect": [ + { "u_message": "Vitrifaction_Ambient_2", "snippet": true, "type": "good" }, + { "math": [ "u_vitri_glassed", "++" ] }, + { "u_add_morale": "morale_vitri_placid", "bonus": 5, "max_bonus": 99 }, + { "run_eocs": "EOC_queue_vitrified_int_drain" } + ] }, { "case": 3, - "effect": { - "run_eocs": [ - { - "id": "EOC_vitrified_ambient_message_3", - "effect": [ - { "u_message": "Vitrifaction_Ambient_3", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, - { "u_add_morale": "morale_vitri_placid", "bonus": 7, "max_bonus": 99 } - ] - }, - "EOC_queue_vitrified_int_drain" - ] - } + "effect": [ + { "u_message": "Vitrifaction_Ambient_3", "snippet": true, "type": "good" }, + { "math": [ "u_vitri_glassed", "++" ] }, + { "u_add_morale": "morale_vitri_placid", "bonus": 7, "max_bonus": 99 }, + { "run_eocs": "EOC_queue_vitrified_int_drain" } + ] }, { "case": 4, - "effect": { - "run_eocs": [ - { - "id": "EOC_vitrified_ambient_message_4", - "effect": [ - { "u_message": "Vitrifaction_Ambient_4", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, - { "u_add_morale": "morale_vitri_placid", "bonus": 10, "max_bonus": 99 } - ] - }, - "EOC_queue_vitrified_int_drain" - ] - } + "effect": [ + { "u_message": "Vitrifaction_Ambient_4", "snippet": true, "type": "good" }, + { "math": [ "u_vitri_glassed", "++" ] }, + { "u_add_morale": "morale_vitri_placid", "bonus": 10, "max_bonus": 99 }, + { "run_eocs": "EOC_queue_vitrified_int_drain" } + ] }, { "case": 5, - "effect": { - "run_eocs": [ - { - "id": "EOC_vitrified_ambient_message_5", - "effect": [ - { "u_message": "Vitrifaction_Ambient_5", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, - { "u_add_morale": "morale_vitri_placid", "bonus": 15, "max_bonus": 99 } - ] - }, - "EOC_queue_vitrified_int_drain" - ] - } + "effect": [ + { "u_message": "Vitrifaction_Ambient_5", "snippet": true, "type": "good" }, + { "math": [ "u_vitri_glassed", "++" ] }, + { "u_add_morale": "morale_vitri_placid", "bonus": 15, "max_bonus": 99 }, + { "run_eocs": "EOC_queue_vitrified_int_drain" } + ] }, { "case": 6, - "effect": { - "run_eocs": [ - { - "id": "EOC_vitrified_ambient_message_6", - "effect": [ - { "u_message": "Vitrifaction_Ambient_6", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, - { "u_add_morale": "morale_vitri_placid", "bonus": 20, "max_bonus": 99 } - ] - }, - "EOC_queue_vitrified_int_drain" - ] - } + "effect": [ + { "u_message": "Vitrifaction_Ambient_6", "snippet": true, "type": "good" }, + { "math": [ "u_vitri_glassed", "++" ] }, + { "u_add_morale": "morale_vitri_placid", "bonus": 20, "max_bonus": 99 }, + { "run_eocs": "EOC_queue_vitrified_int_drain" } + ] }, { "case": 7,