Merge 'Allow non-items to be hinted via plando' (#2157)

README.md

@@ -115,6 +115,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 * New cosmetic option `Input Viewer` for showing control stick values and pressed buttons at the bottom of the screen.
 * A text box has been added when completing the adult shooting gallery without a bow to warn the player that they haven't received the real reward.
 * Settings presets can have aliases. Command-line users may use an alias instead of the name to specify the preset.
+* The plando-only `item_hints` setting can now include special items such as songs or keys.
 
 #### Bug Fixes
 * Goal hints can now hint items required to defeat Ganon even if they're not required for the rainbow bridge, Ganon's boss key, or the trials. These items will be hinted as being on the "path of the hero".

SettingsList.py

@@ -3413,7 +3413,7 @@ class SettingInfos:
         gui_type       = None,
         gui_text       = None,
         shared         = True,
-        choices        = [name for name, item in ItemInfo.items.items() if item.type == 'Item']
+        choices        = [name for name, item in ItemInfo.items.items() if item.type not in ('Drop', 'Event', 'Refill', 'Shop')]
     )
 
     hint_dist_user = SettingInfoDict(None, None, True, {})

tests/plando/one-hint-per-goal-dungeons.json

@@ -36,7 +36,7 @@
                 "trial":      {"order":  1, "weight": 0.0, "fixed":   0, "copies": 2},
                 "always":     {"order":  2, "weight": 0.0, "fixed":   0, "copies": 2},
                 "woth":       {"order":  3, "weight": 0.0, "fixed":   0, "copies": 2},
-                "goal":       {"order":  4, "weight": 0.0, "fixed":   8, "copies": 2},
+                "goal":       {"order":  4, "weight": 0.0, "fixed":   9, "copies": 2},
                 "barren":     {"order":  5, "weight": 0.0, "fixed":   0, "copies": 2},
                 "entrance":   {"order":  6, "weight": 0.0, "fixed":   0, "copies": 2},
                 "sometimes":  {"order":  7, "weight": 0.0, "fixed":  99, "copies": 2},

version.py

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