Skip to content

Commit

Permalink
Fix tricks menu (HarbourMasters#4278)
Browse files Browse the repository at this point in the history 
* Fix tricks not getting disabled by button click.

* Fix area trees not collapsing on enabled side of tricks list.

* Fix difficulty tag button order for Linux.

* Fix Collapse All, Open All, and Disable All.
Prevent Disable All from disabling all despite areas being collapsed.
  • Loading branch information
@Malkierian
Malkierian authored Aug 15, 2024
1 parent 9ceb557 commit bfba2a1
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 36 deletions.
57 changes: 23 additions & 34 deletions soh/soh/Enhancements/randomizer/randomizer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2169,7 +2169,7 @@ void RandomizerSettingsWindow::DrawElement() {
{RA_GANONS_CASTLE, true}
};

static std::unordered_map<Rando::Tricks::Tag, bool> showTag {
static std::map<Rando::Tricks::Tag, bool> showTag {
{Rando::Tricks::Tag::NOVICE,true},
{Rando::Tricks::Tag::INTERMEDIATE,true},
{Rando::Tricks::Tag::ADVANCED,true},
Expand Down Expand Up @@ -2236,22 +2236,14 @@ void RandomizerSettingsWindow::DrawElement() {
window->DC.CurrLineTextBaseOffset = 0.0f;

if (ImGui::Button("Collapse All##disabled")) {
for (int i = 0; i < RT_MAX; i++) {
auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
if (!option.IsHidden() && !enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
!option.IsGlitch()) {
areaTreeDisabled[option.GetArea()] = false;
}
for (int i = 0; i < RA_MAX; i++) {
areaTreeDisabled[static_cast<RandomizerArea>(i)] = false;
}
}
ImGui::SameLine();
if (ImGui::Button("Open All##disabled")) {
for (int i = 0; i < RT_MAX; i++) {
auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
if (option.IsHidden() && !enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
!option.IsGlitch()) {
areaTreeDisabled[option.GetArea()] = false;
}
for (int i = 0; i < RA_MAX; i++) {
areaTreeDisabled[static_cast<RandomizerArea>(i)] = true;
}
}
ImGui::SameLine();
Expand Down Expand Up @@ -2288,15 +2280,15 @@ void RandomizerSettingsWindow::DrawElement() {
}
}
if (hasTricks) {
ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(area).c_str()), areaTreeDisabled[area]);
ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetRTAreaName(area) + "##disabled").c_str()), areaTreeDisabled[area]);
ImGui::SetNextItemOpen(true, ImGuiCond_Once);
if (ImGui::TreeNode(Rando::Tricks::GetRTAreaName(area).c_str())) {
if (ImGui::TreeNode((Rando::Tricks::GetRTAreaName(area) + "##disabled").c_str())) {
for (auto rt : trickIds) {
auto option = mSettings->GetTrickOption(rt);
if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
!enabledTricks.count(rt) && Rando::Tricks::CheckRTTags(showTag, option.GetTags()) &&
!option.IsGlitch()) {
ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(option.GetArea()).c_str()), areaTreeDisabled[option.GetArea()]);
ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetRTAreaName(option.GetArea()) + "##disabled").c_str()), areaTreeDisabled[option.GetArea()]);
ImGui::SetNextItemOpen(true, ImGuiCond_Once);
if (ImGui::ArrowButton(std::to_string(rt).c_str(), ImGuiDir_Right)) {
enabledTricks.insert(rt);
Expand Down Expand Up @@ -2329,23 +2321,16 @@ void RandomizerSettingsWindow::DrawElement() {
ImGui::TableNextColumn();
window->DC.CurrLineTextBaseOffset = 0.0f;


if (ImGui::Button("Collapse All##enabled")) {
for (int i = 0; i < RT_MAX; i++) {
auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
if (!option.IsHidden() && enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
!option.IsGlitch()) {
areaTreeDisabled[option.GetArea()] = false;
}
for (int i = 0; i < RA_MAX; i++) {
areaTreeEnabled[static_cast<RandomizerArea>(i)] = false;
}
}
ImGui::SameLine();
if (ImGui::Button("Open All##enabled")) {
for (int i = 0; i < RT_MAX; i++) {
auto option = mSettings->GetTrickOption(static_cast<RandomizerTrick>(i));
if (option.IsHidden() && enabledTricks.count(static_cast<RandomizerTrick>(i)) &&
!option.IsGlitch()) {
areaTreeDisabled[option.GetArea()] = false;
}
for (int i = 0; i < RA_MAX; i++) {
areaTreeEnabled[static_cast<RandomizerArea>(i)] = true;
}
}
ImGui::SameLine();
Expand All @@ -2356,15 +2341,19 @@ void RandomizerSettingsWindow::DrawElement() {
trickSearch.PassFilter(option.GetName().c_str()) &&
areaTreeEnabled[option.GetArea()] &&
Rando::Tricks::CheckRTTags(showTag, option.GetTags())) {
enabledTricks.insert(static_cast<RandomizerTrick>(i));
enabledTricks.erase(static_cast<RandomizerTrick>(i));
}
}
std::string enabledTrickString = "";
for (auto enabledTrickIt : enabledTricks) {
enabledTrickString += std::to_string(enabledTrickIt);
enabledTrickString += ",";
}
CVarClear(CVAR_RANDOMIZER_SETTING("EnabledTricks"));
if (enabledTricks.size() == 0) {
CVarClear(CVAR_RANDOMIZER_SETTING("EnabledTricks"));
} else {
CVarSetString(CVAR_RANDOMIZER_SETTING("EnabledTricks"), enabledTrickString.c_str());
}
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
}

Expand All @@ -2382,18 +2371,18 @@ void RandomizerSettingsWindow::DrawElement() {
}
}
if (hasTricks) {
ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(area).c_str()), areaTreeDisabled[area]);
ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetRTAreaName(area) + "##enabled").c_str()), areaTreeEnabled[area]);
ImGui::SetNextItemOpen(true, ImGuiCond_Once);
if (ImGui::TreeNode(Rando::Tricks::GetRTAreaName(area).c_str())) {
if (ImGui::TreeNode((Rando::Tricks::GetRTAreaName(area) + "##enabled").c_str())) {
for (auto rt : trickIds) {
auto option = mSettings->GetTrickOption(rt);
if (!option.IsHidden() && trickSearch.PassFilter(option.GetName().c_str()) &&
enabledTricks.count(rt) && Rando::Tricks::CheckRTTags(showTag, option.GetTags()) &&
!option.IsGlitch()) {
ImGui::TreeNodeSetOpen(ImGui::GetID(Rando::Tricks::GetRTAreaName(option.GetArea()).c_str()), areaTreeDisabled[option.GetArea()]);
ImGui::TreeNodeSetOpen(ImGui::GetID((Rando::Tricks::GetRTAreaName(option.GetArea()) + "##enabled").c_str()), areaTreeEnabled[option.GetArea()]);
ImGui::SetNextItemOpen(true, ImGuiCond_Once);
if (ImGui::ArrowButton(std::to_string(rt).c_str(), ImGuiDir_Left)) {
enabledTricks.insert(rt);
enabledTricks.erase(rt);
std::string enabledTrickString = "";
for (auto enabledTrickIt : enabledTricks) {
enabledTrickString += std::to_string(enabledTrickIt);
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/randomizer/tricks.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Rando {
return rtAreaNames.at(area);
}

bool Tricks::CheckRTTags(const std::unordered_map<Tag, bool> &showTag, const std::set<Tag> &rtTags) {
bool Tricks::CheckRTTags(const std::map<Tag, bool> &showTag, const std::set<Tag> &rtTags) {
if (rtTags.empty()) {
return false;
}
Expand Down
3 changes: 2 additions & 1 deletion soh/soh/Enhancements/randomizer/tricks.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "randomizerTypes.h"

#include <unordered_map>
#include <map>
#include <string>


Expand All @@ -25,7 +26,7 @@ namespace Rando {
};

static const std::string& GetRTAreaName(RandomizerArea area);
static bool CheckRTTags(const std::unordered_map<Tag, bool> &showTag, const std::set<Tag> &rtTags);
static bool CheckRTTags(const std::map<Tag, bool> &showTag, const std::set<Tag> &rtTags);
static std::string GetRTTagName(Tag tag);
static ImVec4 GetRTTagColor(Tag tag);
static void DrawTagChips(const std::set<Tag> &rtTags);
Expand Down

0 comments on commit bfba2a1

Please sign in to comment.