From 95d5e7b6fd68d54f832fbe781e5928b4a65d83b6 Mon Sep 17 00:00:00 2001 From: William Volin Date: Sat, 5 Nov 2022 18:04:26 -0700 Subject: [PATCH] cargo format --- src/data/zone.rs | 3 +- src/lib.rs | 348 +++++++++++++++++++++++++++++------------------ 2 files changed, 219 insertions(+), 132 deletions(-) diff --git a/src/data/zone.rs b/src/data/zone.rs index e28da65..18ee64c 100644 --- a/src/data/zone.rs +++ b/src/data/zone.rs @@ -3,7 +3,7 @@ use phf::phf_map; pub struct ZoneDescription { name: &'static str, region: &'static str, - ring: u8 + ring: u8, } // pub struct RegionDescription { @@ -210,4 +210,3 @@ pub static AREAS: phf::Map = phf_map! { 195_u8 => ZoneDescription{name: "The Gate of Finis", region: "Highlands", ring: 3}, 196_u8 => ZoneDescription{name: "Journey's End", region: "Highlands", ring: 3}, }; - diff --git a/src/lib.rs b/src/lib.rs index d2099ee..f237ee0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,11 +11,7 @@ use asr::{ }; mod data; -use data::zone::{ - AREAS, - SHRINES, - ADVANCED_JOB_FIGHTS, -}; +use data::zone::{ADVANCED_JOB_FIGHTS, AREAS, SHRINES}; static STATE: Spinlock = const_spinlock(State { game: None }); @@ -79,7 +75,7 @@ impl Game { therion_progress: Watcher::new(vec![0x0289CC48, 0x370, 0x1C8, 0x448]), haanit_progress: Watcher::new(vec![0x0289CC48, 0x370, 0x1C8, 0x380]), flags: Default::default(), - splits: HashSet::new() + splits: HashSet::new(), }; Some(game) } @@ -90,8 +86,12 @@ impl Game { zone_id: self.zone_id.update(&self.process, self.module)?, money: self.money.update(&self.process, self.module)?, game_state: self.game_state.update(&self.process, self.module)?, - cutscene_script_index: self.cutscene_script_index.update(&self.process, self.module)?, - cutscene_progress_bar: self.cutscene_progress_bar.update(&self.process, self.module)?, + cutscene_script_index: self + .cutscene_script_index + .update(&self.process, self.module)?, + cutscene_progress_bar: self + .cutscene_progress_bar + .update(&self.process, self.module)?, ophilia_progress: self.ophilia_progress.update(&self.process, self.module)?, cyrus_progress: self.cyrus_progress.update(&self.process, self.module)?, tressa_progress: self.tressa_progress.update(&self.process, self.module)?, @@ -104,7 +104,6 @@ impl Game { splits: &mut self.splits, }) } - } pub struct State { @@ -152,7 +151,9 @@ struct Vars<'a> { impl Vars<'_> { fn split(&mut self, key: &str) -> Option { - if self.splits.contains(key) { return None; } + if self.splits.contains(key) { + return None; + } self.splits.insert(key.to_string()); // we should be returning settings if they exist here to match if the user // has assigned a setting, otherwise return None; @@ -161,9 +162,7 @@ impl Vars<'_> { } fn name_to_key(&self, name: &str) -> String { - return name.to_lowercase() - .replace(" ", "_") - .replace("'", "") + return name.to_lowercase().replace(" ", "_").replace("'", ""); } } @@ -213,7 +212,10 @@ pub extern "C" fn update() { fn should_split(vars: &mut Vars) -> Option { // TODO: we may not need to contains_key here on these lookup tables // Shrines - if SHRINES.contains_key(&vars.zone_id.current) && vars.game_state.current == 5 && vars.game_state.old == 2 { + if SHRINES.contains_key(&vars.zone_id.current) + && vars.game_state.current == 5 + && vars.game_state.old == 2 + { if let Some(shrine) = SHRINES.get(&vars.zone_id.current) { let key = format!("get_{}", vars.name_to_key(&shrine)); return vars.split(&key); @@ -221,9 +223,12 @@ fn should_split(vars: &mut Vars) -> Option { } // Advanced Job Fights - if ADVANCED_JOB_FIGHTS.contains_key(&vars.zone_id.current) && vars.game_state.current == 5 && vars.game_state.old == 6 { + if ADVANCED_JOB_FIGHTS.contains_key(&vars.zone_id.current) + && vars.game_state.current == 5 + && vars.game_state.old == 6 + { if let Some(advanced_job) = ADVANCED_JOB_FIGHTS.get(&vars.zone_id.current) { - let key = format!("advanced_job_fight_{}", vars.name_to_key(&advanced_job)); + let key = format!("advanced_job_fight_{}", vars.name_to_key(&advanced_job)); return vars.split(&key); } } @@ -231,41 +236,69 @@ fn should_split(vars: &mut Vars) -> Option { // Enter & Exit Area if vars.zone_id.old != vars.zone_id.current && vars.zone_id.old != 0 { // Enter Area - if AREAS.contains_key(&vars.zone_id.current) && vars.game_state.current == 2 && vars.game_state.old == 2 { - let key = format!("enter_{}", vars.zone_id.current.to_string()); + if AREAS.contains_key(&vars.zone_id.current) + && vars.game_state.current == 2 + && vars.game_state.old == 2 + { + let key = format!("enter_{}", vars.zone_id.current.to_string()); return vars.split(&key); } // Exit Area - if AREAS.contains_key(&vars.zone_id.old) && (vars.game_state.old == 2 || vars.game_state.old == 4) { - let key = format!("exit_{}", vars.zone_id.old.to_string()); + if AREAS.contains_key(&vars.zone_id.old) + && (vars.game_state.old == 2 || vars.game_state.old == 4) + { + let key = format!("exit_{}", vars.zone_id.old.to_string()); return vars.split(&key); } } // Characters Joining - if vars.ophilia_progress.old == 0 && vars.ophilia_progress.current >= 120 { return vars.split("character_ophilia") } - if vars.cyrus_progress.old == 0 && vars.cyrus_progress.current >= 100 { return vars.split("character_cyrus") } - if vars.tressa_progress.old == 0 && vars.tressa_progress.current >= 110 { return vars.split("character_tressa") } - if vars.olberic_progress.old == 0 && vars.olberic_progress.current >= 110 { return vars.split("character_olberic") } - if vars.primrose_progress.old == 0 && vars.primrose_progress.current >= 140 { return vars.split("character_primrose") } - if vars.alfyn_progress.old == 0 && vars.alfyn_progress.current >= 70 { return vars.split("character_alfyn") } - if vars.haanit_progress.old == 0 && vars.haanit_progress.current >= 110 { return vars.split("character_haanit") } - if vars.therion_progress.old == 0 && vars.therion_progress.current >= 70 { return vars.split("character_therion") } + if vars.ophilia_progress.old == 0 && vars.ophilia_progress.current >= 120 { + return vars.split("character_ophilia"); + } + if vars.cyrus_progress.old == 0 && vars.cyrus_progress.current >= 100 { + return vars.split("character_cyrus"); + } + if vars.tressa_progress.old == 0 && vars.tressa_progress.current >= 110 { + return vars.split("character_tressa"); + } + if vars.olberic_progress.old == 0 && vars.olberic_progress.current >= 110 { + return vars.split("character_olberic"); + } + if vars.primrose_progress.old == 0 && vars.primrose_progress.current >= 140 { + return vars.split("character_primrose"); + } + if vars.alfyn_progress.old == 0 && vars.alfyn_progress.current >= 70 { + return vars.split("character_alfyn"); + } + if vars.haanit_progress.old == 0 && vars.haanit_progress.current >= 110 { + return vars.split("character_haanit"); + } + if vars.therion_progress.old == 0 && vars.therion_progress.current >= 70 { + return vars.split("character_therion"); + } // Ophilia if vars.ophilia_progress.old < vars.ophilia_progress.current && vars.zone_id.old != 0 { - if vars.ophilia_progress.current == 170 { return vars.split("fight_guardian") } - else if vars.ophilia_progress.current == 1140 { return vars.split("fight_hrodvitnir") } - else if vars.ophilia_progress.current == 2110 { return vars.split("fight_mm_sf") } - else if vars.ophilia_progress.current == 3090 { return vars.split("fight_cultists") } - else if vars.ophilia_progress.current == 3150 { return vars.split("fight_mattias") } - else if vars.ophilia_progress.current % 1000 == 0 { + if vars.ophilia_progress.current == 170 { + return vars.split("fight_guardian"); + } else if vars.ophilia_progress.current == 1140 { + return vars.split("fight_hrodvitnir"); + } else if vars.ophilia_progress.current == 2110 { + return vars.split("fight_mm_sf"); + } else if vars.ophilia_progress.current == 3090 { + return vars.split("fight_cultists"); + } else if vars.ophilia_progress.current == 3150 { + return vars.split("fight_mattias"); + } else if vars.ophilia_progress.current % 1000 == 0 { vars.flags.char_chapter_ending = Character::Ophilia; } } // Ophilia Ending - if vars.ophilia_progress.current == 3160 && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 94) { + if vars.ophilia_progress.current == 3160 + && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 94) + { // will taking the 1 - the current + a sleep here freeze the timer? // could we use this to get accurate precision on a probable split? return vars.split("character_story_endings_ophilia"); @@ -273,131 +306,188 @@ fn should_split(vars: &mut Vars) -> Option { // Cyrus if vars.cyrus_progress.old != vars.cyrus_progress.current && vars.zone_id.old != 0 { - if vars.cyrus_progress.current == 130 { return vars.split("fight_russell") } - else if vars.cyrus_progress.current == 1110 { return vars.split("fight_gideon") } - else if vars.cyrus_progress.current == 2160 { return vars.split("fight_yvon") } - else if vars.cyrus_progress.current == 3060 { return vars.split("fight_lucia") } - else if vars.cyrus_progress.current % 1000 == 0 { + if vars.cyrus_progress.current == 130 { + return vars.split("fight_russell"); + } else if vars.cyrus_progress.current == 1110 { + return vars.split("fight_gideon"); + } else if vars.cyrus_progress.current == 2160 { + return vars.split("fight_yvon"); + } else if vars.cyrus_progress.current == 3060 { + return vars.split("fight_lucia"); + } else if vars.cyrus_progress.current % 1000 == 0 { vars.flags.char_chapter_ending = Character::Cyrus; } } // Cyrus Ending - if vars.cyrus_progress.current == 3110 && - vars.cutscene_script_index.current >= 138 && - vars.cutscene_progress_bar.current > 0.98 { + if vars.cyrus_progress.current == 3110 + && vars.cutscene_script_index.current >= 138 + && vars.cutscene_progress_bar.current > 0.98 + { return vars.split("character_story_endings_cyrus"); } // Tressa if vars.tressa_progress.old != vars.tressa_progress.current && vars.zone_id.old != 0 { - if vars.tressa_progress.current == 170 { return vars.split("fight_mikk_makk") } - else if vars.tressa_progress.current == 1120 { return vars.split("fight_omar") } - else if vars.tressa_progress.current == 2150 { return vars.split("fight_venomtooth_tiger") } - else if vars.tressa_progress.current == 3120 { return vars.split("fight_esmeralda") } - else if vars.tressa_progress.current % 1000 == 0 { + if vars.tressa_progress.current == 170 { + return vars.split("fight_mikk_makk"); + } else if vars.tressa_progress.current == 1120 { + return vars.split("fight_omar"); + } else if vars.tressa_progress.current == 2150 { + return vars.split("fight_venomtooth_tiger"); + } else if vars.tressa_progress.current == 3120 { + return vars.split("fight_esmeralda"); + } else if vars.tressa_progress.current % 1000 == 0 { vars.flags.char_chapter_ending = Character::Tressa; } } // Tressa Ending - if vars.tressa_progress.current == 3180 && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 209) { + if vars.tressa_progress.current == 3180 + && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 209) + { return vars.split("character_story_endings_tressa"); } // Primrose if vars.primrose_progress.old != vars.primrose_progress.current && vars.zone_id.old != 0 { - if vars.primrose_progress.current == 160 { return vars.split("fight_helgenish") } - else if vars.primrose_progress.current == 1180 { return vars.split("fight_rufus") } - else if vars.primrose_progress.current == 2170 { return vars.split("fight_albus") } - else if vars.primrose_progress.current == 3150 { return vars.split("fight_simeon2") } - else if vars.primrose_progress.current == 3120 { return vars.split("fight_simeon1") } - else if vars.primrose_progress.current % 1000 == 0 { + if vars.primrose_progress.current == 160 { + return vars.split("fight_helgenish"); + } else if vars.primrose_progress.current == 1180 { + return vars.split("fight_rufus"); + } else if vars.primrose_progress.current == 2170 { + return vars.split("fight_albus"); + } else if vars.primrose_progress.current == 3150 { + return vars.split("fight_simeon2"); + } else if vars.primrose_progress.current == 3120 { + return vars.split("fight_simeon1"); + } else if vars.primrose_progress.current % 1000 == 0 { vars.flags.char_chapter_ending = Character::Primrose; } } // Primrose Ending - if vars.primrose_progress.current == 3150 && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 94) { + if vars.primrose_progress.current == 3150 + && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 94) + { return vars.split("character_story_endings_primrose"); } // Olberic if vars.olberic_progress.old < vars.olberic_progress.current && vars.zone_id.old != 0 { - if vars.olberic_progress.current == 110 { return vars.split("fight_brigands1") } - else if vars.olberic_progress.current == 140 { return vars.split("fight_brigands2") } - else if vars.olberic_progress.current == 160 { return vars.split("fight_gaston") } - else if vars.olberic_progress.current == 1070 { return vars.split("fight_victorino") } - else if vars.olberic_progress.current == 1140 { return vars.split("fight_joshua") } - else if vars.olberic_progress.current == 1180 { return vars.split("fight_archibold") } - else if vars.olberic_progress.current == 1220 { return vars.split("fight_gustav") } - else if vars.olberic_progress.current == 2070 { return vars.split("fight_lizards1") } - else if vars.olberic_progress.current == 2080 { return vars.split("fight_lizards2") } - else if vars.olberic_progress.current == 2110 { return vars.split("fight_lizardking") } - else if vars.olberic_progress.current == 2130 { return vars.split("fight_erhardt") } - else if vars.olberic_progress.current == 3050 { return vars.split("fight_red_hat") } - else if vars.olberic_progress.current == 3110 { return vars.split("fight_werner") } - else if vars.olberic_progress.current % 1000 == 0 { + if vars.olberic_progress.current == 110 { + return vars.split("fight_brigands1"); + } else if vars.olberic_progress.current == 140 { + return vars.split("fight_brigands2"); + } else if vars.olberic_progress.current == 160 { + return vars.split("fight_gaston"); + } else if vars.olberic_progress.current == 1070 { + return vars.split("fight_victorino"); + } else if vars.olberic_progress.current == 1140 { + return vars.split("fight_joshua"); + } else if vars.olberic_progress.current == 1180 { + return vars.split("fight_archibold"); + } else if vars.olberic_progress.current == 1220 { + return vars.split("fight_gustav"); + } else if vars.olberic_progress.current == 2070 { + return vars.split("fight_lizards1"); + } else if vars.olberic_progress.current == 2080 { + return vars.split("fight_lizards2"); + } else if vars.olberic_progress.current == 2110 { + return vars.split("fight_lizardking"); + } else if vars.olberic_progress.current == 2130 { + return vars.split("fight_erhardt"); + } else if vars.olberic_progress.current == 3050 { + return vars.split("fight_red_hat"); + } else if vars.olberic_progress.current == 3110 { + return vars.split("fight_werner"); + } else if vars.olberic_progress.current % 1000 == 0 { vars.flags.char_chapter_ending = Character::Olberic; } } // Olberic Ending - if vars.olberic_progress.current == 3120 && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 174) { + if vars.olberic_progress.current == 3120 + && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 174) + { return vars.split("character_story_endings_olberic"); } // Alfyn if vars.alfyn_progress.old != vars.alfyn_progress.current && vars.zone_id.old != 0 { - if vars.alfyn_progress.current == 90 { return vars.split("fight_blotted_viper") } - else if vars.alfyn_progress.current == 1130 { return vars.split("fight_vanessa") } - else if vars.alfyn_progress.current == 2140 { return vars.split("fight_miguel") } - else if vars.alfyn_progress.current == 3240 { return vars.split("fight_ogre_eagle") } - else if vars.alfyn_progress.current % 1000 == 0 { + if vars.alfyn_progress.current == 90 { + return vars.split("fight_blotted_viper"); + } else if vars.alfyn_progress.current == 1130 { + return vars.split("fight_vanessa"); + } else if vars.alfyn_progress.current == 2140 { + return vars.split("fight_miguel"); + } else if vars.alfyn_progress.current == 3240 { + return vars.split("fight_ogre_eagle"); + } else if vars.alfyn_progress.current % 1000 == 0 { vars.flags.char_chapter_ending = Character::Alfyn; } } // Alfyn Ending - if vars.alfyn_progress.current == 3300 && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 93) { + if vars.alfyn_progress.current == 3300 + && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 93) + { return vars.split("character_story_endings_alfyn"); } // Therion if vars.therion_progress.old != vars.therion_progress.current && vars.zone_id.old != 0 { - if vars.therion_progress.current == 140 { return vars.split("fight_heathecote") } - else if vars.therion_progress.current == 1130 { return vars.split("fight_orlick") } - else if vars.therion_progress.current == 2100 { return vars.split("fight_darius_henchmen") } - else if vars.therion_progress.current == 2150 { return vars.split("fight_gareth") } - else if vars.therion_progress.current == 3040 { return vars.split("fight_darius_underlings") } - else if vars.therion_progress.current == 3140 { return vars.split("3_percent_steal") } - else if vars.therion_progress.current == 3180 { return vars.split("fight_darius") } - else if vars.therion_progress.current % 1000 == 0 { + if vars.therion_progress.current == 140 { + return vars.split("fight_heathecote"); + } else if vars.therion_progress.current == 1130 { + return vars.split("fight_orlick"); + } else if vars.therion_progress.current == 2100 { + return vars.split("fight_darius_henchmen"); + } else if vars.therion_progress.current == 2150 { + return vars.split("fight_gareth"); + } else if vars.therion_progress.current == 3040 { + return vars.split("fight_darius_underlings"); + } else if vars.therion_progress.current == 3140 { + return vars.split("3_percent_steal"); + } else if vars.therion_progress.current == 3180 { + return vars.split("fight_darius"); + } else if vars.therion_progress.current % 1000 == 0 { vars.flags.char_chapter_ending = Character::Therion; } } // Therion Ending - if vars.therion_progress.current == 3200 && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 275) { + if vars.therion_progress.current == 3200 + && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 275) + { return vars.split("character_story_endings_therion"); } // H'aanit if vars.haanit_progress.old != vars.haanit_progress.current && vars.zone_id.old != 0 { - if vars.haanit_progress.current == 110 { return vars.split("fight_ghisarma") } - else if vars.haanit_progress.current == 1050 { return vars.split("fight_nathans_bodyguard") } - else if vars.haanit_progress.current == 1100 { return vars.split("fight_ancient_one") } - else if vars.haanit_progress.current == 1120 { return vars.split("fight_lord_of_the_forest") } - else if vars.haanit_progress.current == 2030 { return vars.split("fight_alaic") } - else if vars.haanit_progress.current == 2090 { return vars.split("fight_dragon") } - else if vars.haanit_progress.current == 3130 { return vars.split("fight_redeye") } - else if vars.haanit_progress.current % 1000 == 0 { + if vars.haanit_progress.current == 110 { + return vars.split("fight_ghisarma"); + } else if vars.haanit_progress.current == 1050 { + return vars.split("fight_nathans_bodyguard"); + } else if vars.haanit_progress.current == 1100 { + return vars.split("fight_ancient_one"); + } else if vars.haanit_progress.current == 1120 { + return vars.split("fight_lord_of_the_forest"); + } else if vars.haanit_progress.current == 2030 { + return vars.split("fight_alaic"); + } else if vars.haanit_progress.current == 2090 { + return vars.split("fight_dragon"); + } else if vars.haanit_progress.current == 3130 { + return vars.split("fight_redeye"); + } else if vars.haanit_progress.current % 1000 == 0 { vars.flags.char_chapter_ending = Character::Haanit; } } // H'aanit Ending - if vars.haanit_progress.current == 3140 && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 195) { + if vars.haanit_progress.current == 3140 + && (vars.cutscene_progress_bar.current > 0.98 || vars.cutscene_script_index.current > 195) + { return vars.split("character_story_endings_haanit"); } @@ -405,38 +495,38 @@ fn should_split(vars: &mut Vars) -> Option { if vars.game_state.current == 2 && vars.game_state.old == 5 { match vars.flags.char_chapter_ending { Character::NoCharacter => (), // reset char here - Character::Ophilia => { + Character::Ophilia => { vars.flags.char_chapter_ending = Character::NoCharacter; return vars.split("chapter_end_ophilia"); - }, - Character::Cyrus => { + } + Character::Cyrus => { vars.flags.char_chapter_ending = Character::NoCharacter; return vars.split("chapter_end_cyrus"); - }, - Character::Tressa => { + } + Character::Tressa => { vars.flags.char_chapter_ending = Character::NoCharacter; return vars.split("chapter_end_tressa"); - }, - Character::Olberic => { + } + Character::Olberic => { vars.flags.char_chapter_ending = Character::NoCharacter; return vars.split("chapter_end_olberic"); - }, - Character::Primrose => { + } + Character::Primrose => { vars.flags.char_chapter_ending = Character::NoCharacter; return vars.split("chapter_end_primrose"); - }, - Character::Alfyn => { + } + Character::Alfyn => { vars.flags.char_chapter_ending = Character::NoCharacter; return vars.split("chapter_end_alfyn"); - }, - Character::Therion => { + } + Character::Therion => { vars.flags.char_chapter_ending = Character::NoCharacter; return vars.split("chapter_end_therion"); - }, - Character::Haanit => { + } + Character::Haanit => { vars.flags.char_chapter_ending = Character::NoCharacter; return vars.split("chapter_end_haanit"); - }, + } } } @@ -444,33 +534,31 @@ fn should_split(vars: &mut Vars) -> Option { if vars.zone_id.current == 10 && vars.zone_id.current != vars.zone_id.old { return vars.split("credits"); } - // Galdera Splits else if vars.zone_id.current == 195 && vars.zone_id.old == 194 { return vars.split("finis_start"); - } - - else if vars.zone_id.current == 196 && vars.zone_id.old == 195 { + } else if vars.zone_id.current == 196 && vars.zone_id.old == 195 { return vars.split("journeys_end_start"); - } - - else if vars.zone_id.current == 196 && vars.game_state.current == 6 && vars.game_state.old == 5 { + } else if vars.zone_id.current == 196 + && vars.game_state.current == 6 + && vars.game_state.old == 5 + { return vars.split("galdera_phase_1_start"); - } - - else if vars.zone_id.current == 198 && vars.zone_id.old == 196 { + } else if vars.zone_id.current == 198 && vars.zone_id.old == 196 { return vars.split("galdera_phase_1_end"); - } - - else if vars.zone_id.current == 198 && vars.zone_id.old == 198 && vars.game_state.current == 6 && vars.game_state.old == 5 { + } else if vars.zone_id.current == 198 + && vars.zone_id.old == 198 + && vars.game_state.current == 6 + && vars.game_state.old == 5 + { return vars.split("galdera_phase_2_start"); - } - - else if vars.zone_id.current == 198 && vars.zone_id.old == 198 && vars.game_state.current == 5 && vars.game_state.old == 6 { + } else if vars.zone_id.current == 198 + && vars.zone_id.old == 198 + && vars.game_state.current == 5 + && vars.game_state.old == 6 + { return vars.split("galdera_phase_2_end"); - } - - else if vars.zone_id.current == 194 && vars.money.current - vars.money.old == 100000 { + } else if vars.zone_id.current == 194 && vars.money.current - vars.money.old == 100000 { return vars.split("at_journeys_end"); }