mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename columns, use excluded locations

This commit is contained in:
briaguya 2022-08-19 12:54:27 -04:00
parent c1455cedea
commit 3b951efac2
2 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
soh/soh/Enhancements/randomizer/3drando/settings.cpp
View File

@ -2496,6 +2496,17 @@ namespace Settings {
break; break;
} }
AddExcludedOptions();
for (auto locationKey : everyPossibleLocation) {
auto location = Location(locationKey);
if (excludedLocations.count(location->GetRandomizerCheck())) {
location->GetExcludedOption()->SetSelectedIndex(1);
} else {
location->GetExcludedOption()->SetSelectedIndex(0);
}
}
auto blarg = excludeLocationsOptionsVector.size();
OpenForest.SetSelectedIndex(cvarSettings[RSK_FOREST]); OpenForest.SetSelectedIndex(cvarSettings[RSK_FOREST]);
OpenKakariko.SetSelectedIndex(cvarSettings[RSK_KAK_GATE]); OpenKakariko.SetSelectedIndex(cvarSettings[RSK_KAK_GATE]);
ZorasFountain.SetSelectedIndex(cvarSettings[RSK_ZORAS_FOUNTAIN]); ZorasFountain.SetSelectedIndex(cvarSettings[RSK_ZORAS_FOUNTAIN]);
@ -2581,31 +2592,6 @@ namespace Settings {
// RANDOTODO implement chest shuffle with keysanity // RANDOTODO implement chest shuffle with keysanity
// ShuffleChestMinigame.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME]); // ShuffleChestMinigame.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME]);
AddExcludedOptions();
for (size_t i = 1; i < Settings::excludeLocationsOptionsVector.size(); i++) {
for (const auto& location : Settings::excludeLocationsOptionsVector[i]) {
// RANDOTODO implement the ability to exclude any location
if (location->GetName() == "Deku Theater Mask of\n Truth") {
location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_DEKU_THEATER_MASK_OF_TRUTH]);
}
if (location->GetName() == "Kak 10 Gold Skulltula\n Reward") {
location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_10_GOLD_SKULLTULA_REWARD]);
}
if (location->GetName() == "Kak 20 Gold Skulltula\n Reward") {
location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_20_GOLD_SKULLTULA_REWARD]);
}
if (location->GetName() == "Kak 30 Gold Skulltula\n Reward") {
location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_30_GOLD_SKULLTULA_REWARD]);
}
if (location->GetName() == "Kak 40 Gold Skulltula\n Reward") {
location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_40_GOLD_SKULLTULA_REWARD]);
}
if (location->GetName() == "Kak 50 Gold Skulltula\n Reward") {
location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_50_GOLD_SKULLTULA_REWARD]);
}
}
}
RandomizeAllSettings(true); //now select any random options instead of just hiding them RandomizeAllSettings(true); //now select any random options instead of just hiding them

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

@ -3748,21 +3748,21 @@ void DrawRandoEditor(bool& open) {
if (ImGui::BeginTable("tableRandoLocations", 2, if (ImGui::BeginTable("tableRandoLocations", 2,
ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) { ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
ImGui::TableSetupColumn("Randomized", ImGuiTableColumnFlags_WidthStretch, 200.0f); ImGui::TableSetupColumn("Included", ImGuiTableColumnFlags_WidthStretch, 200.0f);
ImGui::TableSetupColumn("Vanilla", ImGuiTableColumnFlags_WidthStretch, 200.0f); ImGui::TableSetupColumn("Excluded", ImGuiTableColumnFlags_WidthStretch, 200.0f);
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true); ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
ImGui::TableHeadersRow(); ImGui::TableHeadersRow();
ImGui::PopItemFlag(); ImGui::PopItemFlag();
ImGui::TableNextRow(); ImGui::TableNextRow();
// COLUMN 1 - RANDOMIZED LOCATIONS // COLUMN 1 - INCLUDED LOCATIONS
ImGui::TableNextColumn(); ImGui::TableNextColumn();
window->DC.CurrLineTextBaseOffset = 0.0f; window->DC.CurrLineTextBaseOffset = 0.0f;
static ImGuiTextFilter locationSearch; static ImGuiTextFilter locationSearch;
locationSearch.Draw(); locationSearch.Draw();
ImGui::BeginChild("ChildRandomizedLocations", ImVec2(0, -8)); ImGui::BeginChild("ChildIncludedLocations", ImVec2(0, -8));
for (auto areaIt : RandomizerCheckObjects::GetAllRCObjects()) { for (auto areaIt : RandomizerCheckObjects::GetAllRCObjects()) {
bool hasItems = false; bool hasItems = false;
for (auto locationIt : areaIt.second) { for (auto locationIt : areaIt.second) {
@ -3804,11 +3804,11 @@ void DrawRandoEditor(bool& open) {
} }
ImGui::EndChild(); ImGui::EndChild();
// COLUMN 2 - VANILLA LOCATIONS // COLUMN 2 - EXCLUDED LOCATIONS
ImGui::TableNextColumn(); ImGui::TableNextColumn();
window->DC.CurrLineTextBaseOffset = 0.0f; window->DC.CurrLineTextBaseOffset = 0.0f;
ImGui::BeginChild("ChildVanillaLocations", ImVec2(0, -8)); ImGui::BeginChild("ChildExcludedLocations", ImVec2(0, -8));
for (auto areaIt : RandomizerCheckObjects::GetAllRCObjects()) { for (auto areaIt : RandomizerCheckObjects::GetAllRCObjects()) {
bool hasItems = false; bool hasItems = false;
for (auto locationIt : areaIt.second) { for (auto locationIt : areaIt.second) {