mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-27 23:45:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

add ability to toggle tracker in rmlui (hack for now), show area remaining checks, misc debugging info

Browse Source
This commit is contained in:
CraftyBoss
2026-05-22 22:49:44 -07:00
parent 3d2c5633cd
commit ffa1fd5da4
5 changed files with 103 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/imgui/ImGuiMenuRandomizer.cpp
+46 -9
View File
@@ -14,6 +14,9 @@
#include <thread>
#include <filesystem>
#include "dusk/map_loader_definitions.h"
#include "dusk/randomizer/generator/utility/string.hpp"
namespace dusk {
static bool generatingSeed = false;
@@ -32,6 +35,19 @@ namespace dusk {
DuskLog.debug("{}", generationStatusMsg);
}
static const char* lookup_map_name(const char* mapFile) {
if (!mapFile || mapFile[0] == '\0')
return nullptr;
for (const auto& region : gameRegions) {
for (const auto& map : region.maps) {
if (map.mapFile && strcmp(mapFile, map.mapFile) == 0) {
return map.mapName;
}
}
}
return nullptr;
}
ImGuiMenuRandomizer::ImGuiMenuRandomizer() {}
void ImGuiMenuRandomizer::draw() {
@@ -140,7 +156,7 @@ namespace dusk {
}
ImGui::Checkbox("Show Rando Stats", &m_showRandoStats);
ImGui::Checkbox("Show Rando Tracker", &m_showRandoTracker);
ImGui::Checkbox("Show Rando Tracker", &g_randomizerState.mShowTracker);
ImGui::EndMenu();
}
@@ -209,7 +225,7 @@ namespace dusk {
void ImGuiMenuRandomizer::windowRandoTracker() {
if (!m_showRandoTracker) {
if (!g_randomizerState.mShowTracker) {
return;
}
@@ -244,6 +260,13 @@ namespace dusk {
ImGui::Text("Load a seed and start a file to activate the tracker");
} else {
ImGui::Text("Tracker world loaded from seed %s", trackerRando->GetConfig().GetHash().c_str());
const char* curStage = dComIfGp_getStartStageName();
ImGui::Text("Current Stage: %s (%s)", lookup_map_name(curStage), curStage);
auto stageInfo = dComIfGp_getStageStagInfo();
if (stageInfo && dStage_stagInfo_GetSaveTbl(stageInfo) != getStageSaveId(curStage)) {
ImGui::TextColored(ImVec4(1.0f, 0.0f,0.0f,1.0f), "Error: Current Stage Save Tbl mismatch!");
}
ImGui::Checkbox("Show Only Accessible Locations", &m_onlyAccessible);
ImGui::Checkbox("Show Location Requirements", &m_showRequirements);
@@ -260,14 +283,15 @@ namespace dusk {
std::string filter = m_locationFilter;
// Show all locations. Green for accessible. Red for Unaccessible
for (const auto& [areaName, location] : m_LocationInfo) {
if (m_onlyAccessible && !location.anyAccessible)
if (m_onlyAccessible && !location.showArea)
continue;
if (!location.anyAccessible) {
if (!location.showArea) {
ImGui::BeginDisabled();
}
if (ImGui::TreeNode(areaName.c_str())) {
int areaCount = m_onlyAccessible ? location.accessibleCount : location.locations.size();
if (ImGui::TreeNode(fmt::format("{} ({}/{})", areaName, areaCount - location.collectedCount, areaCount).c_str())) {
for (const auto& info : location.locations) {
// Don't show any locations which aren't accessible if only accessible is checked
// Don't show any locations which don't meet the filter
@@ -297,7 +321,7 @@ namespace dusk {
ImGui::TreePop();
}
if (!location.anyAccessible) {
if (!location.showArea) {
ImGui::EndDisabled();
}
}
@@ -350,10 +374,17 @@ namespace dusk {
} else if (auto& poeNode = locationMeta["Poe"]) {
auto flag = poeNode[0]["Flag"].as<u8>();
auto stageId = getStageSaveId(poeNode[0]["Stage"].as<u8>());
info.collected = dComIfGs_isStageSwitch(stageId, flag);
info.collected = tracker_isStageSwitch(stageId, flag);
} else if (auto& freeStandingItemNode = locationMeta["Freestanding Item"]) {
auto flag = freeStandingItemNode[0]["Flag"].as<u8>();
auto stageId = getStageSaveId(freeStandingItemNode[0]["Stage"].as<u8>());
info.collected = tracker_isStageSwitch(stageId, flag);
} else if (auto& eventFlagNode = locationMeta["Event Flag"]) {
auto flag = eventFlagNode.as<u16>();
info.collected = tracker_isEventBit(flag);
} else if (auto& wolfNode = locationMeta["Golden Wolf"]) {
auto flag = wolfNode[0]["Flag"].as<u16>();
info.collected = tracker_isEventBit(flag);
} else if (auto& switchFlagNode = locationMeta["Switch Flag"]) {
auto flag = switchFlagNode["Flag"].as<u8>();
auto stageId = getStageSaveId(switchFlagNode["Stage"].as<u8>());
@@ -372,9 +403,15 @@ namespace dusk {
for (const auto& region : regions) {
auto& infoGroup = m_LocationInfo[region];
if (!infoGroup.anyAccessible && info.accessible) {
infoGroup.anyAccessible = true;
if (!infoGroup.showArea && info.accessible && !info.collected) {
infoGroup.showArea = true;
}
if (info.collected)
infoGroup.collectedCount++;
if (info.accessible)
infoGroup.accessibleCount++;
infoGroup.locations.push_back(info);
}
}
src/dusk/imgui/ImGuiMenuRandomizer.hpp
+3 -2
View File
@@ -32,12 +32,13 @@ private:
struct TrackerAreaGroup {
std::vector<LocationTrackerInfo> locations;
bool anyAccessible;
bool showArea;
int collectedCount;
int accessibleCount;
};
bool m_showRandoStats{false};
bool m_showRandoGeneration{false};
bool m_showRandoTracker{false};
bool m_onlyAccessible{false};
bool m_showRequirements{false};
src/dusk/randomizer/game/randomizer_context.hpp
+1
View File
@@ -182,6 +182,7 @@ public:
int mFoolishItemCount{0};
bool mUpdateTracker{false};
bool mShowTracker{false};
u16 mTrackerTempEventFlag{0};
struct {
int stage{-1};
src/dusk/randomizer/generator/data/locations.yaml
+49
View File
@@ -56,6 +56,7 @@
Shop:
- Stage: 65
Item: 0x4B
Event Flag: 0x4902
- Name: Ordon Shield
Original Item: Ordon Shield
@@ -637,6 +638,7 @@
Sky Character:
- Stage: 45
Room: 8
Event Flag: 0x6080
- Name: Faron Woods Owl Statue Chest
Original Item: Piece of Heart
@@ -1090,6 +1092,7 @@
Sky Character:
- Stage: 56
Room: 3
Event Flag: 0x6020
- Name: Kakariko Gorge Owl Statue Boulder Rupee
Original Item: Yellow Rupee
@@ -1287,6 +1290,9 @@
Shop:
- Stage: 68
Item: 0x3E
Switch Flag:
Stage: 68
Flag: 0x33
- Name: Kakariko Village Malo Mart Hylian Shield
Original Item: Hylian Shield
@@ -1298,6 +1304,9 @@
Shop:
- Stage: 68
Item: 0x2C
Switch Flag:
Stage: 68
Flag: 0x39
- Name: Kakariko Village Malo Mart Red Potion
Original Item: Red Potion Shop
@@ -1309,6 +1318,9 @@
Shop:
- Stage: 68
Item: 0x61
Switch Flag:
Stage: 68
Flag: 0x4
- Name: Kakariko Village Malo Mart Wooden Shield
Original Item: Wooden Shield
@@ -1320,6 +1332,9 @@
Shop:
- Stage: 68
Item: 0x2B
Switch Flag:
Stage: 68
Flag: 0x5
- Name: Kakariko Inn Chest
Original Item: Red Rupee
@@ -1366,6 +1381,7 @@
Shop:
- Stage: 68
Item: 0x50
Event Flag: 0x0908
- Name: Kakariko Village Bomb Shop Poe
Original Item: Poe Soul
@@ -1745,6 +1761,7 @@
Sky Character:
- Stage: 56
Room: 0
Event Flag: 0x6010
- Name: Bridge of Eldin Boulder Rupee
Original Item: Red Rupee
@@ -2280,6 +2297,9 @@
Sky Character:
- Stage: 57
Room: 8
Switch Flag:
Stage: 57
Flag: 0x57
- Name: Hyrule Field Amphitheater Poe
Original Item: Poe Soul
@@ -2339,6 +2359,9 @@
Shop:
- Stage: 73
Item: 0x30
Switch Flag:
Stage: 73
Flag: 0x2B
# HD Only location
# - Name: Castle Town Malo Mart Stamp
@@ -2450,6 +2473,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC0
Event Flag: 0x3110
- Name: Agitha Female Beetle Reward
Original Item: Purple Rupee
@@ -2460,6 +2484,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC1
Event Flag: 0x3108
- Name: Agitha Male Butterfly Reward
Original Item: Orange Rupee
@@ -2470,6 +2495,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC2
Event Flag: 0x3104
- Name: Agitha Female Butterfly Reward
Original Item: Purple Rupee
@@ -2480,6 +2506,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC3
Event Flag: 0x3102
- Name: Agitha Male Stag Beetle Reward
Original Item: Purple Rupee
@@ -2490,6 +2517,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC4
Event Flag: 0x3101
- Name: Agitha Female Stag Beetle Reward
Original Item: Orange Rupee
@@ -2500,6 +2528,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC5
Event Flag: 0x3280
- Name: Agitha Male Grasshopper Reward
Original Item: Progressive Wallet
@@ -2510,6 +2539,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC6
Event Flag: 0x3240
- Name: Agitha Female Grasshopper Reward
Original Item: Orange Rupee
@@ -2520,6 +2550,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC7
Event Flag: 0x3220
- Name: Agitha Male Phasmid Reward
Original Item: Progressive Wallet
@@ -2530,6 +2561,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC8
Event Flag: 0x3210
- Name: Agitha Female Phasmid Reward
Original Item: Orange Rupee
@@ -2540,6 +2572,7 @@
Metadata:
Bug Reward:
- Item Id: 0xC9
Event Flag: 0x3208
- Name: Agitha Male Pill Bug Reward
Original Item: Orange Rupee
@@ -2550,6 +2583,7 @@
Metadata:
Bug Reward:
- Item Id: 0xCA
Event Flag: 0x3204
- Name: Agitha Female Pill Bug Reward
Original Item: Purple Rupee
@@ -2560,6 +2594,7 @@
Metadata:
Bug Reward:
- Item Id: 0xCB
Event Flag: 0x3202
- Name: Agitha Male Mantis Reward
Original Item: Purple Rupee
@@ -2570,6 +2605,7 @@
Metadata:
Bug Reward:
- Item Id: 0xCC
Event Flag: 0x3201
- Name: Agitha Female Mantis Reward
Original Item: Orange Rupee
@@ -2580,6 +2616,7 @@
Metadata:
Bug Reward:
- Item Id: 0xCD
Event Flag: 0x3380
- Name: Agitha Male Ladybug Reward
Original Item: Purple Rupee
@@ -2590,6 +2627,7 @@
Metadata:
Bug Reward:
- Item Id: 0xCE
Event Flag: 0x3340
- Name: Agitha Female Ladybug Reward
Original Item: Orange Rupee
@@ -2600,6 +2638,7 @@
Metadata:
Bug Reward:
- Item Id: 0xCF
Event Flag: 0x3320
- Name: Agitha Male Snail Reward
Original Item: Purple Rupee
@@ -2610,6 +2649,7 @@
Metadata:
Bug Reward:
- Item Id: 0xD0
Event Flag: 0x3310
- Name: Agitha Female Snail Reward
Original Item: Purple Rupee
@@ -2620,6 +2660,7 @@
Metadata:
Bug Reward:
- Item Id: 0xD1
Event Flag: 0x3308
- Name: Agitha Male Dragonfly Reward
Original Item: Purple Rupee
@@ -2630,6 +2671,7 @@
Metadata:
Bug Reward:
- Item Id: 0xD2
Event Flag: 0x3304
- Name: Agitha Female Dragonfly Reward
Original Item: Orange Rupee
@@ -2640,6 +2682,7 @@
Metadata:
Bug Reward:
- Item Id: 0xD3
Event Flag: 0x3302
- Name: Agitha Male Ant Reward
Original Item: Orange Rupee
@@ -2650,6 +2693,7 @@
Metadata:
Bug Reward:
- Item Id: 0xD4
Event Flag: 0x3301
- Name: Agitha Female Ant Reward
Original Item: Purple Rupee
@@ -2660,6 +2704,7 @@
Metadata:
Bug Reward:
- Item Id: 0xD5
Event Flag: 0x3480
- Name: Agitha Male Dayfly Reward
Original Item: Purple Rupee
@@ -2670,6 +2715,7 @@
Metadata:
Bug Reward:
- Item Id: 0xD6
Event Flag: 0x3440
- Name: Agitha Female Dayfly Reward
Original Item: Orange Rupee
@@ -2680,6 +2726,7 @@
Metadata:
Bug Reward:
- Item Id: 0xD7
Event Flag: 0x3420
# HD Only Location
# - Name: Agitha 12 Golden Bugs Reward
@@ -2825,6 +2872,7 @@
Sky Character:
- Stage: 56
Room: 13
Event Flag: 0x6008
- Name: Lake Hylia Bridge Owl Statue Boulder Rupee
Original Item: Blue Rupee
@@ -4301,6 +4349,7 @@
Sky Character:
- Stage: 59
Room: 0
Event Flag: 0x6040
- Name: Gerudo Desert Poe Above Cave of Ordeals
Original Item: Poe Soul
src/dusk/ui/rando_config.cpp
+4
View File
@@ -475,6 +475,10 @@ RandomizerWindow::RandomizerWindow() {
pane.clear();
pane.add_rml("Respawns the player at their appropriate starting location.");
});
leftPane.add_button("Toggle Tracker Window").on_pressed([] {
g_randomizerState.mShowTracker = !g_randomizerState.mShowTracker;
});
});
}
}