mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-01-13 15:08:03 -05:00
Initial work for keysanity
This commit is contained in:
parent
2d22099805
commit
e9d1bf2d56
@ -2542,6 +2542,9 @@ namespace Settings {
|
|||||||
ItemPoolValue.SetSelectedIndex(cvarSettings[RSK_ITEM_POOL]);
|
ItemPoolValue.SetSelectedIndex(cvarSettings[RSK_ITEM_POOL]);
|
||||||
IceTrapValue.SetSelectedIndex(cvarSettings[RSK_ICE_TRAPS]);
|
IceTrapValue.SetSelectedIndex(cvarSettings[RSK_ICE_TRAPS]);
|
||||||
|
|
||||||
|
Keysanity.SetSelectedIndex(cvarSettings[RSK_KEYSANITY]);
|
||||||
|
GerudoKeys.SetSelectedIndex(cvarSettings[RSK_GERUDO_KEYS]);
|
||||||
|
BossKeysanity.SetSelectedIndex(cvarSettings[RSK_BOSS_KEYSANITY]);
|
||||||
GanonsBossKey.SetSelectedIndex(cvarSettings[RSK_GANONS_BOSS_KEY]);
|
GanonsBossKey.SetSelectedIndex(cvarSettings[RSK_GANONS_BOSS_KEY]);
|
||||||
|
|
||||||
NumRequiredCuccos.SetSelectedIndex(cvarSettings[RSK_CUCCO_COUNT]);
|
NumRequiredCuccos.SetSelectedIndex(cvarSettings[RSK_CUCCO_COUNT]);
|
||||||
|
@ -3450,6 +3450,9 @@ void GenerateRandomizerImgui() {
|
|||||||
cvarSettings[RSK_GOSSIP_STONE_HINTS] = CVar_GetS32("gRandomizeGossipStoneHints", 1);
|
cvarSettings[RSK_GOSSIP_STONE_HINTS] = CVar_GetS32("gRandomizeGossipStoneHints", 1);
|
||||||
cvarSettings[RSK_HINT_CLARITY] = CVar_GetS32("gRandomizeHintClarity", 2);
|
cvarSettings[RSK_HINT_CLARITY] = CVar_GetS32("gRandomizeHintClarity", 2);
|
||||||
cvarSettings[RSK_HINT_DISTRIBUTION] = CVar_GetS32("gRandomizeHintDistribution", 1);
|
cvarSettings[RSK_HINT_DISTRIBUTION] = CVar_GetS32("gRandomizeHintDistribution", 1);
|
||||||
|
cvarSettings[RSK_KEYSANITY] = CVar_GetS32("gRandomizeKeysanity", 0);
|
||||||
|
cvarSettings[RSK_GERUDO_KEYS] = CVar_GetS32("gRandomizeGerudoKeys", 0);
|
||||||
|
cvarSettings[RSK_BOSS_KEYSANITY] = CVar_GetS32("gRandomizeBossKeysanity", 0);
|
||||||
cvarSettings[RSK_GANONS_BOSS_KEY] = CVar_GetS32("gRandomizeShuffleGanonBossKey", 0);
|
cvarSettings[RSK_GANONS_BOSS_KEY] = CVar_GetS32("gRandomizeShuffleGanonBossKey", 0);
|
||||||
cvarSettings[RSK_STARTING_CONSUMABLES] = CVar_GetS32("gRandomizeStartingConsumables", 0);
|
cvarSettings[RSK_STARTING_CONSUMABLES] = CVar_GetS32("gRandomizeStartingConsumables", 0);
|
||||||
cvarSettings[RSK_FULL_WALLETS] = CVar_GetS32("gRandomizeFullWallets", 0);
|
cvarSettings[RSK_FULL_WALLETS] = CVar_GetS32("gRandomizeFullWallets", 0);
|
||||||
@ -3540,11 +3543,9 @@ void DrawRandoEditor(bool& open) {
|
|||||||
// Shuffle Dungeon Items Settings
|
// Shuffle Dungeon Items Settings
|
||||||
const char* randoShuffleMapsAndCompasses[6] = { "Own Dungeon", "Any Dungeon", "Overworld",
|
const char* randoShuffleMapsAndCompasses[6] = { "Own Dungeon", "Any Dungeon", "Overworld",
|
||||||
"Anywhere", "Start with", "Vanilla" };
|
"Anywhere", "Start with", "Vanilla" };
|
||||||
const char* randoShuffleSmallKeys[6] = { "Own Dungeon", "Any Dungeon", "Overworld",
|
const char* randoShuffleSmallKeys[6] = { "Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere" };
|
||||||
"Anywhere", "Start with", "Vanilla" };
|
|
||||||
const char* randoShuffleGerudoFortressKeys[4] = { "Vanilla", "Any Dungeon", "Overworld", "Anywhere" };
|
const char* randoShuffleGerudoFortressKeys[4] = { "Vanilla", "Any Dungeon", "Overworld", "Anywhere" };
|
||||||
const char* randoShuffleBossKeys[6] = { "Own Dungeon", "Any Dungeon", "Overworld",
|
const char* randoShuffleBossKeys[6] = { "Start With", "Vanilla", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere" };
|
||||||
"Anywhere", "Start with", "Vanilla" };
|
|
||||||
// const char* randoShuffleGanonsBossKey[12] = { "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere",
|
// const char* randoShuffleGanonsBossKey[12] = { "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere",
|
||||||
// "LACS Vanilla", "LACS Medallions", "LACS Stones", "LACS Rewards",
|
// "LACS Vanilla", "LACS Medallions", "LACS Stones", "LACS Rewards",
|
||||||
// "LACS Dungeons", "LACS Tokens", "Start with", "Vanilla" };
|
// "LACS Dungeons", "LACS Tokens", "Start with", "Vanilla" };
|
||||||
@ -4042,6 +4043,46 @@ void DrawRandoEditor(bool& open) {
|
|||||||
SohImGui::EnhancementCombobox("gRandomizeShuffleDungeonReward", randoShuffleDungeonRewards, 4, 0);
|
SohImGui::EnhancementCombobox("gRandomizeShuffleDungeonReward", randoShuffleDungeonRewards, 4, 0);
|
||||||
PaddedSeparator();
|
PaddedSeparator();
|
||||||
|
|
||||||
|
// Keysanity
|
||||||
|
ImGui::Text(Settings::Keysanity.GetName().c_str());
|
||||||
|
InsertHelpHoverText(
|
||||||
|
"Own dungeon - Small Keys can only appear in their respective dungeon.\n"
|
||||||
|
"\n"
|
||||||
|
"Any dungeon - Small Keys can only appear inside of any dungon.\n"
|
||||||
|
"\n"
|
||||||
|
"Overworld - Small Keys can only appear outside of dungeons.\n"
|
||||||
|
"\n"
|
||||||
|
"Anywhere - Small Keys can appear anywhere in the world."
|
||||||
|
);
|
||||||
|
SohImGui::EnhancementCombobox("gRandomizeKeysanity", randoShuffleSmallKeys, 6, 0);
|
||||||
|
PaddedSeparator();
|
||||||
|
|
||||||
|
// Gerudo Keys
|
||||||
|
ImGui::Text(Settings::GerudoKeys.GetName().c_str());
|
||||||
|
InsertHelpHoverText(
|
||||||
|
"Any dungeon - Small Keys can only appear inside of any dungon.\n"
|
||||||
|
"\n"
|
||||||
|
"Overworld - Small Keys can only appear outside of dungeons.\n"
|
||||||
|
"\n"
|
||||||
|
"Anywhere - Small Keys can appear anywhere in the world."
|
||||||
|
);
|
||||||
|
SohImGui::EnhancementCombobox("gRandomizeGerudoKeys", randoShuffleGerudoFortressKeys, 4, 0);
|
||||||
|
PaddedSeparator();
|
||||||
|
|
||||||
|
// Boss Keysanity
|
||||||
|
ImGui::Text(Settings::BossKeysanity.GetName().c_str());
|
||||||
|
InsertHelpHoverText(
|
||||||
|
"Own dungeon - Boss Keys can only appear in their respective dungeon.\n"
|
||||||
|
"\n"
|
||||||
|
"Any dungeon - Boss Keys can only appear inside of any dungon.\n"
|
||||||
|
"\n"
|
||||||
|
"Overworld - Boss Keys can only appear outside of dungeons.\n"
|
||||||
|
"\n"
|
||||||
|
"Anywhere - Boss Keys can appear anywhere in the world."
|
||||||
|
);
|
||||||
|
SohImGui::EnhancementCombobox("gRandomizeBossKeysanity", randoShuffleBossKeys, 6, 0);
|
||||||
|
PaddedSeparator();
|
||||||
|
|
||||||
// RANDOTODO implement ganon's boss key outside of ganon's castle
|
// RANDOTODO implement ganon's boss key outside of ganon's castle
|
||||||
// Ganon's Boss Key
|
// Ganon's Boss Key
|
||||||
ImGui::Text(Settings::GanonsBossKey.GetName().c_str());
|
ImGui::Text(Settings::GanonsBossKey.GetName().c_str());
|
||||||
|
@ -982,6 +982,9 @@ typedef enum {
|
|||||||
RSK_GOSSIP_STONE_HINTS,
|
RSK_GOSSIP_STONE_HINTS,
|
||||||
RSK_HINT_CLARITY,
|
RSK_HINT_CLARITY,
|
||||||
RSK_HINT_DISTRIBUTION,
|
RSK_HINT_DISTRIBUTION,
|
||||||
|
RSK_KEYSANITY,
|
||||||
|
RSK_GERUDO_KEYS,
|
||||||
|
RSK_BOSS_KEYSANITY,
|
||||||
RSK_GANONS_BOSS_KEY,
|
RSK_GANONS_BOSS_KEY,
|
||||||
RSK_SKIP_CHILD_STEALTH,
|
RSK_SKIP_CHILD_STEALTH,
|
||||||
RSK_SKIP_CHILD_ZELDA,
|
RSK_SKIP_CHILD_ZELDA,
|
||||||
|
Loading…
Reference in New Issue
Block a user