Merge 'Closed Forest Fix on Advanced Logic' (OoTRandomizer#2452)

Author: fenhl

SettingsList.py

@@ -1231,11 +1231,12 @@ 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
-            guarantee that these items are available in the forest area.
+            With any of "Shuffle Interior Entrances" set to "All", "Shuffle
+            Overworld Entrances" on, "Randomize Warp Song Destinations" on,
+            "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        = {

World.py

@@ -102,7 +102,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:

version.py

@@ -1,4 +1,4 @@
-__version__ = '8.3.46'
+__version__ = '8.3.47'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0