Skip to content

Commit

Permalink
adds arcanist
Browse files Browse the repository at this point in the history
  • Loading branch information
Eein committed Apr 14, 2023
1 parent 5df31ef commit bd4f827
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ struct Game {
job_license_dancer: Watcher<u16>,
job_license_warrior: Watcher<u16>,
job_license_apothecary: Watcher<u16>,
job_license_arcanist: Watcher<u16>,
dialog: Watcher<u8>,
}

Expand Down Expand Up @@ -119,6 +120,7 @@ impl Game {
job_license_dancer: Watcher::new(vec![0x4F7AB30, 0x2D8, 0xB88, 0x6c + 0x4]),
job_license_warrior: Watcher::new(vec![0x4F7AB30, 0x2D8, 0xB88, 0x60 + 0x4]),
job_license_apothecary: Watcher::new(vec![0x4F7AB30, 0x2D8, 0xB88, 0x48 + 0x4]),
job_license_arcanist: Watcher::new(vec![0x4F7AB30, 0x2D8, 0x28, 0x120 + 0xe]),
event_index: Watcher::new(vec![0x4F7B1E0, 0x298]),
splits: HashSet::new(),
};
Expand Down Expand Up @@ -178,6 +180,9 @@ impl Game {
job_license_armsmaster: self
.job_license_armsmaster
.update(&self.process, self.module)?,
job_license_arcanist: self
.job_license_arcanist
.update(&self.process, self.module)?,
settings: &self.settings,
splits: &mut self.splits,
})
Expand Down Expand Up @@ -246,6 +251,7 @@ pub struct Vars<'a> {
event_index: &'a Pair<u16>,
job_license_inventor: &'a Pair<u16>,
job_license_armsmaster: &'a Pair<u16>,
job_license_arcanist: &'a Pair<u16>,
job_license_hunter: &'a Pair<u16>,
job_license_thief: &'a Pair<u16>,
job_license_cleric: &'a Pair<u16>,
Expand Down Expand Up @@ -404,6 +410,9 @@ fn should_split(vars: &mut Vars) -> Option<String> {
vars.settings.job_license_armsmaster,
);
}
if vars.job_license_arcanist.old == 2 && vars.job_license_arcanist.current == 18 {
return vars.split("job_license_arcanist", vars.settings.job_license_arcanist);
}
if let Some(split) = splits::hikari::HikariSplits::split(vars) {
return Some(split);
}
Expand Down
3 changes: 3 additions & 0 deletions src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ pub struct Settings {
/// Job License - Armsmaster
pub job_license_armsmaster: bool,

/// Job License - Arcanist
pub job_license_arcanist: bool,

/// Job License - Hunter
pub job_license_hunter: bool,

Expand Down

0 comments on commit bd4f827

Please sign in to comment.