diff options
| author | Adam Bird <Archez@users.noreply.github.com> | 2022-12-12 22:36:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-12 22:36:50 -0500 |
| commit | d2a5f6a06cab34087a1f587169c7da6bd9647dcb (patch) | |
| tree | 6f74f2fd9651db8bbe2e20bc97d3c9989f116a81 | |
| parent | 389a3b17098d3748fa80aef8bad639796c66d23b (diff) | |
Add missing randomizer options to default preset (#2171)
* add all randomizer options to the default preset clear
* fix typo in randomizer menu
* remove enhancements from randomizer preset clear list
| -rw-r--r-- | soh/soh/Enhancements/presets.h | 47 | ||||
| -rw-r--r-- | soh/soh/Enhancements/randomizer/randomizer.cpp | 2 |
2 files changed, 44 insertions, 5 deletions
diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index ed848f58b..94b32656f 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -176,46 +176,81 @@ const std::vector<const char*> enhancementsCvars = { }; const std::vector<const char*> randomizerCvars = { - "gChestSizeAndTextureMatchesContents", - "gFastChests", - "gMMBunnyHood", + "gRandomizeAllLocationsReachable", "gRandomizeBigPoeTargetCount", "gRandomizeBlueFireArrows", + "gRandomizeBombchusInLogic", "gRandomizeBossKeysanity", "gRandomizeCompleteMaskQuest", "gRandomizeCuccosToReturn", + "gRandomizeDecoupleEntrances", "gRandomizeDoorOfTime", + "gRandomizeDungeonCount", "gRandomizeEnableBombchuDrops", "gRandomizeEnableGlitchCutscenes", "gRandomizeExcludedLocations", "gRandomizeForest", + "gRandomizeFullWallets", "gRandomizeGanonTrial", "gRandomizeGanonTrialCount", "gRandomizeGerudoFortress", "gRandomizeGerudoKeys", + "gRandomizeGossipStoneHints", "gRandomizeGsExpectSunsSong", + "gRandomizeHintClarity", + "gRandomizeHintDistribution", "gRandomizeIceTraps", "gRandomizeItemPool", "gRandomizeKakarikoGate", "gRandomizeKeysanity", + "gRandomizeLacsDungeonCount", + "gRandomizeLacsMedallionCount", + "gRandomizeLacsRewardCount", + "gRandomizeLacsStoneCount", + "gRandomizeLacsTokenCount", "gRandomizeLinksPocket", + "gRandomizeLogicRules", "gRandomizeMedallionCount", + "gRandomizeMixDungeons", + "gRandomizeMixedEntrances", + "gRandomizeMixGrottos", + "gRandomizeMixInteriors", + "gRandomizeMixOverworld", + "gRandomizeMqDungeonCount", "gRandomizeMqDungeons", "gRandomizeRainbowBridge", + "gRandomizeRewardCount", "gRandomizeShopsanity", "gRandomizeShuffleAdultTrade", "gRandomizeShuffleBeans", "gRandomizeShuffleCows", "gRandomizeShuffleDungeonReward", + "gRandomizeShuffleDungeonsEntrances", "gRandomizeShuffleFrogSongRupees", "gRandomizeShuffleGanonBossKey", "gRandomizeShuffleGerudoToken", + "gRandomizeShuffleGrottosEntrances", + "gRandomizeShuffleInteriorsEntrances", "gRandomizeShuffleKeyRings", + "gRandomizeShuffleKeyRingsBottomOfTheWell", + "gRandomizeShuffleKeyRingsFireTemple", + "gRandomizeShuffleKeyRingsForestTemple", + "gRandomizeShuffleKeyRingsGanonsCastle", + "gRandomizeShuffleKeyRingsGTG", + "gRandomizeShuffleKeyRingsRandomCount", + "gRandomizeShuffleKeyRingsShadowTemple", + "gRandomizeShuffleKeyRingsSpiritTemple", + "gRandomizeShuffleKeyRingsWaterTemple", "gRandomizeShuffleKokiriSword", + "gRandomizeShuffleMerchants", "gRandomizeShuffleOcarinas", + "gRandomizeShuffleOverworldEntrances", + "gRandomizeShuffleOverworldSpawns", + "gRandomizeShuffleOwlDrops", "gRandomizeShuffleScrubs", "gRandomizeShuffleSongs", "gRandomizeShuffleTokens", + "gRandomizeShuffleWarpSongs", "gRandomizeShuffleWeirdEgg", "gRandomizeSkipChildStealth", "gRandomizeSkipChildZelda", @@ -225,9 +260,13 @@ const std::vector<const char*> randomizerCvars = { "gRandomizeStartingAge", "gRandomizeStartingConsumables", "gRandomizeStartingDekuShield", - "gRandomizeStartingOcarina", + "gRandomizeStartingKokiriSword", "gRandomizeStartingMapsCompasses", + "gRandomizeStartingOcarina", + "gRandomizeStartingSkulltulaToken", + "gRandomizeStoneCount", "gRandomizeSunlightArrows", + "gRandomizeTokenCount", "gRandomizeZorasFountain", }; diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 7998a31df..1302ac4de 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -3211,7 +3211,7 @@ void DrawRandoEditor(bool& open) { if (CVar_GetS32("gRandomizeShuffleGrottosEntrances", RO_GENERIC_OFF)) { UIWidgets::Spacer(0); ImGui::SetCursorPosX(20); - UIWidgets::EnhancementCheckbox("Mix Grotts", "gRandomizeMixGrottos"); + UIWidgets::EnhancementCheckbox("Mix Grottos", "gRandomizeMixGrottos"); UIWidgets::InsertHelpHoverText("Grotto entrances will be part of the mixed pool"); } } |
