From c1455cedea2cbc933160658f5a879219dbf694fc Mon Sep 17 00:00:00 2001 From: briaguya Date: Fri, 19 Aug 2022 10:56:26 -0400 Subject: [PATCH] fix broken seed parsing --- soh/soh/Enhancements/randomizer/randomizer.cpp | 9 ++------- soh/soh/Enhancements/randomizer/randomizerTypes.h | 6 ------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index d5868a908..e7e1467dd 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -67,6 +67,8 @@ Randomizer::Randomizer() { for (auto locationIt : areaIt.second) { SpoilerfileCheckNameToEnum[locationIt.rcSpoilerName] = locationIt.rc; } + SpoilerfileCheckNameToEnum["Invalid Location"] = RC_UNKNOWN_CHECK; + SpoilerfileCheckNameToEnum["Link's Pocket"] = RC_LINKS_POCKET; } } @@ -2828,13 +2830,6 @@ void GenerateRandomizerImgui() { cvarSettings[RSK_STARTING_CONSUMABLES] = CVar_GetS32("gRandomizeStartingConsumables", 0); cvarSettings[RSK_FULL_WALLETS] = CVar_GetS32("gRandomizeFullWallets", 0); - cvarSettings[RSK_EXCLUDE_DEKU_THEATER_MASK_OF_TRUTH] = CVar_GetS32("gRandomizeExcludeDekuTheaterMaskOfTruth", 0); - cvarSettings[RSK_EXCLUDE_KAK_10_GOLD_SKULLTULA_REWARD] = CVar_GetS32("gRandomizeExcludeKak10SkullReward", 0); - cvarSettings[RSK_EXCLUDE_KAK_20_GOLD_SKULLTULA_REWARD] = CVar_GetS32("gRandomizeExcludeKak20SkullReward", 0); - cvarSettings[RSK_EXCLUDE_KAK_30_GOLD_SKULLTULA_REWARD] = CVar_GetS32("gRandomizeExcludeKak30SkullReward", 0); - cvarSettings[RSK_EXCLUDE_KAK_40_GOLD_SKULLTULA_REWARD] = CVar_GetS32("gRandomizeExcludeKak40SkullReward", 0); - cvarSettings[RSK_EXCLUDE_KAK_50_GOLD_SKULLTULA_REWARD] = CVar_GetS32("gRandomizeExcludeKak50SkullReward", 0); - // RANDOTODO implement chest minigame shuffle with keysanity cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME] = false; diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 58faeaa7b..742fd56db 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -996,13 +996,7 @@ typedef enum { RSK_SKIP_CHILD_ZELDA, RSK_STARTING_CONSUMABLES, RSK_FULL_WALLETS, - RSK_EXCLUDE_DEKU_THEATER_MASK_OF_TRUTH, RSK_LANGUAGE, - RSK_EXCLUDE_KAK_10_GOLD_SKULLTULA_REWARD, - RSK_EXCLUDE_KAK_20_GOLD_SKULLTULA_REWARD, - RSK_EXCLUDE_KAK_30_GOLD_SKULLTULA_REWARD, - RSK_EXCLUDE_KAK_40_GOLD_SKULLTULA_REWARD, - RSK_EXCLUDE_KAK_50_GOLD_SKULLTULA_REWARD, RSK_SHUFFLE_CHEST_MINIGAME, RSK_CUCCO_COUNT, RSK_BIG_POE_COUNT,