Skip to content

Commit

Permalink
Some specific Bench splits (#37)
Browse files Browse the repository at this point in the history 
Mostly Stag benches, but also Spire bench
  • Loading branch information
@AlexKnauth
AlexKnauth authored Jan 25, 2024
1 parent d3835b0 commit 089bbb6
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/hollow_knight_memory.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ struct PlayerDataPointers {
killed_mage_lord: UnityPointer<3>,
mage_lord_dream_defeated: UnityPointer<3>,
mage_lord_orbs_collected: UnityPointer<3>,
kills_great_shield_zombie: UnityPointer<3>,
watcher_chandelier: UnityPointer<3>,
killed_black_knight: UnityPointer<3>,
collector_defeated: UnityPointer<3>,
Expand Down Expand Up @@ -778,6 +779,7 @@ impl PlayerDataPointers {
killed_mage_lord: UnityPointer::new("GameManager", 0, &["_instance", "playerData", "killedMageLord"]),
mage_lord_dream_defeated: UnityPointer::new("GameManager", 0, &["_instance", "playerData", "mageLordDreamDefeated"]),
mage_lord_orbs_collected: UnityPointer::new("GameManager", 0, &["_instance", "playerData", "mageLordOrbsCollected"]),
kills_great_shield_zombie: UnityPointer::new("GameManager", 0, &["_instance", "playerData", "killsGreatShieldZombie"]),
watcher_chandelier: UnityPointer::new("GameManager", 0, &["_instance", "playerData", "watcherChandelier"]),
killed_black_knight: UnityPointer::new("GameManager", 0, &["_instance", "playerData", "killedBlackKnight"]),
collector_defeated: UnityPointer::new("GameManager", 0, &["_instance", "playerData", "collectorDefeated"]),
Expand Down Expand Up @@ -1921,6 +1923,10 @@ impl GameManagerFinder {
self.player_data_pointers.mage_lord_orbs_collected.deref(process, &self.module, &self.image).ok()
}

pub fn kills_great_shield_zombie(&self, process: &Process) -> Option<i32> {
self.player_data_pointers.kills_great_shield_zombie.deref(process, &self.module, &self.image).ok()
}

pub fn watcher_chandelier(&self, process: &Process) -> Option<bool> {
self.player_data_pointers.watcher_chandelier.deref(process, &self.module, &self.image).ok()
}
Expand Down
47 changes: 47 additions & 0 deletions src/splits.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1697,6 +1697,10 @@ pub enum Split {
///
/// Splits when killing Brooding Mawlek
BroodingMawlek,
/// Crossroads Stag (Bench)
///
/// Splits when sitting on the bench at Crossroads Stag
BenchCrossroadsStag,
/// Gruz Mother (Boss)
///
/// Splits when killing Gruz Mother
Expand Down Expand Up @@ -1774,6 +1778,10 @@ pub enum Split {
///
/// Splits on transition after Vengefly King in Greenpath killed
VengeflyKingTrans,
/// Greenpath Stag (Bench)
///
/// Splits when sitting on the bench at Greenpath Stag
BenchGreenpathStag,
/// Enter Hornet 1 (Transition)
///
/// Splits when entering Hornet boss arena transition in Greenpath
Expand Down Expand Up @@ -1822,6 +1830,10 @@ pub enum Split {
///
/// Splits when entering Fungal Wastes text first appears
FungalWastes,
/// Queen's Station (Bench)
///
/// Splits when sitting on the bench in Queen's Station
BenchQueensStation,
/// Elder Hu (Boss)
///
/// Splits when killing Elder Hu
Expand Down Expand Up @@ -1997,6 +2009,22 @@ pub enum Split {
/// Splits when getting Soul Tyrant essence and Sanctum fakedive grub
SoulTyrantEssenceWithSanctumGrub,
MenuStoreroomsSimpleKey,
/// Storerooms (Bench)
///
/// Splits when sitting on the bench in City Storerooms
BenchStorerooms,
/// King's Station (Bench)
///
/// Splits when sitting on the bench in King's Station
BenchKingsStation,
/// Watcher's Spire (Bench)
///
/// Splits when sitting on the bench in Watcher's Spire
BenchSpire,
/// Watcher's Spire + Killed Great Husk Sentry (Bench)
///
/// Splits when sitting on the bench in Watcher's Spire after killing a Great Husk Sentry
BenchSpireGHS,
EnterBlackKnight,
/// Chandelier - Watcher Knights (Event)
///
Expand Down Expand Up @@ -2146,6 +2174,10 @@ pub enum Split {
///
/// Splits when getting Lost Kin essence
LostKinEssence,
/// Hidden Station (Bench)
///
/// Splits when sitting on the bench in Hidden Station
BenchHiddenStation,
// endregion: Basin
// region: White Palace
/// White Palace Entry (Transition)
Expand Down Expand Up @@ -2765,6 +2797,10 @@ pub enum Split {
///
/// Splits when absorbing essence from Marmu
MarmuEssence,
/// Queen's Gardens Stag (Bench)
///
/// Splits when sitting on the bench at Queen's Gardens Stag
BenchQGStag,
/// Traitor Lord (Boss)
///
/// Splits when killing Traitor Lord
Expand Down Expand Up @@ -3763,6 +3799,7 @@ pub fn continuous_splits(s: &Split, p: &Process, g: &GameManagerFinder, pds: &mu
Split::InfectedCrossroads => should_split(g.crossroads_infected(p).is_some_and(|i| i) && g.visited_crossroads(p).is_some_and(|v| v)),
Split::MenderBug => should_split(g.killed_mender_bug(p).is_some_and(|k| k)),
Split::BroodingMawlek => should_split(g.killed_mawlek(p).is_some_and(|k| k)),
Split::BenchCrossroadsStag => should_split(g.at_bench(p).is_some_and(|b| b) && g.get_scene_name(p).is_some_and(|s| s == "Crossroads_47")),
Split::GruzMother => should_split(g.killed_big_fly(p).is_some_and(|f| f)),
Split::SlyRescued => should_split(g.sly_rescued(p).is_some_and(|s| s)),
Split::FalseKnight => should_split(g.killed_false_knight(p).is_some_and(|k| k)),
Expand All @@ -3780,6 +3817,7 @@ pub fn continuous_splits(s: &Split, p: &Process, g: &GameManagerFinder, pds: &mu
Split::MossKnight => should_split(g.killed_moss_knight(p).is_some_and(|k| k)),
Split::Zote1 => should_split(g.zote_rescued_buzzer(p).is_some_and(|z| z)),
Split::VengeflyKingTrans => { pds.zote_rescued_buzzer(p, g); should_split(false) },
Split::BenchGreenpathStag => should_split(g.at_bench(p).is_some_and(|b| b) && g.get_scene_name(p).is_some_and(|s| s == "Fungus1_16_alt")),
Split::Hornet1 => should_split(g.killed_hornet(p).is_some_and(|k| k)),
Split::Aluba => should_split(g.killed_lazy_flyer(p).is_some_and(|k| k)),
Split::HuntersMark => should_split(g.killed_hunter_mark(p).is_some_and(|k| k)),
Expand All @@ -3791,6 +3829,7 @@ pub fn continuous_splits(s: &Split, p: &Process, g: &GameManagerFinder, pds: &mu
// endregion: Greenpath
// region: Fungal
Split::FungalWastes => should_split(g.visited_fungus(p).is_some_and(|v| v)),
Split::BenchQueensStation => should_split(g.at_bench(p).is_some_and(|b| b) && g.get_scene_name(p).is_some_and(|s| s == "Fungus2_02")),
Split::ElderHu => should_split(g.killed_ghost_hu(p).is_some_and(|k| k)),
Split::ElderHuEssence => should_split(g.elder_hu_defeated(p).is_some_and(|d| d == 2)),
Split::ElderHuTrans => { pds.killed_ghost_hu(p, g); should_split(false) },
Expand Down Expand Up @@ -3834,6 +3873,12 @@ pub fn continuous_splits(s: &Split, p: &Process, g: &GameManagerFinder, pds: &mu
Split::SoulTyrantEssence => should_split(g.mage_lord_orbs_collected(p).is_some_and(|o| o)),
Split::SoulTyrantEssenceWithSanctumGrub => should_split(g.mage_lord_orbs_collected(p).is_some_and(|o| o)
&& g.scenes_grub_rescued(p).is_some_and(|s| s.contains(&"Ruins1_32".to_string()))),
Split::BenchStorerooms => should_split(g.at_bench(p).is_some_and(|b| b) && g.get_scene_name(p).is_some_and(|s| s == "Ruins1_29")),
Split::BenchKingsStation => should_split(g.at_bench(p).is_some_and(|b| b) && g.get_scene_name(p).is_some_and(|s| s == "Ruins2_08")),
Split::BenchSpire => should_split(g.at_bench(p).is_some_and(|b| b) && g.get_scene_name(p).is_some_and(|s| s == "Ruins1_18")),
Split::BenchSpireGHS => should_split(g.at_bench(p).is_some_and(|b| b)
&& g.get_scene_name(p).is_some_and(|s| s == "Ruins1_18")
&& g.kills_great_shield_zombie(p).is_some_and(|k| k < 10)),
Split::WatcherChandelier => should_split(g.watcher_chandelier(p).is_some_and(|c| c)),
Split::BlackKnight => should_split(g.killed_black_knight(p).is_some_and(|k| k)),
Split::BlackKnightTrans => { pds.killed_black_knight(p, g); should_split(false) },
Expand Down Expand Up @@ -3869,6 +3914,7 @@ pub fn continuous_splits(s: &Split, p: &Process, g: &GameManagerFinder, pds: &mu
Split::BrokenVesselTrans => { pds.killed_infected_knight(p, g); should_split(false) },
Split::LostKin => should_split(g.infected_knight_dream_defeated(p).is_some_and(|k| k)),
Split::LostKinEssence => should_split(g.infected_knight_orbs_collected(p).is_some_and(|o| o)),
Split::BenchHiddenStation => should_split(g.at_bench(p).is_some_and(|b| b) && g.get_scene_name(p).is_some_and(|s| s == "Abyss_22")),
// TODO: should there be a split for the actual Abyss Area Text?
// endregion: Basin
// region: White Palace
Expand Down Expand Up @@ -3974,6 +4020,7 @@ pub fn continuous_splits(s: &Split, p: &Process, g: &GameManagerFinder, pds: &mu
Split::FlowerQuest => should_split(g.xun_flower_given(p).is_some_and(|g| g)),
Split::Marmu => should_split(g.killed_ghost_marmu(p).is_some_and(|k| k)),
Split::MarmuEssence => should_split(g.mum_caterpillar_defeated(p).is_some_and(|d| d == 2)),
Split::BenchQGStag => should_split(g.at_bench(p).is_some_and(|b| b) && g.get_scene_name(p).is_some_and(|s| s == "Fungus3_40")),
Split::TraitorLord => should_split(g.killed_traitor_lord(p).is_some_and(|k| k)),
Split::GivenWhiteLadyFlower => should_split(g.given_white_lady_flower(p).is_some_and(|g| g)),
// endregion: Queen's Gardens
Expand Down

0 comments on commit 089bbb6

Please sign in to comment.