Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix errors that caused issues with the spoiler log reader #88

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Fix errors that caused issues with the spoiler log reader #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ namespace Settings {
std::vector<Option*> excludeLocationsOptions = {};

//Overworld Shuffle Settings
Option ShuffleMainInventory = Option::Bool("Shuffle Starting Gear", {"Off", "On"}, {shuffleMainInventoryDesc}, OptionCategory::Toggle, 1);
Option ShuffleMainInventory = Option::Bool("Shuffle Main Inventory",{"Off", "On"}, {shuffleMainInventoryDesc}, OptionCategory::Toggle, 1);
Option ShuffleKokiriSword = Option::Bool("Shuffle Kokiri Sword", {"Off", "On"}, {kokiriSwordDesc});
Option ShuffleStartingShield = Option::Bool("Starting Shield", {"Off", "On"}, {shuffleStartShield});
Option ShuffleMasks = Option::Bool("Shuffle Masks", {"Off", "On"}, {shuffleMasksVanilla, shuffleMasksRandom}, OptionCategory::Toggle, 1);
Expand All @@ -282,7 +282,7 @@ namespace Settings {
Option Tokensanity = Option::Bool("Tokensanity", {"Off", "On"}, {tokensOff, tokensAllTokens});
Option Scrubsanity = Option::U8 ("Shuffle Scrub Wares", {"Off", "Affordable", "Expensive", "Random Prices"}, {scrubsOff, scrubsAffordable, scrubsExpensive, scrubsRandomPrices});
Option ShuffleMerchants = Option::Bool("Shuffle Scrub Trades", {"Off", "On"}, {shuffleMerchantsDesc});
Option ShuffleTradeItems = Option::Bool("Shuffle Anju & Kafei", {"Off", "On"}, {shuffleTradeItemsDesc});
Option ShuffleTradeItems = Option::Bool("Shuffle Anju and Kafei",{"Off", "On"}, {shuffleTradeItemsDesc});
Option ShuffleGFRewards = Option::U8 ("Shuffle Fairy Rewards", {"Off", "Great Fairies", "Anywhere" }, {shuffleGFVanilla, shuffleGFSelf, shuffleGFAnywhere}, OptionCategory::Setting, (u8)GreatFairyRewardShuffleSetting::GFREWARDSHUFFLE_VANILLA);
Option ShuffleCows = Option::Bool("Shuffle Cows", {"Off", "On"}, {shuffleCowsDesc});
Option ShuffleOcarinas = Option::Bool("Shuffle Ocarina", {"Off", "On"}, {ocarinasDesc});
Expand Down
Loading