ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Recalculate Available Checks from Current Region (#6165)

Browse source
This commit is contained in:
xxAtrain223 2026-01-25 21:23:47 -06:00 committed by GitHub
parent 983d04d362
commit f5264be192
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1736,6 +1736,11 @@ void EntranceShuffler::ApplyEntranceOverrides() {
entrance->SetAsShuffled();
}
}
const Entrance* EntranceShuffler::GetEntranceByIndex(int16_t index) {
auto iter = entranceMap.find(index);
return iter != entranceMap.end() ? iter->second : nullptr;
}
} // namespace Rando
extern "C" EntranceOverride* Randomizer_GetEntranceOverrides() {

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

@ -133,6 +133,8 @@ class EntranceShuffler {
void ParseJson(nlohmann::json spoilerFileJson);
void ApplyEntranceOverrides();
static const Entrance* GetEntranceByIndex(int16_t index);
private:
std::vector<Entrance*> AssumeEntrancePool(std::vector<Entrance*>& entrancePool);
bool ShuffleOneWayPriorityEntrances(std::map<std::string, PriorityEntrance>& oneWayPriorities,

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

@ -270,6 +270,8 @@ std::vector<uint32_t> buttons = { BTN_A, BTN_B, BTN_CUP, BTN_CDOWN, BTN_CLEFT,
BTN_Z, BTN_R, BTN_START, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT };
static ImGuiTextFilter checkSearch;
static bool recalculateAvailable = false;
static RandomizerRegion availableChecksStartingRegion = RR_ROOT;
static int16_t previousEntrance = 0;
std::array<bool, RCAREA_INVALID> filterAreasHidden = { 0 };
std::array<bool, RC_MAX> filterChecksHidden = { 0 };
@ -610,9 +612,7 @@ void CheckTrackerLoadGame(int32_t fileNum) {
RegionTable_Init();
if (Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_ENTRANCES).Get()) {
Rando::Context::GetInstance()->GetEntranceShuffler()->ApplyEntranceOverrides();
}
Rando::Context::GetInstance()->GetEntranceShuffler()->ApplyEntranceOverrides();
recalculateAvailable = true;
}
@ -954,6 +954,8 @@ void SetAreaSpoiled(RandomizerCheckArea rcArea) {
SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true);
}
void InternalRecalculateAvailableChecks(RandomizerRegion startingRegion);
void CheckTrackerWindow::DrawElement() {
Color_Background = CVarGetColor(CVAR_TRACKER_CHECK("BgColor.Value"), Color_Bg_Default);
Color_Area_Incomplete_Main = CVarGetColor(CVAR_TRACKER_CHECK("AreaIncomplete.MainColor.Value"), Color_Main_Default);
@ -1027,9 +1029,15 @@ void CheckTrackerWindow::DrawElement() {
return;
}
if (gPlayState->nextEntranceIndex != previousEntrance) {
previousEntrance = gPlayState->nextEntranceIndex;
recalculateAvailable = true;
}
if (recalculateAvailable) {
recalculateAvailable = false;
RecalculateAvailableChecks();
InternalRecalculateAvailableChecks(availableChecksStartingRegion);
availableChecksStartingRegion = RR_ROOT;
}
// Quick Options
@ -2052,7 +2060,7 @@ void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName,
UIWidgets::PopStyleCombobox();
}
void RecalculateAvailableChecks(RandomizerRegion startingRegion /* = RR_ROOT */) {
void InternalRecalculateAvailableChecks(RandomizerRegion startingRegion) {
if (!enableAvailableChecks || !GameInteractor::IsSaveLoaded()) {
return;
}
@ -2063,6 +2071,20 @@ void RecalculateAvailableChecks(RandomizerRegion startingRegion /* = RR_ROOT */)
const auto& ctx = Rando::Context::GetInstance();
logic = ctx->GetLogic();
int16_t entranceIndex = gPlayState->nextEntranceIndex;
if (startingRegion == RR_ROOT && entranceIndex >= 0 && entranceIndex < ENTR_MAX) {
// Try to find a mapped entrance
// e.g. ENTR_DEKU_TREE_0_1 (index 1) is not mapped, but ENTR_DEKU_TREE_ENTRANCE (index 0) is mapped
const int8_t scene = gEntranceTable[entranceIndex].scene;
for (; entranceIndex >= 0 && gEntranceTable[entranceIndex].scene == scene; entranceIndex--) {
const auto entrance = Rando::EntranceShuffler::GetEntranceByIndex(entranceIndex);
if (entrance != nullptr) {
startingRegion = entrance->GetOriginalConnectedRegionKey();
break;
}
}
}
std::vector<RandomizerCheck> targetLocations;
targetLocations.reserve(RC_MAX);
for (auto& location : Rando::StaticData::GetLocationTable()) {
@ -2097,6 +2119,11 @@ void RecalculateAvailableChecks(RandomizerRegion startingRegion /* = RR_ROOT */)
GetPerformanceTimer(PT_RECALCULATE_AVAILABLE_CHECKS).count());
}
void RecalculateAvailableChecks(RandomizerRegion startingRegion /* = RR_ROOT */) {
recalculateAvailable = true;
availableChecksStartingRegion = startingRegion;
}
void CheckTracker_LoadFromPreset(nlohmann::json info) {
presetLoaded = true;
presetPos = { info["pos"]["x"], info["pos"]["y"] };

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

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

3
soh/src/code/z_play.c
View file

@ -690,6 +690,9 @@ void Play_Init(GameState* thisx) {
GET_PLAYER(play)->actor.world.pos.y + Player_GetHeight(GET_PLAYER(play)) + 5.0f,
GET_PLAYER(play)->actor.world.pos.z, 0, 0, 0, 1, true);
}
// nextEntranceIndex was not initialized, so the previous value was carried over during soft resets.
gPlayState->nextEntranceIndex = gSaveContext.entranceIndex;
}
void Play_Update(PlayState* play) {