Merge 'Account For Random Starting Items When Building Misc Hints' (#2503)

Author: cjohnson57

CHANGELOG.md

@@ -24,6 +24,7 @@
 * Various minor fixes for advanced logic.
 * Fix for advanced logic tricks being cached when switching to glitchless logic.
 * Fix for failure to generate when special deal prices are set to vanilla.
+* Fix for misc hints when the hinted item was randomly selected as a starting item.
 
 ## Other Changes
 * It is no longer required to have either the goron tunic or the Fewer Tunic Requirements trick for adult to go from the Bolero warp pad to the Fire temple in logic.

Hints.py

@@ -1819,7 +1819,10 @@ def build_misc_item_hints(world: World, messages: list[Message], allow_duplicate
     for hint_type, data in misc_item_hint_table.items():
         if hint_type in world.settings.misc_hints:
             item = world.misc_hint_items[hint_type]
-            if item in world.distribution.effective_starting_items and world.distribution.effective_starting_items[item].count > 0:
+            if (
+                (item in world.distribution.effective_starting_items and world.distribution.effective_starting_items[item].count > 0) or
+                (item in world.distribution.randomized_starting_items and world.distribution.randomized_starting_items[item] > 0)
+            ):
                 if item == data['default_item']:
                     text = data['default_item_text'].format(area='#your pocket#')
                 else:

version.py

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