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

Show number of Accessible checks in each Area.

Browse source
This commit is contained in:
Anthony Stewart 2025-03-04 21:04:39 -06:00
commit 0a67bda550
1 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,8 +130,10 @@ bool areasFullyChecked[RCAREA_INVALID];
u32 areasSpoiled = 0; u32 areasSpoiled = 0;
bool showVOrMQ; bool showVOrMQ;
s8 areaChecksGotten[RCAREA_INVALID]; //| "Kokiri Forest (4/9)" s8 areaChecksGotten[RCAREA_INVALID]; //| "Kokiri Forest (4/9)"
s8 areaChecksAccessible[RCAREA_INVALID];
s8 areaCheckTotals[RCAREA_INVALID]; s8 areaCheckTotals[RCAREA_INVALID];
uint16_t totalChecks = 0; uint16_t totalChecks = 0;
uint16_t totalChecksAccessible = 0;
uint16_t totalChecksGotten = 0; uint16_t totalChecksGotten = 0;
bool optCollapseAll; // A bool that will collapse all checks once bool optCollapseAll; // A bool that will collapse all checks once
bool optExpandAll; // A bool that will expand all checks once bool optExpandAll; // A bool that will expand all checks once
@ -233,10 +235,12 @@ void TrySetAreas() {
void CalculateTotals() { void CalculateTotals() {
totalChecks = 0; totalChecks = 0;
totalChecksAccessible = 0;
totalChecksGotten = 0; totalChecksGotten = 0;
for (uint8_t i = 0; i < RCAREA_INVALID; i++) { for (uint8_t i = 0; i < RCAREA_INVALID; i++) {
totalChecks += areaCheckTotals[i]; totalChecks += areaCheckTotals[i];
totalChecksAccessible += areaChecksAccessible[i];
totalChecksGotten += areaChecksGotten[i]; totalChecksGotten += areaChecksGotten[i];
} }
} }
@ -251,6 +255,7 @@ uint16_t GetTotalChecksGotten() {
void RecalculateAreaTotals(RandomizerCheckArea rcArea) { void RecalculateAreaTotals(RandomizerCheckArea rcArea) {
areaChecksGotten[rcArea] = 0; areaChecksGotten[rcArea] = 0;
areaChecksAccessible[rcArea] = 0;
areaCheckTotals[rcArea] = 0; areaCheckTotals[rcArea] = 0;
for (auto rc : checksByArea.at(rcArea)) { for (auto rc : checksByArea.at(rcArea)) {
if (!IsVisibleInCheckTracker(rc)) { if (!IsVisibleInCheckTracker(rc)) {
@ -259,6 +264,8 @@ void RecalculateAreaTotals(RandomizerCheckArea rcArea) {
areaCheckTotals[rcArea]++; areaCheckTotals[rcArea]++;
if (OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetIsSkipped() || OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->HasObtained()) { if (OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetIsSkipped() || OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->HasObtained()) {
areaChecksGotten[rcArea]++; areaChecksGotten[rcArea]++;
} else if (OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->IsAccessible()) {
areaChecksAccessible[rcArea]++;
} }
} }
CalculateTotals(); CalculateTotals();
@ -306,6 +313,7 @@ void SetCheckCollected(RandomizerCheck rc) {
if (IsVisibleInCheckTracker(rc)) { if (IsVisibleInCheckTracker(rc)) {
if (!OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetIsSkipped()) { if (!OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetIsSkipped()) {
areaChecksGotten[loc->GetArea()]++; areaChecksGotten[loc->GetArea()]++;
areaChecksAccessible[loc->GetArea()]--;
} else { } else {
OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(false); OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(false);
} }
@ -422,10 +430,12 @@ void ClearAreaChecksAndTotals() {
for (auto& [rcArea, vec] : checksByArea) { for (auto& [rcArea, vec] : checksByArea) {
vec.clear(); vec.clear();
areaChecksGotten[rcArea] = 0; areaChecksGotten[rcArea] = 0;
areaChecksAccessible[rcArea] = 0;
areaCheckTotals[rcArea] = 0; areaCheckTotals[rcArea] = 0;
} }
totalChecks = 0; totalChecks = 0;
totalChecksGotten = 0; totalChecksGotten = 0;
totalChecksAccessible = 0;
} }
void SetShopSeen(uint32_t sceneNum, bool prices) { void SetShopSeen(uint32_t sceneNum, bool prices) {
@ -467,6 +477,9 @@ void CheckTrackerLoadGame(int32_t fileNum) {
if (loc->GetCheckStatus() == RCSHOW_SAVED || loc->GetIsSkipped()) { if (loc->GetCheckStatus() == RCSHOW_SAVED || loc->GetIsSkipped()) {
areaChecksGotten[entry2->GetArea()]++; areaChecksGotten[entry2->GetArea()]++;
} }
if (loc->IsAccessible()) {
areaChecksAccessible[entry2->GetArea()]++;
}
} }
if (areaChecksGotten[entry2->GetArea()] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2->GetArea()) || if (areaChecksGotten[entry2->GetArea()] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2->GetArea()) ||
@ -927,7 +940,7 @@ void CheckTrackerWindow::DrawElement() {
UIWidgets::PaddedSeparator(); UIWidgets::PaddedSeparator();
ImGui::Text("Total Checks: %d / %d", totalChecksGotten, totalChecks); ImGui::Text("Total Checks: %d Accessible / %d Checked / %d Total", totalChecksAccessible, totalChecksGotten, totalChecks);
UIWidgets::PaddedSeparator(); UIWidgets::PaddedSeparator();
@ -1018,12 +1031,16 @@ void CheckTrackerWindow::DrawElement() {
if (isThisAreaSpoiled) { if (isThisAreaSpoiled) {
if (showVOrMQ && RandomizerCheckObjects::AreaIsDungeon(rcArea)) { if (showVOrMQ && RandomizerCheckObjects::AreaIsDungeon(rcArea)) {
if (OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(DungeonSceneLookupByArea(rcArea))->IsMQ()) if (OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(DungeonSceneLookupByArea(rcArea))->IsMQ()) {
ImGui::Text("(%d/%d) - MQ", areaChecksGotten[rcArea], areaCheckTotals[rcArea]); ImGui::Text("(%d / %d / %d) - MQ", areaChecksAccessible[rcArea], areaChecksGotten[rcArea], areaCheckTotals[rcArea]);
else UIWidgets::Tooltip("Accessible / Checked / Total");
ImGui::Text("(%d/%d) - Vanilla", areaChecksGotten[rcArea], areaCheckTotals[rcArea]); } else {
ImGui::Text("(%d / %d / %d) - Vanilla", areaChecksAccessible[rcArea], areaChecksGotten[rcArea], areaCheckTotals[rcArea]);
UIWidgets::Tooltip("Accessible / Checked / Total");
}
} else { } else {
ImGui::Text("(%d/%d)", areaChecksGotten[rcArea], areaCheckTotals[rcArea]); ImGui::Text("(%d / %d / %d)", areaChecksAccessible[rcArea], areaChecksGotten[rcArea], areaCheckTotals[rcArea]);
UIWidgets::Tooltip("Accessible / Checked / Total");
} }
} else { } else {
ImGui::Text("???"); ImGui::Text("???");
@ -1544,10 +1561,18 @@ void DrawLocation(RandomizerCheck rc) {
OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(false); OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(false);
areaChecksGotten[loc->GetArea()]--; areaChecksGotten[loc->GetArea()]--;
totalChecksGotten--; totalChecksGotten--;
if (itemLoc->IsAccessible()) {
areaChecksAccessible[loc->GetArea()]++;
totalChecksAccessible++;
}
} else { } else {
OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(true); OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->SetIsSkipped(true);
areaChecksGotten[loc->GetArea()]++; areaChecksGotten[loc->GetArea()]++;
totalChecksGotten++; totalChecksGotten++;
if (itemLoc->IsAccessible()) {
areaChecksAccessible[loc->GetArea()]--;
totalChecksAccessible--;
}
} }
UpdateOrdering(loc->GetArea()); UpdateOrdering(loc->GetArea());
UpdateInventoryChecks(); UpdateInventoryChecks();
@ -1747,8 +1772,20 @@ void RecalculateAccessibleChecks() {
itemLocation->SetAccessible(true); itemLocation->SetAccessible(true);
} }
totalChecksAccessible = 0;
for (auto& [rcArea, vec] : checksByArea) {
areaChecksAccessible[rcArea] = 0;
for (auto& rc : vec) {
Rando::ItemLocation* itemLocation = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
if (itemLocation->IsAccessible() && !itemLocation->GetIsSkipped() && !itemLocation->HasObtained() && IsVisibleInCheckTracker(rc)) {
areaChecksAccessible[rcArea]++;
}
}
totalChecksAccessible += areaChecksAccessible[rcArea];
}
StopPerformanceTimer(PT_RECALCULATE_ACCESSIBLE_CHECKS); StopPerformanceTimer(PT_RECALCULATE_ACCESSIBLE_CHECKS);
SPDLOG_DEBUG("Recalculate Accessible Checks Time: {}ms", GetPerformanceTimer(PT_RECALCULATE_ACCESSIBLE_CHECKS).count()); SPDLOG_INFO("Recalculate Accessible Checks Time: {}ms", GetPerformanceTimer(PT_RECALCULATE_ACCESSIBLE_CHECKS).count());
} }