Merge 'Take effective starting items into account for hint reachability' (OoTRandomizer#2424)

Author: fenhl

CHANGELOG.md

@@ -21,6 +21,7 @@
 * Fix Blue Fire Arrows being logically treated as Ice Arrows when selected as a starting item.
 * Fix a bug where it was possible to buy the item from Granny's Potion Shop without turning in the Odd Mushroom in some cases.
 * Fix two different trade items being shuffled with plentiful item pool and no adult trade shuffle, which could lead to softlocks due to inconsistent game state.
+* Fix the code that checks whether a hint is reachable not taking effective starting items (e.g. the rewards of precompleted dungeons) into account.
 
 ## Other changes
 * Big poe souls can now be collected while riding Epona.

Hints.py

@@ -308,7 +308,7 @@ def can_reach_hint(worlds: list[World], hint_location: Location, location: Locat
 
     old_item = location.item
     location.item = None
-    search = Search.max_explore([world.state for world in worlds])
+    search = Search.max_explore([world.state for world in worlds], collect_pseudo_starting_items=True)
     location.item = old_item
 
     return (search.spot_access(hint_location)

Search.py

@@ -84,10 +84,12 @@ def collect(self, item: Item) -> None:
         self.state_list[item.world.id].collect(item)
 
     @classmethod
-    def max_explore(cls, state_list: Iterable[State], itempool: Optional[Iterable[Item]] = None) -> Search:
+    def max_explore(cls, state_list: Iterable[State], itempool: Optional[Iterable[Item]] = None, *, collect_pseudo_starting_items: bool = False) -> Search:
         p = cls(state_list)
         if itempool:
             p.collect_all(itempool)
+        if collect_pseudo_starting_items:
+            p.collect_pseudo_starting_items()
         p.collect_locations()
         return p
 

version.py

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