Skip to content

Commit 2a13196

Browse files
authored
Merge pull request #4 from dotzo/advanced-glitchlogic-release
Downgrades Closed Forest to Open Deku with Grotto ER on Advanced logic
2 parents ff8c4db + ec4ad14 commit 2a13196

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

SettingsList.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,10 +1231,11 @@ class SettingInfos:
12311231
required to access the Deku Tree. Items needed for this will be
12321232
guaranteed inside the forest area. This setting is incompatible
12331233
with starting as adult, and so Starting Age will be locked to Child.
1234-
With either "Shuffle Interior Entrances" set to "All", "Shuffle
1235-
Overworld Entrances" on, "Randomize Warp Song Destinations" on
1236-
or "Randomize Overworld Spawns" on, Closed Forest will instead
1237-
be treated as Closed Deku with starting age Child and WILL NOT
1234+
With any of "Shuffle Interior Entrances" set to "All", "Shuffle
1235+
Overworld Entrances" on, "Randomize Warp Song Destinations" on,
1236+
"Randomize Overworld Spawns" on, or "Randomize Overworld Spawns" on
1237+
with Advanced Logic, Closed Forest will instead be treated as
1238+
Closed Deku with starting age Child and WILL NOT
12381239
guarantee that these items are available in the forest area.
12391240
''',
12401241
shared = True,

World.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ def __init__(self, world_id: int, settings: Settings, resolve_randomized_setting
101101

102102
if (settings.open_forest == 'closed'
103103
and (self.shuffle_special_interior_entrances or settings.shuffle_hideout_entrances or settings.shuffle_overworld_entrances
104-
or settings.warp_songs or settings.spawn_positions)):
104+
or settings.warp_songs or settings.spawn_positions
105+
or (settings.logic_rules == 'advanced' and settings.shuffle_grotto_entrances)
106+
)):
105107
self.settings.open_forest = 'closed_deku'
106108

107109
if settings.triforce_goal_per_world > settings.triforce_count_per_world:

0 commit comments

Comments
 (0)