diff --git a/Hints.py b/Hints.py index f7078f6143..487d6f0eea 100644 --- a/Hints.py +++ b/Hints.py @@ -380,42 +380,42 @@ class HintArea(Enum): # internal name prepositions display name short name color internal dungeon name shorter name # vague clear ROOT = 'in', 'in', "Link's pocket", 'Free', 'White', None, None - HYRULE_FIELD = 'in', 'in', 'Hyrule Field', 'Hyrule Field', 'Light Blue', None, None - LON_LON_RANCH = 'at', 'at', 'Lon Lon Ranch', 'Lon Lon Ranch', 'Light Blue', None, None - MARKET = 'in', 'in', 'the Market', 'Market', 'Light Blue', None, None - TEMPLE_OF_TIME = 'inside', 'inside', 'the Temple of Time', 'Temple of Time', 'Light Blue', None, None - CASTLE_GROUNDS = 'on', 'on', 'the Castle Grounds', None, 'Light Blue', None, None # required for warp songs, - HYRULE_CASTLE = 'at', 'at', 'Hyrule Castle', 'Hyrule Castle', 'Light Blue', None, None - OUTSIDE_GANONS_CASTLE = None, None, "outside Ganon's Castle", "Outside Ganon's Castle", 'Light Blue', None, None - INSIDE_GANONS_CASTLE = 'inside', None, "inside Ganon's Castle", "Inside Ganon's Castle", 'Light Blue', 'Ganons Castle', 'Ganon' + HYRULE_FIELD = 'in', 'in', 'Hyrule Field', 'Hyrule Field', 'Light Blue', None, 'Field' + LON_LON_RANCH = 'at', 'at', 'Lon Lon Ranch', 'Lon Lon Ranch', 'Light Blue', None, 'Ranch' + MARKET = 'in', 'in', 'the Market', 'Market', 'Light Blue', None, 'Market' + TEMPLE_OF_TIME = 'inside', 'inside', 'the Temple of Time', 'Temple of Time', 'Light Blue', None, 'ToT' + CASTLE_GROUNDS = 'on', 'on', 'the Castle Grounds', None, 'Light Blue', None, 'Castle' # required for warp songs + HYRULE_CASTLE = 'at', 'at', 'Hyrule Castle', 'Hyrule Castle', 'Light Blue', None, 'HC' + OUTSIDE_GANONS_CASTLE = None, None, "outside Ganon's Castle", "Outside Ganon's Castle", 'Light Blue', None, 'OGC' + INSIDE_GANONS_CASTLE = 'inside', None, "inside Ganon's Castle", "Inside Ganon's Castle", 'Light Blue', 'Ganons Castle', 'Ganon' GANONDORFS_CHAMBER = 'in', 'in', "Ganondorf's Chamber", "Ganondorf's Chamber", 'Light Blue', None, None - KOKIRI_FOREST = 'in', 'in', 'Kokiri Forest', "Kokiri Forest", 'Green', None, None - DEKU_TREE = 'inside', 'inside', 'the Deku Tree', "Deku Tree", 'Green', 'Deku Tree', 'Deku' - LOST_WOODS = 'in', 'in', 'the Lost Woods', "Lost Woods", 'Green', None, None - SACRED_FOREST_MEADOW = 'at', 'at', 'the Sacred Forest Meadow', "Sacred Forest Meadow", 'Green', None, None + KOKIRI_FOREST = 'in', 'in', 'Kokiri Forest', "Kokiri Forest", 'Green', None, 'Kokiri' + DEKU_TREE = 'inside', 'inside', 'the Deku Tree', "Deku Tree", 'Green', 'Deku Tree', 'Deku' + LOST_WOODS = 'in', 'in', 'the Lost Woods', "Lost Woods", 'Green', None, 'Woods' + SACRED_FOREST_MEADOW = 'at', 'at', 'the Sacred Forest Meadow', "Sacred Forest Meadow", 'Green', None, 'Meadow' FOREST_TEMPLE = 'in', 'in', 'the Forest Temple', "Forest Temple", 'Green', 'Forest Temple', 'Forest' - DEATH_MOUNTAIN_TRAIL = 'on', 'on', 'the Death Mountain Trail', "Death Mountain Trail", 'Red', None, None + DEATH_MOUNTAIN_TRAIL = 'on', 'on', 'the Death Mountain Trail', "Death Mountain Trail", 'Red', None, 'Trail' DODONGOS_CAVERN = 'within', 'in', "Dodongo's Cavern", "Dodongo's Cavern", 'Red', 'Dodongos Cavern', 'DC' - GORON_CITY = 'in', 'in', 'Goron City', "Goron City", 'Red', None, None - DEATH_MOUNTAIN_CRATER = 'in', 'in', 'the Death Mountain Crater', "Death Mountain Crater", 'Red', None, None + GORON_CITY = 'in', 'in', 'Goron City', "Goron City", 'Red', None, 'Goron' + DEATH_MOUNTAIN_CRATER = 'in', 'in', 'the Death Mountain Crater', "Death Mountain Crater", 'Red', None, 'Crater' FIRE_TEMPLE = 'on', 'in', 'the Fire Temple', "Fire Temple", 'Red', 'Fire Temple', 'Fire' - ZORA_RIVER = 'at', 'at', "Zora's River", "Zora's River", 'Blue', None, None - ZORAS_DOMAIN = 'at', 'at', "Zora's Domain", "Zora's Domain", 'Blue', None, None - ZORAS_FOUNTAIN = 'at', 'at', "Zora's Fountain", "Zora's Fountain", 'Blue', None, None + ZORA_RIVER = 'at', 'at', "Zora's River", "Zora's River", 'Blue', None, 'River' + ZORAS_DOMAIN = 'at', 'at', "Zora's Domain", "Zora's Domain", 'Blue', None, 'Domain' + ZORAS_FOUNTAIN = 'at', 'at', "Zora's Fountain", "Zora's Fountain", 'Blue', None, 'Fountain' JABU_JABUS_BELLY = 'in', 'inside', "Jabu Jabu's Belly", "Jabu Jabu's Belly", 'Blue', 'Jabu Jabus Belly', 'Jabu' ICE_CAVERN = 'inside', 'in' , 'the Ice Cavern', "Ice Cavern", 'Blue', 'Ice Cavern', 'Ice' - LAKE_HYLIA = 'at', 'at', 'Lake Hylia', "Lake Hylia", 'Blue', None, None + LAKE_HYLIA = 'at', 'at', 'Lake Hylia', "Lake Hylia", 'Blue', None, 'Lake' WATER_TEMPLE = 'under', 'in', 'the Water Temple', "Water Temple", 'Blue', 'Water Temple', 'Water' - KAKARIKO_VILLAGE = 'in', 'in', 'Kakariko Village', "Kakariko Village", 'Pink', None, None + KAKARIKO_VILLAGE = 'in', 'in', 'Kakariko Village', "Kakariko Village", 'Pink', None, 'Kakariko' BOTTOM_OF_THE_WELL = 'within', 'at', 'the Bottom of the Well', "Bottom of the Well", 'Pink', 'Bottom of the Well', 'BotW' - GRAVEYARD = 'in', 'in', 'the Graveyard', "Graveyard", 'Pink', None, None + GRAVEYARD = 'in', 'in', 'the Graveyard', "Graveyard", 'Pink', None, 'GY' SHADOW_TEMPLE = 'within', 'in', 'the Shadow Temple', "Shadow Temple", 'Pink', 'Shadow Temple', 'Shadow' - GERUDO_VALLEY = 'at', 'at', 'Gerudo Valley', "Gerudo Valley", 'Yellow', None, None - GERUDO_FORTRESS = 'at', 'at', "Gerudo's Fortress", "Gerudo's Fortress", 'Yellow', None, None - THIEVES_HIDEOUT = 'in', 'in', "the Thieves' Hideout", "Thieves' Hideout", 'Yellow', None, None + GERUDO_VALLEY = 'at', 'at', 'Gerudo Valley', "Gerudo Valley", 'Yellow', None, 'Valley' + GERUDO_FORTRESS = 'at', 'at', "Gerudo's Fortress", "Gerudo's Fortress", 'Yellow', None, 'Fortress' + THIEVES_HIDEOUT = 'in', 'in', "the Thieves' Hideout", "Thieves' Hideout", 'Yellow', None, 'Hideout' GERUDO_TRAINING_GROUND = 'within', 'on', 'the Gerudo Training Ground', "Gerudo Training Ground", 'Yellow', 'Gerudo Training Ground', 'GTG' - HAUNTED_WASTELAND = 'in', 'in', 'the Haunted Wasteland', "Haunted Wasteland", 'Yellow', None, None - DESERT_COLOSSUS = 'at', 'at', 'the Desert Colossus', "Desert Colossus", 'Yellow', None, None + HAUNTED_WASTELAND = 'in', 'in', 'the Haunted Wasteland', "Haunted Wasteland", 'Yellow', None, 'Wasteland' + DESERT_COLOSSUS = 'at', 'at', 'the Desert Colossus', "Desert Colossus", 'Yellow', None, 'Colossus' SPIRIT_TEMPLE = 'inside', 'in', 'the Spirit Temple', "Spirit Temple", 'Yellow', 'Spirit Temple', 'Spirit' # Performs a breadth first search to find the closest hint area from a given spot (region, location, or entrance).