From ec4ad1457c4f3176c2c8e68cea4c6a5c24bc7aec Mon Sep 17 00:00:00 2001 From: dotzo Date: Sat, 30 Aug 2025 21:07:14 -0400 Subject: [PATCH 1/3] Downgrades Closed Forest to Open Deku with Grotto ER on Advanced logic --- SettingsList.py | 9 +++++---- World.py | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/SettingsList.py b/SettingsList.py index f02f8e6393..c87813b600 100644 --- a/SettingsList.py +++ b/SettingsList.py @@ -1231,10 +1231,11 @@ class SettingInfos: required to access the Deku Tree. Items needed for this will be guaranteed inside the forest area. This setting is incompatible with starting as adult, and so Starting Age will be locked to Child. - With either "Shuffle Interior Entrances" set to "All", "Shuffle - Overworld Entrances" on, "Randomize Warp Song Destinations" on - or "Randomize Overworld Spawns" on, Closed Forest will instead - be treated as Closed Deku with starting age Child and WILL NOT + With any of "Shuffle Interior Entrances" set to "All", "Shuffle + Overworld Entrances" on, "Randomize Warp Song Destinations" on, + "Randomize Overworld Spawns" on, or "Randomize Overworld Spawns" on + with Advanced Logic, Closed Forest will instead be treated as + Closed Deku with starting age Child and WILL NOT guarantee that these items are available in the forest area. ''', shared = True, diff --git a/World.py b/World.py index 95dd6599ca..d541de2872 100644 --- a/World.py +++ b/World.py @@ -101,7 +101,9 @@ def __init__(self, world_id: int, settings: Settings, resolve_randomized_setting if (settings.open_forest == 'closed' and (self.shuffle_special_interior_entrances or settings.shuffle_hideout_entrances or settings.shuffle_overworld_entrances - or settings.warp_songs or settings.spawn_positions)): + or settings.warp_songs or settings.spawn_positions + or (settings.logic_rules == 'advanced' and settings.shuffle_grotto_entrances) + )): self.settings.open_forest = 'closed_deku' if settings.triforce_goal_per_world > settings.triforce_count_per_world: From e2095d339753434c5f2c117b181c3d0134b8667b Mon Sep 17 00:00:00 2001 From: shirosoluna Date: Fri, 5 Sep 2025 14:23:47 -0400 Subject: [PATCH 2/3] trailing whitespace --- SettingsList.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsList.py b/SettingsList.py index c87813b600..8753a2100f 100644 --- a/SettingsList.py +++ b/SettingsList.py @@ -1234,7 +1234,7 @@ class SettingInfos: With any of "Shuffle Interior Entrances" set to "All", "Shuffle Overworld Entrances" on, "Randomize Warp Song Destinations" on, "Randomize Overworld Spawns" on, or "Randomize Overworld Spawns" on - with Advanced Logic, Closed Forest will instead be treated as + with Advanced Logic, Closed Forest will instead be treated as Closed Deku with starting age Child and WILL NOT guarantee that these items are available in the forest area. ''', From 5f8866c1435bd2365d671d4fea08f708d3523ebe Mon Sep 17 00:00:00 2001 From: shirosoluna Date: Sun, 7 Sep 2025 22:10:01 -0400 Subject: [PATCH 3/3] update tooltip --- SettingsList.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SettingsList.py b/SettingsList.py index 8753a2100f..075e78625a 100644 --- a/SettingsList.py +++ b/SettingsList.py @@ -1233,10 +1233,10 @@ class SettingInfos: with starting as adult, and so Starting Age will be locked to Child. With any of "Shuffle Interior Entrances" set to "All", "Shuffle Overworld Entrances" on, "Randomize Warp Song Destinations" on, - "Randomize Overworld Spawns" on, or "Randomize Overworld Spawns" on - with Advanced Logic, Closed Forest will instead be treated as - Closed Deku with starting age Child and WILL NOT - guarantee that these items are available in the forest area. + "Randomize Overworld Spawns" on, or "Shuffle Grottos" in Advanced + Logic, Closed Forest will instead be treated as Closed Deku with + starting age Child and WILL NOT guarantee that these items are + available in the forest area. ''', shared = True, disable = {