From 9171617805183e942f99674796d565b2701ef38b Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Sun, 30 Aug 2026 13:28:40 -0700 Subject: [PATCH] update settings descriptions --- .../generator/data/settings_list.yaml | 10 +++++----- mods/randomizer/generator/logic/world.cpp | 17 +++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/mods/randomizer/generator/data/settings_list.yaml b/mods/randomizer/generator/data/settings_list.yaml index 138d75091c..17cbd616d7 100644 --- a/mods/randomizer/generator/data/settings_list.yaml +++ b/mods/randomizer/generator/data/settings_list.yaml @@ -96,28 +96,28 @@ Tracker Important: True Default Option: "Off" Options: - - "Off": "The Golden Bug locations across Hyrule will give the golden bug at that location in the base game." + - "Off": "The Golden Bug locations across Hyrule will not be randomized. You may still be expected to collect golden bugs if Agitha has important items." - "On": "The Golden Bug locations across Hyrule will be randomized." - Name: Sky Characters Tracker Important: True Default Option: "Off" Options: - - "Off": "The Sky Character locations across Hyrule will give Sky Characters." + - "Off": "The Sky Character locations across Hyrule will not be randomized. You may still be expected to collect Sky Characters." - "On": "The Sky Character locations across Hyrule will be randomized." - Name: Gifts From NPCs Tracker Important: True Default Option: "Off" Options: - - "Off": "Locations which involve an NPC giving you a gift will give the item expected from the base game." + - "Off": "Locations which involve an NPC giving you a gift will not be randomized. You may still be expected to talk to NPCs that give you important items." - "On": "Locations which involve an NPC giving you a gift will be randomized." - Name: Shop Items Tracker Important: True Default Option: "Off" Options: - - "Off": "Shop item locations will contain the item they have in the base game." + - "Off": "Shop items will not be randomized. You may still be expected to purchase shop items that are important." - "On": "Shop items will be randomized." - Name: Hidden Skills @@ -270,7 +270,7 @@ - "Off": "Dungeon reward items (Fused Shadows and Mirror Shards) will only appear at the end of dungeons." - "On": "Dungeon reward items (Fused Shadows and Mirror Shards) can appear anywhere." -- Name: No Small Keys on Bosses +- Name: Small Keys on Bosses Default Option: "Off" Options: - "Off": "Small keys will not be placed on boss heart container or dungeon reward checks." diff --git a/mods/randomizer/generator/logic/world.cpp b/mods/randomizer/generator/logic/world.cpp index b8ec4b881d..5e1d9e5ec0 100644 --- a/mods/randomizer/generator/logic/world.cpp +++ b/mods/randomizer/generator/logic/world.cpp @@ -798,7 +798,7 @@ namespace randomizer::logic::world void World::SetForbiddenItems() { // Prevent small keys from appearing on bosses if the setting is on - if (this->Setting("No Small Keys on Bosses") == "On") + if (this->Setting("Small Keys on Bosses") == "Off") { // Gather all boss locations (heart container and dungeon reward checks) auto bossLocations = this->GetAllLocations(); @@ -811,13 +811,14 @@ namespace randomizer::logic::world item_pool::ItemPool smallKeys = {}; for (const auto& [itemName, item] : this->_itemTable) { - if (item->IsDungeonSmallKey() || utility::general::IsAnyOf(itemName, - "Ordon Pumpkin", - "Ordon Cheese", - "North Faron Woods Gate Key", - "Faron Woods Coro Key", - "Gate Keys", - "Gerudo Desert Bulblin Camp Key")) + if (item->IsDungeonSmallKey() || + utility::general::IsAnyOf(itemName, + "Ordon Pumpkin", + "Ordon Cheese", + "North Faron Woods Gate Key", + "Faron Woods Coro Key", + "Gate Keys", + "Gerudo Desert Bulblin Camp Key")) { smallKeys.push_back(item.get()); }