github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove region discovery as its not needed anymore.

Browse source
This commit is contained in:
Anthony Stewart 2025-04-20 17:06:27 -05:00
commit e88949506d
7 changed files with 6 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

37
soh/soh/Enhancements/randomizer/entrance.cpp
View file

@ -1694,41 +1694,4 @@ extern "C" {
EntranceOverride* Randomizer_GetEntranceOverrides() { EntranceOverride* Randomizer_GetEntranceOverrides() {
return Rando::Context::GetInstance()->GetEntranceShuffler()->entranceOverrides.data(); return Rando::Context::GetInstance()->GetEntranceShuffler()->entranceOverrides.data();
} }
void Randomizer_DiscoverRegion(Region* region, std::unordered_set<RandomizerRegion>& visitedRegions) {
region->IsDiscovered = true;
for (const auto& exit : region->exits) {
if (!exit.IsShuffled()) {
RandomizerRegion connectedRegionKey = exit.GetConnectedRegionKey();
if (visitedRegions.contains(connectedRegionKey)) {
continue;
}
visitedRegions.insert(connectedRegionKey);
Randomizer_DiscoverRegion(exit.GetConnectedRegion(), visitedRegions);
}
}
}
void Randomizer_RegionDiscovered(RandomizerRegion region) {
std::unordered_set<RandomizerRegion> visitedRegions;
Randomizer_DiscoverRegion(&areaTable[region], visitedRegions);
}
void Randomizer_EntranceDiscovered(s16 index, bool recalculateAvailableChecks) {
auto entranceEntry = Rando::entranceMap.find(index);
if (entranceEntry == Rando::entranceMap.end()) {
return;
}
Rando::Entrance* entrance = entranceEntry->second;
RandomizerRegion connectedRegionKey = entrance->GetConnectedRegionKey();
Randomizer_RegionDiscovered(connectedRegionKey);
if (recalculateAvailableChecks) {
CheckTracker::RecalculateAvailableChecks();
}
}
} }

2
soh/soh/Enhancements/randomizer/entrance.h
View file

@ -153,8 +153,6 @@ class EntranceShuffler {
extern "C" { extern "C" {
#endif #endif
EntranceOverride* Randomizer_GetEntranceOverrides(); EntranceOverride* Randomizer_GetEntranceOverrides();
void Randomizer_RegionDiscovered(RandomizerRegion region);
void Randomizer_EntranceDiscovered(s16 index, bool recalculateAvailableChecks);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
soh/soh/Enhancements/randomizer/location_access.h
View file

@ -137,8 +137,6 @@ class Region {
bool adultNight = false; bool adultNight = false;
bool addedToPool = false; bool addedToPool = false;
bool IsDiscovered = false;
void ApplyTimePass(); void ApplyTimePass();
bool UpdateEvents(); bool UpdateEvents();

13
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View file

@ -585,12 +585,6 @@ void CheckTrackerLoadGame(int32_t fileNum) {
if (Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_ENTRANCES).Get()) { if (Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_ENTRANCES).Get()) {
Rando::Context::GetInstance()->GetEntranceShuffler()->ApplyEntranceOverrides(); Rando::Context::GetInstance()->GetEntranceShuffler()->ApplyEntranceOverrides();
for (s16 entranceIndex = 0; entranceIndex < MAX_ENTRANCE_RANDO_USED_INDEX; entranceIndex++) {
if (IsEntranceDiscovered(entranceIndex)) {
Randomizer_EntranceDiscovered(entranceIndex, false);
}
}
} }
RecalculateAvailableChecks(); RecalculateAvailableChecks();
@ -2150,13 +2144,6 @@ void CheckTrackerSettingsWindow::DrawElement() {
"with your current progress.") "with your current progress.")
.Color(THEME_COLOR))) { .Color(THEME_COLOR))) {
enableAvailableChecks = CVarGetInteger(CVAR_TRACKER_CHECK("EnableAvailableChecks"), 0); enableAvailableChecks = CVarGetInteger(CVAR_TRACKER_CHECK("EnableAvailableChecks"), 0);
for (s16 entranceIndex = 0; entranceIndex < ENTR_MAX; entranceIndex++) {
if (IsEntranceDiscovered(entranceIndex)) {
Randomizer_EntranceDiscovered(entranceIndex, false);
}
}
RecalculateAvailableChecks(); RecalculateAvailableChecks();
} }
ImGui::EndDisabled(); ImGui::EndDisabled();

2
soh/soh/Enhancements/randomizer/randomizer_entrance.c
View file

@ -809,7 +809,7 @@ void Entrance_SetEntranceDiscovered(u16 entranceIndex, u8 isReversedEntrance) {
if (idx < SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT) { if (idx < SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT) {
u32 entranceBit = 1 << (entranceIndex - (idx * bitsPerIndex)); u32 entranceBit = 1 << (entranceIndex - (idx * bitsPerIndex));
gSaveContext.ship.stats.entrancesDiscovered[idx] |= entranceBit; gSaveContext.ship.stats.entrancesDiscovered[idx] |= entranceBit;
Randomizer_EntranceDiscovered(entranceIndex, true); CheckTracker_RecalculateAvailableChecks();
// Set reverse entrance when not decoupled // Set reverse entrance when not decoupled
if (!Randomizer_GetSettingValue(RSK_DECOUPLED_ENTRANCES) && !isReversedEntrance) { if (!Randomizer_GetSettingValue(RSK_DECOUPLED_ENTRANCES) && !isReversedEntrance) {

5
soh/soh/OTRGlobals.cpp
View file

@ -2608,4 +2608,7 @@ void SoH_ProcessDroppedFiles(std::string filePath) {
return; return;
} }
} }
// #endregion
extern "C" void CheckTracker_RecalculateAvailableChecks() {
CheckTracker::RecalculateAvailableChecks();
}

1
soh/soh/OTRGlobals.h
View file

@ -163,6 +163,7 @@ void Gfx_UnregisterBlendedTexture(const char* name);
void Gfx_TextureCacheDelete(const uint8_t* addr); void Gfx_TextureCacheDelete(const uint8_t* addr);
void SaveManager_ThreadPoolWait(); void SaveManager_ThreadPoolWait();
void CheckTracker_OnMessageClose(); void CheckTracker_OnMessageClose();
void CheckTracker_RecalculateAvailableChecks();
GetItemID RetrieveGetItemIDFromItemID(ItemID itemID); GetItemID RetrieveGetItemIDFromItemID(ItemID itemID);
RandomizerGet RetrieveRandomizerGetFromItemID(ItemID itemID); RandomizerGet RetrieveRandomizerGetFromItemID(ItemID itemID);