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
This commit is contained in:
Adam Bird 2022-12-12 22:36:50 -05:00 committed by GitHub
parent 389a3b1709
commit d2a5f6a06c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 5 deletions

View File

@ -176,46 +176,81 @@ const std::vector<const char*> enhancementsCvars = {
}; };
const std::vector<const char*> randomizerCvars = { const std::vector<const char*> randomizerCvars = {
"gChestSizeAndTextureMatchesContents", "gRandomizeAllLocationsReachable",
"gFastChests",
"gMMBunnyHood",
"gRandomizeBigPoeTargetCount", "gRandomizeBigPoeTargetCount",
"gRandomizeBlueFireArrows", "gRandomizeBlueFireArrows",
"gRandomizeBombchusInLogic",
"gRandomizeBossKeysanity", "gRandomizeBossKeysanity",
"gRandomizeCompleteMaskQuest", "gRandomizeCompleteMaskQuest",
"gRandomizeCuccosToReturn", "gRandomizeCuccosToReturn",
"gRandomizeDecoupleEntrances",
"gRandomizeDoorOfTime", "gRandomizeDoorOfTime",
"gRandomizeDungeonCount",
"gRandomizeEnableBombchuDrops", "gRandomizeEnableBombchuDrops",
"gRandomizeEnableGlitchCutscenes", "gRandomizeEnableGlitchCutscenes",
"gRandomizeExcludedLocations", "gRandomizeExcludedLocations",
"gRandomizeForest", "gRandomizeForest",
"gRandomizeFullWallets",
"gRandomizeGanonTrial", "gRandomizeGanonTrial",
"gRandomizeGanonTrialCount", "gRandomizeGanonTrialCount",
"gRandomizeGerudoFortress", "gRandomizeGerudoFortress",
"gRandomizeGerudoKeys", "gRandomizeGerudoKeys",
"gRandomizeGossipStoneHints",
"gRandomizeGsExpectSunsSong", "gRandomizeGsExpectSunsSong",
"gRandomizeHintClarity",
"gRandomizeHintDistribution",
"gRandomizeIceTraps", "gRandomizeIceTraps",
"gRandomizeItemPool", "gRandomizeItemPool",
"gRandomizeKakarikoGate", "gRandomizeKakarikoGate",
"gRandomizeKeysanity", "gRandomizeKeysanity",
"gRandomizeLacsDungeonCount",
"gRandomizeLacsMedallionCount",
"gRandomizeLacsRewardCount",
"gRandomizeLacsStoneCount",
"gRandomizeLacsTokenCount",
"gRandomizeLinksPocket", "gRandomizeLinksPocket",
"gRandomizeLogicRules",
"gRandomizeMedallionCount", "gRandomizeMedallionCount",
"gRandomizeMixDungeons",
"gRandomizeMixedEntrances",
"gRandomizeMixGrottos",
"gRandomizeMixInteriors",
"gRandomizeMixOverworld",
"gRandomizeMqDungeonCount",
"gRandomizeMqDungeons", "gRandomizeMqDungeons",
"gRandomizeRainbowBridge", "gRandomizeRainbowBridge",
"gRandomizeRewardCount",
"gRandomizeShopsanity", "gRandomizeShopsanity",
"gRandomizeShuffleAdultTrade", "gRandomizeShuffleAdultTrade",
"gRandomizeShuffleBeans", "gRandomizeShuffleBeans",
"gRandomizeShuffleCows", "gRandomizeShuffleCows",
"gRandomizeShuffleDungeonReward", "gRandomizeShuffleDungeonReward",
"gRandomizeShuffleDungeonsEntrances",
"gRandomizeShuffleFrogSongRupees", "gRandomizeShuffleFrogSongRupees",
"gRandomizeShuffleGanonBossKey", "gRandomizeShuffleGanonBossKey",
"gRandomizeShuffleGerudoToken", "gRandomizeShuffleGerudoToken",
"gRandomizeShuffleGrottosEntrances",
"gRandomizeShuffleInteriorsEntrances",
"gRandomizeShuffleKeyRings", "gRandomizeShuffleKeyRings",
"gRandomizeShuffleKeyRingsBottomOfTheWell",
"gRandomizeShuffleKeyRingsFireTemple",
"gRandomizeShuffleKeyRingsForestTemple",
"gRandomizeShuffleKeyRingsGanonsCastle",
"gRandomizeShuffleKeyRingsGTG",
"gRandomizeShuffleKeyRingsRandomCount",
"gRandomizeShuffleKeyRingsShadowTemple",
"gRandomizeShuffleKeyRingsSpiritTemple",
"gRandomizeShuffleKeyRingsWaterTemple",
"gRandomizeShuffleKokiriSword", "gRandomizeShuffleKokiriSword",
"gRandomizeShuffleMerchants",
"gRandomizeShuffleOcarinas", "gRandomizeShuffleOcarinas",
"gRandomizeShuffleOverworldEntrances",
"gRandomizeShuffleOverworldSpawns",
"gRandomizeShuffleOwlDrops",
"gRandomizeShuffleScrubs", "gRandomizeShuffleScrubs",
"gRandomizeShuffleSongs", "gRandomizeShuffleSongs",
"gRandomizeShuffleTokens", "gRandomizeShuffleTokens",
"gRandomizeShuffleWarpSongs",
"gRandomizeShuffleWeirdEgg", "gRandomizeShuffleWeirdEgg",
"gRandomizeSkipChildStealth", "gRandomizeSkipChildStealth",
"gRandomizeSkipChildZelda", "gRandomizeSkipChildZelda",
@ -225,9 +260,13 @@ const std::vector<const char*> randomizerCvars = {
"gRandomizeStartingAge", "gRandomizeStartingAge",
"gRandomizeStartingConsumables", "gRandomizeStartingConsumables",
"gRandomizeStartingDekuShield", "gRandomizeStartingDekuShield",
"gRandomizeStartingOcarina", "gRandomizeStartingKokiriSword",
"gRandomizeStartingMapsCompasses", "gRandomizeStartingMapsCompasses",
"gRandomizeStartingOcarina",
"gRandomizeStartingSkulltulaToken",
"gRandomizeStoneCount",
"gRandomizeSunlightArrows", "gRandomizeSunlightArrows",
"gRandomizeTokenCount",
"gRandomizeZorasFountain", "gRandomizeZorasFountain",
}; };

View File

@ -3211,7 +3211,7 @@ void DrawRandoEditor(bool& open) {
if (CVar_GetS32("gRandomizeShuffleGrottosEntrances", RO_GENERIC_OFF)) { if (CVar_GetS32("gRandomizeShuffleGrottosEntrances", RO_GENERIC_OFF)) {
UIWidgets::Spacer(0); UIWidgets::Spacer(0);
ImGui::SetCursorPosX(20); ImGui::SetCursorPosX(20);
UIWidgets::EnhancementCheckbox("Mix Grotts", "gRandomizeMixGrottos"); UIWidgets::EnhancementCheckbox("Mix Grottos", "gRandomizeMixGrottos");
UIWidgets::InsertHelpHoverText("Grotto entrances will be part of the mixed pool"); UIWidgets::InsertHelpHoverText("Grotto entrances will be part of the mixed pool");
} }
} }