mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-08-13 17:03:47 -04:00
Code Issues Projects Releases Wiki Activity

refactor location visibility filtering

Browse Source
This commit is contained in:
briaguya 2022-08-18 14:11:22 -04:00
parent dd9acbbb43
commit 7fdb194dad
3 changed files with 775 additions and 753 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -3727,8 +3727,13 @@ void DrawRandoEditor(bool& open) {
ImGui::EndTabItem();
}
static bool locationsTabOpen = false;
if (ImGui::BeginTabItem("Locations")) {
ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
if (!locationsTabOpen) {
locationsTabOpen = true;
RandomizerCheckObjects::UpdateImGuiVisibility();
}
static ImGuiTextFilter locationSearch;
locationSearch.Draw();
@ -3751,17 +3756,8 @@ void DrawRandoEditor(bool& open) {
// todo fix this, it's hacky and copypasta
bool hasItems = false;
for (auto locationIt : RandomizerCheckObjects::GetAllRCObjects()) {
if (!excludedLocations.count(locationIt.second.rc) &&
locationIt.second.vOrMQ != RCVORMQ_MQ && //disable all MQ checks until we support them
locationIt.second.rcType != RCTYPE_SHOP && //disable shops until we have shopsanity
locationIt.second.rcType != RCTYPE_GOSSIP_STONE &&
locationIt.second.rcType != RCTYPE_LINKS_POCKET &&
locationIt.second.rcType != RCTYPE_CHEST_GAME &&
((locationIt.second.rcType != RCTYPE_SKULL_TOKEN) ||
(CVar_GetS32("gRandomizeShuffleTokens", 0) == 3) || // all tokens
((CVar_GetS32("gRandomizeShuffleTokens", 0) == 2) && RandomizerCheckObjects::AreaIsOverworld(areaIt.first)) || // overworld tokens
((CVar_GetS32("gRandomizeShuffleTokens", 0) == 1) && RandomizerCheckObjects::AreaIsDungeon(areaIt.first)) // dungeon tokens
) &&
if (locationIt.second.visibleInImgui &&
!excludedLocations.count(locationIt.second.rc) &&
locationIt.second.rcArea == areaIt.first &&
locationSearch.PassFilter(locationIt.second.rcSpoilerName.c_str())) {
@ -3775,16 +3771,7 @@ void DrawRandoEditor(bool& open) {
if (ImGui::TreeNode(areaIt.second.c_str())) {
for (auto locationIt : RandomizerCheckObjects::GetAllRCObjects()) {
if (!excludedLocations.count(locationIt.second.rc) &&
locationIt.second.vOrMQ != RCVORMQ_MQ && //disable all MQ checks until we support them
locationIt.second.rcType != RCTYPE_SHOP && //disable shops until we have shopsanity
locationIt.second.rcType != RCTYPE_GOSSIP_STONE &&
locationIt.second.rcType != RCTYPE_LINKS_POCKET &&
locationIt.second.rcType != RCTYPE_CHEST_GAME &&
((locationIt.second.rcType != RCTYPE_SKULL_TOKEN) ||
(CVar_GetS32("gRandomizeShuffleTokens", 0) == 3) || // all tokens
((CVar_GetS32("gRandomizeShuffleTokens", 0) == 2) && RandomizerCheckObjects::AreaIsOverworld(areaIt.first)) || // overworld tokens
((CVar_GetS32("gRandomizeShuffleTokens", 0) == 1) && RandomizerCheckObjects::AreaIsDungeon(areaIt.first)) // dungeon tokens
) &&
locationIt.second.visibleInImgui &&
locationIt.second.rcArea == areaIt.first &&
locationSearch.PassFilter(locationIt.second.rcSpoilerName.c_str())) {
@ -3823,6 +3810,8 @@ void DrawRandoEditor(bool& open) {
ImGui::PopStyleVar(1);
PaddedSeparator();
ImGui::EndTabItem();
} else {
locationsTabOpen = false;
}
if (ImGui::BeginTabItem("Tricks/Glitches")) {

1495
soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
View File

File diff suppressed because it is too large Load Diff

2
soh/soh/Enhancements/randomizer/randomizer_check_objects.h
View File

@ -68,6 +68,7 @@ typedef struct {
RandomizerCheckVanillaOrMQ vOrMQ;
RandomizerCheckType rcType;
RandomizerCheckArea rcArea;
bool visibleInImgui;
std::string rcShortName;
std::string rcSpoilerName;
} RandomizerCheckObject;
@ -77,5 +78,6 @@ namespace RandomizerCheckObjects {
bool AreaIsOverworld(RandomizerCheckArea area);
std::map<RandomizerCheckArea, std::string> GetAllRCAreas();
std::map<RandomizerCheck, RandomizerCheckObject> GetAllRCObjects();
void UpdateImGuiVisibility();
RandomizerCheckObject GetRCObject(RandomizerCheck check);
}