diff --git a/Entrance.py b/Entrance.py index e2a765c27e..b22aa63f91 100644 --- a/Entrance.py +++ b/Entrance.py @@ -1,6 +1,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, Optional, Any +from Region import REGION_ALIASES + if TYPE_CHECKING: from Region import Region from RulesCommon import AccessRule @@ -97,3 +99,8 @@ def assume_reachable(self) -> Entrance: def __str__(self) -> str: return self.name + + +def resolve_entrance_alias(alias: str) -> str: + source, target = alias.split(' -> ') + return f'{REGION_ALIASES.get(source, source)} -> {REGION_ALIASES.get(target, target)}' diff --git a/EntranceShuffle.py b/EntranceShuffle.py index d56900e164..0b29c6dcda 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -141,8 +141,8 @@ def build_one_way_targets(world: World, types_to_include: Iterable[str], exclude ('KF House of Twins -> Kokiri Forest', { 'index': 0x033C })), ('Interior', ('Kokiri Forest -> KF Know It All House', { 'index': 0x00C9 }), ('KF Know It All House -> Kokiri Forest', { 'index': 0x026A })), - ('Interior', ('Kokiri Forest -> KF Kokiri Shop', { 'index': 0x00C1 }), - ('KF Kokiri Shop -> Kokiri Forest', { 'index': 0x0266 })), + ('Interior', ('Kokiri Forest -> KF Shop', { 'index': 0x00C1 }), + ('KF Shop -> Kokiri Forest', { 'index': 0x0266 })), ('Interior', ('Lake Hylia -> LH Lab', { 'index': 0x0043 }), ('LH Lab -> Lake Hylia', { 'index': 0x03CC })), ('Interior', ('LH Fishing Island -> LH Fishing Hole', { 'index': 0x045F }), diff --git a/HintList.py b/HintList.py index 7407d9a7fa..52ccb5e9da 100644 --- a/HintList.py +++ b/HintList.py @@ -214,17 +214,17 @@ def tokens_required_by_settings(world: World) -> int: # Hints required under certain settings conditional_always: dict[str, Callable[[World], bool]] = { - 'Market 10 Big Poes': lambda world: world.settings.big_poe_count > 3 and 'big_poes' not in world.settings.misc_hints, - 'Deku Theater Mask of Truth': lambda world: not world.settings.complete_mask_quest and 'Mask of Truth' not in world.settings.shuffle_child_trade, - 'Song from Ocarina of Time': lambda world: stones_required_by_settings(world) < 2, - 'HF Ocarina of Time Item': lambda world: stones_required_by_settings(world) < 2, - 'Sheik in Kakariko': lambda world: medallions_required_by_settings(world) < 5, - 'DMT Biggoron': lambda world: ('Claim Check' not in world.settings.adult_trade_start or len(world.settings.adult_trade_start) != 1) and not world.settings.adult_trade_shuffle, - 'Kak 30 Gold Skulltula Reward': lambda world: tokens_required_by_settings(world) < 30 and '30_skulltulas' not in world.settings.misc_hints, - 'Kak 40 Gold Skulltula Reward': lambda world: tokens_required_by_settings(world) < 40 and '40_skulltulas' not in world.settings.misc_hints, - 'Kak 50 Gold Skulltula Reward': lambda world: tokens_required_by_settings(world) < 50 and '50_skulltulas' not in world.settings.misc_hints, - 'ZR Frogs Ocarina Game': lambda world: 'frogs2' not in world.settings.misc_hints, - 'LH Loach Fishing': lambda world: world.settings.shuffle_loach_reward == 'vanilla', + 'Market Guard House 10 Big Poes': lambda world: world.settings.big_poe_count > 3 and 'big_poes' not in world.settings.misc_hints, + 'Deku Theater Mask of Truth': lambda world: not world.settings.complete_mask_quest and 'Mask of Truth' not in world.settings.shuffle_child_trade, + 'Song from Ocarina of Time': lambda world: stones_required_by_settings(world) < 2, + 'HF Ocarina of Time Item': lambda world: stones_required_by_settings(world) < 2, + 'Sheik in Kakariko': lambda world: medallions_required_by_settings(world) < 5, + 'DMT Biggoron': lambda world: ('Claim Check' not in world.settings.adult_trade_start or len(world.settings.adult_trade_start) != 1) and not world.settings.adult_trade_shuffle, + 'Kak House of Skulltula 30 Gold Skulltula Reward': lambda world: tokens_required_by_settings(world) < 30 and '30_skulltulas' not in world.settings.misc_hints, + 'Kak House of Skulltula 40 Gold Skulltula Reward': lambda world: tokens_required_by_settings(world) < 40 and '40_skulltulas' not in world.settings.misc_hints, + 'Kak House of Skulltula 50 Gold Skulltula Reward': lambda world: tokens_required_by_settings(world) < 50 and '50_skulltulas' not in world.settings.misc_hints, + 'ZR Frogs Ocarina Game': lambda world: 'frogs2' not in world.settings.misc_hints, + 'LH Fishing Hole Loach Reward': lambda world: world.settings.shuffle_loach_reward == 'vanilla', } def rainbow_bridge_hint_kind(world: World) -> str: @@ -261,8 +261,8 @@ def rainbow_bridge_hint_kind(world: World) -> str: # Some sometimes, dual, and entrance hints should only be enabled under certain settings conditional_sometimes: dict[str, Callable[[World], bool]] = { # Conditional sometimes hints - 'HC Great Fairy Reward': lambda world: world.settings.shuffle_interior_entrances == 'off', - 'OGC Great Fairy Reward': lambda world: world.settings.shuffle_interior_entrances == 'off', + 'HC Great Fairy Fountain Reward': lambda world: world.settings.shuffle_interior_entrances == 'off', + 'OGC Great Fairy Fountain Reward': lambda world: world.settings.shuffle_interior_entrances == 'off', 'ZR Frogs in the Rain': lambda world: not world.settings.shuffle_frog_song_rupees, 'ZD King Zora Thawed': lambda world: not world.settings.adult_trade_shuffle or 'Eyeball Frog' not in world.settings.adult_trade_start, @@ -564,15 +564,15 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'Sheik in Kakariko': ("a #ravaged village# mourns with", "amidst flames in #Kakariko Village#, Sheik gives", ['song', 'sometimes']), 'Sheik at Colossus': ("a hero ventures #beyond the wasteland# to learn", "the #Desert Colossus# sands echo with", ['song', 'sometimes']), - 'Market 10 Big Poes': ("#ghost hunters# will be rewarded with", "catching #Big Poes# leads to", ['overworld', 'sometimes']), + 'Market Guard House 10 Big Poes': ("#ghost hunters# will be rewarded with", "catching #Big Poes# leads to", ['overworld', 'sometimes']), 'Deku Theater Skull Mask': ("the #Skull Mask# yields", "wearing the #Skull Mask in the Deku Theater# rewards", ['overworld', 'sometimes']), 'Deku Theater Mask of Truth': ("showing a #truthful eye to the crowd# rewards", "showing the #Mask of Truth in the Deku Theater# rewards", ['overworld', 'sometimes']), 'HF Ocarina of Time Item': ("the #treasure thrown by Princess Zelda# is", None, ['overworld', 'sometimes']), 'DMT Biggoron': ("#Biggoron# crafts", "showing the #Claim Check to Biggoron# rewards", ['overworld', 'sometimes']), - 'Kak 50 Gold Skulltula Reward': (["#50 bug badges# rewards", "#50 spider souls# yields", "#50 auriferous arachnids# lead to"], "slaying #50 Gold Skulltulas# reveals", ['overworld', 'sometimes']), - 'Kak 40 Gold Skulltula Reward': (["#40 bug badges# rewards", "#40 spider souls# yields", "#40 auriferous arachnids# lead to"], "slaying #40 Gold Skulltulas# reveals", ['overworld', 'sometimes']), - 'Kak 30 Gold Skulltula Reward': (["#30 bug badges# rewards", "#30 spider souls# yields", "#30 auriferous arachnids# lead to"], "slaying #30 Gold Skulltulas# reveals", ['overworld', 'sometimes']), - 'Kak 20 Gold Skulltula Reward': (["#20 bug badges# rewards", "#20 spider souls# yields", "#20 auriferous arachnids# lead to"], "slaying #20 Gold Skulltulas# reveals", ['overworld', 'sometimes']), + 'Kak House of Skulltula 50 Gold Skulltula Reward': (["#50 bug badges# rewards", "#50 spider souls# yields", "#50 auriferous arachnids# lead to"], "slaying #50 Gold Skulltulas# reveals", ['overworld', 'sometimes']), + 'Kak House of Skulltula 40 Gold Skulltula Reward': (["#40 bug badges# rewards", "#40 spider souls# yields", "#40 auriferous arachnids# lead to"], "slaying #40 Gold Skulltulas# reveals", ['overworld', 'sometimes']), + 'Kak House of Skulltula 30 Gold Skulltula Reward': (["#30 bug badges# rewards", "#30 spider souls# yields", "#30 auriferous arachnids# lead to"], "slaying #30 Gold Skulltulas# reveals", ['overworld', 'sometimes']), + 'Kak House of Skulltula 20 Gold Skulltula Reward': (["#20 bug badges# rewards", "#20 spider souls# yields", "#20 auriferous arachnids# lead to"], "slaying #20 Gold Skulltulas# reveals", ['overworld', 'sometimes']), 'Kak Anju as Child': (["#wrangling roosters# rewards", "#chucking chickens# gifts"], "#collecting cuccos# rewards", ['overworld', 'sometimes']), 'GC Darunias Joy': ("a #groovin' goron# gifts", "#Darunia's dance# leads to", ['overworld', 'sometimes']), 'LW Skull Kid': ("the #Skull Kid# grants", None, ['overworld', 'sometimes']), @@ -583,8 +583,8 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'GC Maze Left Chest': ("in #Goron City# the hammer unlocks", None, ['overworld', 'sometimes']), 'GV Chest': ("in #Gerudo Valley# the hammer unlocks", None, ['overworld', 'sometimes']), 'GV Cow': ("a #cow in Gerudo Valley# gifts", None, ['overworld', 'sometimes']), - 'HC GS Storms Grotto': ("a #spider behind a muddy wall# in a grotto holds", None, ['overworld', 'sometimes']), - 'HF GS Cow Grotto': ("a #spider behind webs# in a grotto holds", None, ['overworld', 'sometimes']), + 'HC Storms Grotto GS': ("a #spider behind a muddy wall# in a grotto holds", None, ['overworld', 'sometimes']), + 'HF Cow Grotto GS': ("a #spider behind webs# in a grotto holds", None, ['overworld', 'sometimes']), 'HF Cow Grotto Cow': ("the #cobwebbed cow# gifts", "a #cow behind webs# in a grotto gifts", ['overworld', 'sometimes']), 'ZF GS Hidden Cave': ("a spider high #above the icy waters# holds", None, ['overworld', 'sometimes']), 'Wasteland Chest': (["#deep in the wasteland# is", "beneath #the sands#, flames reveal"], "the #Haunted Wasteland torches# reveal", ['overworld', 'sometimes']), @@ -598,8 +598,8 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'LW Target in Woods': ("shooting a #target in the woods# grants", None, ['overworld', 'sometimes']), 'ZR Frogs in the Rain': ("#frogs in a storm# gift", "playing #Song of Storms to Frogs# rewards", ['overworld', 'sometimes']), 'LH Lab Dive': ("a #diving experiment# is rewarded with", "a #lakeside lab diving experiment# rewards", ['overworld', 'sometimes']), - 'HC Great Fairy Reward': ("the #fairy of fire# holds", "a #fairy outside Hyrule Castle# holds", ['overworld', 'sometimes']), - 'OGC Great Fairy Reward': ("the #fairy of strength# holds", "a #fairy outside Ganon's Castle# holds", ['overworld', 'sometimes']), + 'HC Great Fairy Fountain Reward': ("the #fairy of fire# holds", "a #fairy outside Hyrule Castle# holds", ['overworld', 'sometimes']), + 'OGC Great Fairy Fountain Reward': ("the #fairy of strength# holds", "a #fairy outside Ganon's Castle# holds", ['overworld', 'sometimes']), 'Deku Tree MQ After Spinning Log Chest': ("a #temporal stone within a tree# contains", "a #temporal stone within the Deku Tree# contains", ['dungeon', 'sometimes']), 'Deku Tree MQ GS Basement Graves Room': ("a #spider on a ceiling in a tree# holds", "a #spider on a ceiling in the Deku Tree# holds", ['dungeon', 'sometimes']), @@ -695,16 +695,16 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'Twinrova Rewards': ("the #Sorceress Sisters# hold...^", "#Twinrova# holds...^", 'dual'), 'KF Kokiri Sword Chest': ("the #hidden treasure of the Kokiri# is", None, 'exclude'), - 'KF Midos Top Left Chest': ("the #leader of the Kokiri# hides", "#inside Mido's house# is", 'exclude'), - 'KF Midos Top Right Chest': ("the #leader of the Kokiri# hides", "#inside Mido's house# is", 'exclude'), - 'KF Midos Bottom Left Chest': ("the #leader of the Kokiri# hides", "#inside Mido's house# is", 'exclude'), - 'KF Midos Bottom Right Chest': ("the #leader of the Kokiri# hides", "#inside Mido's house# is", 'exclude'), + 'KF Midos House Top Left Chest': ("the #leader of the Kokiri# hides", "#inside Mido's house# is", 'exclude'), + 'KF Midos House Top Right Chest': ("the #leader of the Kokiri# hides", "#inside Mido's house# is", 'exclude'), + 'KF Midos House Bottom Left Chest': ("the #leader of the Kokiri# hides", "#inside Mido's house# is", 'exclude'), + 'KF Midos House Bottom Right Chest': ("the #leader of the Kokiri# hides", "#inside Mido's house# is", 'exclude'), 'Graveyard Shield Grave Chest': ("the #treasure of a fallen soldier# is", None, 'exclude'), 'DMT Chest': ("hidden behind a wall on a #mountain trail# is", None, 'exclude'), 'GC Maze Right Chest': ("in #Goron City# explosives unlock", None, 'exclude'), 'GC Maze Center Chest': ("in #Goron City# explosives unlock", None, 'exclude'), 'ZD Chest': ("fire #beyond a waterfall# reveals", None, 'exclude'), - 'Graveyard Dampe Race Hookshot Chest': ("a chest hidden by a #speedy spectre# holds", "#dead Dampé's first prize# is", 'exclude'), + 'Graveyard Dampes Grave Hookshot Chest': ("a chest hidden by a #speedy spectre# holds", "#dead Dampé's first prize# is", 'exclude'), 'GF Chest': ("on a #rooftop in the desert# lies", None, 'exclude'), 'Kak Redead Grotto Chest': ("#zombies beneath the earth# guard", None, 'exclude'), 'SFM Wolfos Grotto Chest': ("#wolves beneath the earth# guard", None, 'exclude'), @@ -718,12 +718,12 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'DMT Storms Grotto Chest': ("#hole flooded with rain on a mountain# holds", None, 'exclude'), 'DMC Upper Grotto Chest': ("a #hole in a volcano# holds", None, 'exclude'), - 'ToT Light Arrows Cutscene': ("the #final gift of a princess# is", None, 'exclude'), + 'Temple of Time Light Arrow Cutscene': ("the #final gift of a princess# is", None, 'exclude'), 'LW Gift from Saria': (["a #potato hoarder# holds", "a rooty tooty #flutey cutey# gifts"], "#Saria's Gift# is", 'exclude'), - 'ZF Great Fairy Reward': ("the #fairy of winds# holds", None, 'exclude'), - 'Colossus Great Fairy Reward': ("the #fairy of love# holds", None, 'exclude'), - 'DMT Great Fairy Reward': ("a #magical fairy# gifts", None, 'exclude'), - 'DMC Great Fairy Reward': ("a #magical fairy# gifts", None, 'exclude'), + 'ZF Great Fairy Fountain Reward': ("the #fairy of winds# holds", None, 'exclude'), + 'Colossus Great Fairy Fountain Reward': ("the #fairy of love# holds", None, 'exclude'), + 'DMT Great Fairy Fountain Reward': ("a #magical fairy# gifts", None, 'exclude'), + 'DMC Great Fairy Fountain Reward': ("a #magical fairy# gifts", None, 'exclude'), 'Song from Impa': ("#deep in a castle#, Impa teaches", None, 'exclude'), 'Song from Malon': ("#a farm girl# sings", None, 'exclude'), @@ -733,22 +733,22 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'HC Malon Egg': ("a #girl looking for her father# gives", None, 'exclude'), 'HC Zeldas Letter': ("a #princess in a castle# gifts", None, 'exclude'), 'ZD Diving Minigame': ("an #unsustainable business model# gifts", "those who #dive for Zora rupees# will find", 'exclude'), - 'LH Child Fishing': ("#fishing in youth# bestows", None, 'exclude'), - 'LH Adult Fishing': ("#fishing in maturity# bestows", None, 'exclude'), - 'LH Loach Fishing': ("#catching the legendary fish# bestows", None, 'exclude'), + 'LH Fishing Hole Child Reward': ("#fishing in youth# bestows", None, 'exclude'), + 'LH Fishing Hole Adult Reward': ("#fishing in maturity# bestows", None, 'exclude'), + 'LH Fishing Hole Loach Reward': ("#catching the legendary fish# bestows", None, 'exclude'), 'GC Rolling Goron as Adult': ("#comforting yourself# provides", "#reassuring a young Goron# is rewarded with", 'exclude'), 'Market Bombchu Bowling First Prize': ("the #first explosive prize# is", None, 'exclude'), 'Market Bombchu Bowling Second Prize': ("the #second explosive prize# is", None, 'exclude'), 'Market Lost Dog': ("#puppy lovers# will find", "#rescuing Richard the Dog# is rewarded with", 'exclude'), 'LW Ocarina Memory Game': (["the prize for a #game of Simon Says# is", "a #child sing-a-long# holds"], "#playing an Ocarina in Lost Woods# is rewarded with", 'exclude'), - 'Kak 10 Gold Skulltula Reward': (["#10 bug badges# rewards", "#10 spider souls# yields", "#10 auriferous arachnids# lead to"], "slaying #10 Gold Skulltulas# reveals", 'exclude'), + 'Kak House of Skulltula 10 Gold Skulltula Reward': (["#10 bug badges# rewards", "#10 spider souls# yields", "#10 auriferous arachnids# lead to"], "slaying #10 Gold Skulltulas# reveals", 'exclude'), 'Kak Man on Roof': ("a #rooftop wanderer# holds", None, 'exclude'), 'ZR Magic Bean Salesman': ("a seller of #colorful crops# has", "a #bean seller# offers", 'exclude'), 'GF HBA 1000 Points': ("scoring 1000 in #horseback archery# grants", None, 'exclude'), 'Market Shooting Gallery Reward': ("#shooting in youth# grants", None, 'exclude'), 'Kak Shooting Gallery Reward': ("#shooting in maturity# grants", None, 'exclude'), 'Kak Anju as Adult': ("a #chicken caretaker# offers adults", None, 'exclude'), - 'LLR Talons Chickens': ("#finding Super Cuccos# is rewarded with", None, 'exclude'), + 'LLR Talons House Chickens': ("#finding Super Cuccos# is rewarded with", None, 'exclude'), 'GC Rolling Goron as Child': ("the prize offered by a #large rolling Goron# is", None, 'exclude'), 'LH Underwater Item': ("the #sunken treasure in a lake# is", None, 'exclude'), 'Hideout Gerudo Membership Card': ("#rescuing captured carpenters# is rewarded with", None, 'exclude'), @@ -758,8 +758,8 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'Kak Impas House Freestanding PoH': ("#imprisoned in a house# lies", None, 'exclude'), 'HF Tektite Grotto Freestanding PoH': ("#deep underwater in a hole# is", None, 'exclude'), 'Kak Windmill Freestanding PoH': ("on a #windmill ledge# lies", None, 'exclude'), - 'Graveyard Dampe Race Freestanding PoH': ("#racing a ghost# leads to", "#dead Dampé's second# prize is", 'exclude'), - 'LLR Freestanding PoH': ("in a #ranch silo# lies", None, 'exclude'), + 'Graveyard Dampes Grave Freestanding PoH': ("#racing a ghost# leads to", "#dead Dampé's second# prize is", 'exclude'), + 'LLR Tower Freestanding PoH': ("in a #ranch silo# lies", None, 'exclude'), 'Graveyard Freestanding PoH': ("a #crate in a graveyard# hides", None, 'exclude'), 'Graveyard Dampe Gravedigging Tour': ("a #gravekeeper digs up#", None, 'exclude'), 'ZR Near Open Grotto Freestanding PoH': ("on top of a #pillar in a river# lies", None, 'exclude'), @@ -1180,7 +1180,7 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'Ice Cavern MQ GS Ice Block': ("a #web of ice# surrounds a spider with", None, 'exclude'), 'Ice Cavern MQ GS Red Ice': ("a #spider in fiery ice# hoards", None, 'exclude'), - 'HF GS Near Kak Grotto': ("a #spider-guarded spider in a hole# hoards", None, 'exclude'), + 'HF Near Kak Grotto GS': ("a #spider-guarded spider in a hole# hoards", None, 'exclude'), 'LLR GS Back Wall': ("night reveals a #spider in a ranch# holding", None, 'exclude'), 'LLR GS Rain Shed': ("night reveals a #spider in a ranch# holding", None, 'exclude'), @@ -1198,7 +1198,7 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'OGC GS': ("a #spider outside a tyrant's tower# holds", None, 'exclude'), 'HC GS Tree': ("a spider hiding in a #tree outside of a castle# holds", None, 'exclude'), - 'Market GS Guard House': ("a #spider in a guarded crate# holds", None, 'exclude'), + 'Market Guard House GS': ("a #spider in a guarded crate# holds", None, 'exclude'), 'DMC GS Bean Patch': ("a #spider buried in a volcano# holds", None, 'exclude'), @@ -1232,7 +1232,7 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'LH GS Bean Patch': ("a #spider buried by a lake# holds", None, 'exclude'), 'LH GS Small Island': ("night reveals a #spider by a lake# holding", None, 'exclude'), 'LH GS Lab Wall': ("night reveals a #spider by a lake# holding", None, 'exclude'), - 'LH GS Lab Crate': ("a spider deed underwater in a #lab crate# holds", None, 'exclude'), + 'LH Lab GS Crate': ("a spider deed underwater in a #lab crate# holds", None, 'exclude'), 'LH GS Tree': ("night reveals a #spider by a lake high in a tree# holding", None, 'exclude'), 'GV GS Bean Patch': ("a #spider buried in a valley# holds", None, 'exclude'), @@ -1321,23 +1321,23 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'Deku Tree MQ Deku Scrub': ("a #scrub in the Deku Tree# sells", None, 'exclude'), - 'HF Deku Scrub Grotto': ("a lonely #scrub in a hole# sells", None, 'exclude'), - 'LLR Deku Scrub Grotto Left': ("a #trio of scrubs# sells", None, 'exclude'), - 'LLR Deku Scrub Grotto Right': ("a #trio of scrubs# sells", None, 'exclude'), - 'LLR Deku Scrub Grotto Center': ("a #trio of scrubs# sells", None, 'exclude'), + 'HF Inside Fence Grotto Deku Scrub': ("a lonely #scrub in a hole# sells", None, 'exclude'), + 'LLR Grotto Deku Scrub Left': ("a #trio of scrubs# sells", None, 'exclude'), + 'LLR Grotto Deku Scrub Right': ("a #trio of scrubs# sells", None, 'exclude'), + 'LLR Grotto Deku Scrub Center': ("a #trio of scrubs# sells", None, 'exclude'), 'LW Deku Scrub Near Deku Theater Right': ("a pair of #scrubs in the woods# sells", None, 'exclude'), 'LW Deku Scrub Near Deku Theater Left': ("a pair of #scrubs in the woods# sells", None, 'exclude'), 'LW Deku Scrub Near Bridge': ("a #scrub by a bridge# sells", None, 'exclude'), - 'LW Deku Scrub Grotto Rear': ("a #scrub underground duo# sells", None, 'exclude'), - 'LW Deku Scrub Grotto Front': ("a #scrub underground duo# sells", None, 'exclude'), + 'LW Scrubs Grotto Deku Scrub Rear': ("a #scrub underground duo# sells", None, 'exclude'), + 'LW Scrubs Grotto Deku Scrub Front': ("a #scrub underground duo# sells", None, 'exclude'), - 'SFM Deku Scrub Grotto Rear': ("a #scrub underground duo# sells", None, 'exclude'), - 'SFM Deku Scrub Grotto Front': ("a #scrub underground duo# sells", None, 'exclude'), + 'SFM Storms Grotto Deku Scrub Rear': ("a #scrub underground duo# sells", None, 'exclude'), + 'SFM Storms Grotto Deku Scrub Front': ("a #scrub underground duo# sells", None, 'exclude'), - 'GC Deku Scrub Grotto Left': ("a #trio of scrubs# sells", None, 'exclude'), - 'GC Deku Scrub Grotto Right': ("a #trio of scrubs# sells", None, 'exclude'), - 'GC Deku Scrub Grotto Center': ("a #trio of scrubs# sells", None, 'exclude'), + 'GC Grotto Deku Scrub Left': ("a #trio of scrubs# sells", None, 'exclude'), + 'GC Grotto Deku Scrub Right': ("a #trio of scrubs# sells", None, 'exclude'), + 'GC Grotto Deku Scrub Center': ("a #trio of scrubs# sells", None, 'exclude'), 'Dodongos Cavern Deku Scrub Near Bomb Bag Left': ("a pair of #scrubs in Dodongo's Cavern# sells", None, 'exclude'), 'Dodongos Cavern Deku Scrub Side Room Near Dodongos': ("a #scrub guarded by Lizalfos# sells", None, 'exclude'), @@ -1349,24 +1349,24 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'Dodongos Cavern MQ Deku Scrub Staircase': ("a #scrub in Dodongo's Cavern# sells", None, 'exclude'), 'Dodongos Cavern MQ Deku Scrub Side Room Near Lower Lizalfos': ("a #scrub guarded by Lizalfos# sells", None, 'exclude'), - 'DMC Deku Scrub Grotto Left': ("a #trio of scrubs# sells", None, 'exclude'), - 'DMC Deku Scrub Grotto Right': ("a #trio of scrubs# sells", None, 'exclude'), - 'DMC Deku Scrub Grotto Center': ("a #trio of scrubs# sells", None, 'exclude'), + 'DMC Hammer Grotto Deku Scrub Left': ("a #trio of scrubs# sells", None, 'exclude'), + 'DMC Hammer Grotto Deku Scrub Right': ("a #trio of scrubs# sells", None, 'exclude'), + 'DMC Hammer Grotto Deku Scrub Center': ("a #trio of scrubs# sells", None, 'exclude'), - 'ZR Deku Scrub Grotto Rear': ("a #scrub underground duo# sells", None, 'exclude'), - 'ZR Deku Scrub Grotto Front': ("a #scrub underground duo# sells", None, 'exclude'), + 'ZR Storms Grotto Deku Scrub Rear': ("a #scrub underground duo# sells", None, 'exclude'), + 'ZR Storms Grotto Deku Scrub Front': ("a #scrub underground duo# sells", None, 'exclude'), 'Jabu Jabus Belly Deku Scrub': ("a #scrub in a deity# sells", None, 'exclude'), - 'LH Deku Scrub Grotto Left': ("a #trio of scrubs# sells", None, 'exclude'), - 'LH Deku Scrub Grotto Right': ("a #trio of scrubs# sells", None, 'exclude'), - 'LH Deku Scrub Grotto Center': ("a #trio of scrubs# sells", None, 'exclude'), + 'LH Grotto Deku Scrub Left': ("a #trio of scrubs# sells", None, 'exclude'), + 'LH Grotto Deku Scrub Right': ("a #trio of scrubs# sells", None, 'exclude'), + 'LH Grotto Deku Scrub Center': ("a #trio of scrubs# sells", None, 'exclude'), - 'GV Deku Scrub Grotto Rear': ("a #scrub underground duo# sells", None, 'exclude'), - 'GV Deku Scrub Grotto Front': ("a #scrub underground duo# sells", None, 'exclude'), + 'GV Storms Grotto Deku Scrub Rear': ("a #scrub underground duo# sells", None, 'exclude'), + 'GV Storms Grotto Deku Scrub Front': ("a #scrub underground duo# sells", None, 'exclude'), - 'Colossus Deku Scrub Grotto Front': ("a #scrub underground duo# sells", None, 'exclude'), - 'Colossus Deku Scrub Grotto Rear': ("a #scrub underground duo# sells", None, 'exclude'), + 'Colossus Grotto Deku Scrub Front': ("a #scrub underground duo# sells", None, 'exclude'), + 'Colossus Grotto Deku Scrub Rear': ("a #scrub underground duo# sells", None, 'exclude'), 'Ganons Castle Deku Scrub Center-Left': ("#scrubs in Ganon's Castle# sell", None, 'exclude'), 'Ganons Castle Deku Scrub Center-Right': ("#scrubs in Ganon's Castle# sell", None, 'exclude'), @@ -1412,7 +1412,7 @@ def rainbow_bridge_hint_kind(world: World) -> str: 'KF Sarias House': ("Saria's House", None, 'region'), 'KF House of Twins': ("the #House of Twins#", None, 'region'), 'KF Know It All House': ("Know-It-All Brothers' House", None, 'region'), - 'KF Kokiri Shop': ("the #Kokiri Shop#", None, 'region'), + 'KF Shop': ("the #Kokiri Shop#", None, 'region'), 'LH Lab': ("the #Lakeside Laboratory#", None, 'region'), 'LH Fishing Hole': ("the #Fishing Pond#", None, 'region'), 'GV Carpenter Tent': ("the #Carpenters' tent#", None, 'region'), @@ -1766,20 +1766,20 @@ def rainbow_bridge_hint_kind(world: World) -> str: multiTable: dict[str, list[str]] = { 'Deku Theater Rewards': ['Deku Theater Skull Mask', 'Deku Theater Mask of Truth'], 'HF Ocarina of Time Retrieval': ['HF Ocarina of Time Item', 'Song from Ocarina of Time'], - 'HF Valley Grotto': ['HF Cow Grotto Cow', 'HF GS Cow Grotto'], + 'HF Valley Grotto': ['HF Cow Grotto Cow', 'HF Cow Grotto GS'], 'Market Bombchu Bowling Rewards': ['Market Bombchu Bowling First Prize', 'Market Bombchu Bowling Second Prize'], 'ZR Frogs Rewards': ['ZR Frogs in the Rain', 'ZR Frogs Ocarina Game'], 'ZD Child Checks': ['ZD Diving Minigame', 'ZD Chest'], - 'LH Lake Lab Pool': ['LH Lab Dive', 'LH GS Lab Crate'], - 'LH Adult Bean Destination Checks': ['LH Freestanding PoH', 'LH Adult Fishing'], + 'LH Lake Lab Pool': ['LH Lab Dive', 'LH Lab GS Crate'], + 'LH Adult Bean Destination Checks': ['LH Freestanding PoH', 'LH Fishing Hole Adult Reward'], 'GV Pieces of Heart Ledges': ['GV Crate Freestanding PoH', 'GV Waterfall Freestanding PoH'], 'GF Horseback Archery Rewards': ['GF HBA 1000 Points', 'GF HBA 1500 Points'], 'Colossus Nighttime GS': ['Colossus GS Tree', 'Colossus GS Hill'], - 'Graveyard Dampe Race Rewards': ['Graveyard Dampe Race Hookshot Chest', 'Graveyard Dampe Race Freestanding PoH'], + 'Graveyard Dampe Race Rewards': ['Graveyard Dampes Grave Hookshot Chest', 'Graveyard Dampes Grave Freestanding PoH'], 'Graveyard Royal Family Tomb Contents': ['Graveyard Royal Familys Tomb Chest', 'Song from Royal Familys Tomb'], 'DMC Child Upper Checks': ['DMC GS Crate', 'DMC Deku Scrub'], 'Haunted Wasteland Checks': ['Wasteland GS', 'Wasteland Chest'], - 'Castle Fairy Checks': ['HC Great Fairy Reward', 'OGC Great Fairy Reward'], + 'Castle Fairy Checks': ['HC Great Fairy Fountain Reward', 'OGC Great Fairy Fountain Reward'], 'King Zora Items': ['ZD King Zora Thawed', 'ZD Trade Prescription'], 'Deku Tree MQ Basement GS': ['Deku Tree MQ GS Basement Graves Room','Deku Tree MQ GS Basement Back Room'], @@ -1872,35 +1872,35 @@ def rainbow_bridge_hint_kind(world: World) -> str: '10_skulltulas': { 'id': 0x9004, 'hint_location': '10 Skulltulas Reward Hint', - 'item_location': 'Kak 10 Gold Skulltula Reward', + 'item_location': 'Kak House of Skulltula 10 Gold Skulltula Reward', 'location_text': "Yeaaarrgh! I'm cursed!! Please save me by destroying \x05\x4110 Spiders of the Curse\x05\x40 and I will give you \x05\x42{item}\x05\x40.", 'location_fallback': "Yeaaarrgh! I'm cursed!!", }, '20_skulltulas': { 'id': 0x9005, 'hint_location': '20 Skulltulas Reward Hint', - 'item_location': 'Kak 20 Gold Skulltula Reward', + 'item_location': 'Kak House of Skulltula 20 Gold Skulltula Reward', 'location_text': "Yeaaarrgh! I'm cursed!! Please save me by destroying \x05\x4120 Spiders of the Curse\x05\x40 and I will give you \x05\x42{item}\x05\x40.", 'location_fallback': "Yeaaarrgh! I'm cursed!!", }, '30_skulltulas': { 'id': 0x9006, 'hint_location': '30 Skulltulas Reward Hint', - 'item_location': 'Kak 30 Gold Skulltula Reward', + 'item_location': 'Kak House of Skulltula 30 Gold Skulltula Reward', 'location_text': "Yeaaarrgh! I'm cursed!! Please save me by destroying \x05\x4130 Spiders of the Curse\x05\x40 and I will give you \x05\x42{item}\x05\x40.", 'location_fallback': "Yeaaarrgh! I'm cursed!!", }, '40_skulltulas': { 'id': 0x9007, 'hint_location': '40 Skulltulas Reward Hint', - 'item_location': 'Kak 40 Gold Skulltula Reward', + 'item_location': 'Kak House of Skulltula 40 Gold Skulltula Reward', 'location_text': "Yeaaarrgh! I'm cursed!! Please save me by destroying \x05\x4140 Spiders of the Curse\x05\x40 and I will give you \x05\x42{item}\x05\x40.", 'location_fallback': "Yeaaarrgh! I'm cursed!!", }, '50_skulltulas': { 'id': 0x9008, 'hint_location': '50 Skulltulas Reward Hint', - 'item_location': 'Kak 50 Gold Skulltula Reward', + 'item_location': 'Kak House of Skulltula 50 Gold Skulltula Reward', 'location_text': "Yeaaarrgh! I'm cursed!! Please save me by destroying \x05\x4150 Spiders of the Curse\x05\x40 and I will give you \x05\x42{item}\x05\x40.", 'location_fallback': "Yeaaarrgh! I'm cursed!!", }, diff --git a/ItemPool.py b/ItemPool.py index 14a2b9aac4..ba57c3e70e 100644 --- a/ItemPool.py +++ b/ItemPool.py @@ -943,7 +943,7 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]: world.state.collect(ItemFactory('Small Key (Fire Temple)', world)) if world.settings.shuffle_ganon_bosskey == 'on_lacs': - placed_items['ToT Light Arrows Cutscene'] = ItemFactory('Boss Key (Ganons Castle)', world) + placed_items['Temple of Time Light Arrow Cutscene'] = ItemFactory('Boss Key (Ganons Castle)', world) if world.settings.shuffle_ganon_bosskey in ('stones', 'medallions', 'dungeons', 'tokens', 'hearts', 'triforce'): placed_items['Gift from Sages'] = ItemFactory('Boss Key (Ganons Castle)', world) diff --git a/LocationList.py b/LocationList.py index 34635d50b7..728bbdd0e9 100644 --- a/LocationList.py +++ b/LocationList.py @@ -92,10 +92,10 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ## Overworld # Kokiri Forest - ("KF Midos Top Left Chest", ("Chest", 0x28, 0x00, None, 'Rupees (5)', ("Kokiri Forest", "Forest Area", "Chests",))), - ("KF Midos Top Right Chest", ("Chest", 0x28, 0x01, None, 'Rupees (5)', ("Kokiri Forest", "Forest Area", "Chests",))), - ("KF Midos Bottom Left Chest", ("Chest", 0x28, 0x02, None, 'Rupee (1)', ("Kokiri Forest", "Forest Area", "Chests",))), - ("KF Midos Bottom Right Chest", ("Chest", 0x28, 0x03, None, 'Recovery Heart', ("Kokiri Forest", "Forest Area", "Chests",))), + ("KF Midos House Top Left Chest", ("Chest", 0x28, 0x00, None, 'Rupees (5)', ("Kokiri Forest", "Forest Area", "Chests",))), + ("KF Midos House Top Right Chest", ("Chest", 0x28, 0x01, None, 'Rupees (5)', ("Kokiri Forest", "Forest Area", "Chests",))), + ("KF Midos House Bottom Left Chest", ("Chest", 0x28, 0x02, None, 'Rupee (1)', ("Kokiri Forest", "Forest Area", "Chests",))), + ("KF Midos House Bottom Right Chest", ("Chest", 0x28, 0x03, None, 'Recovery Heart', ("Kokiri Forest", "Forest Area", "Chests",))), ("KF Kokiri Sword Chest", ("Chest", 0x55, 0x00, None, 'Kokiri Sword', ("Kokiri Forest", "Forest Area", "Chests",))), ("KF Storms Grotto Chest", ("Chest", 0x3E, 0x0C, None, 'Rupees (20)', ("Kokiri Forest", "Forest Area", "Grottos", "Chests",))), ("KF Links House Cow", ("NPC", 0x34, 0x15, None, 'Milk', ("Kokiri Forest", "Forest Area", "Cows", "Minigames",))), @@ -174,8 +174,8 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("LW Deku Scrub Near Bridge", ("Scrub", 0x5B, 0x77, None, 'Deku Stick Capacity', ("Lost Woods", "Forest Area", "Deku Scrubs", "Deku Scrub Upgrades",))), ("LW Deku Scrub Near Deku Theater Left", ("Scrub", 0x5B, 0x31, None, 'Buy Deku Stick (1)', ("Lost Woods", "Forest Area", "Deku Scrubs",))), ("LW Deku Scrub Near Deku Theater Right", ("Scrub", 0x5B, 0x30, None, 'Buy Deku Nut (5)', ("Lost Woods", "Forest Area", "Deku Scrubs",))), - ("LW Deku Scrub Grotto Front", ("GrottoScrub", 0xF5, 0x79, None, 'Deku Nut Capacity', ("Lost Woods", "Forest Area", "Deku Scrubs", "Deku Scrub Upgrades", "Grottos",))), - ("LW Deku Scrub Grotto Rear", ("GrottoScrub", 0xF5, 0x33, None, 'Buy Deku Seeds (30)', ("Lost Woods", "Forest Area", "Deku Scrubs", "Grottos",))), + ("LW Scrubs Grotto Deku Scrub Front", ("GrottoScrub", 0xF5, 0x79, None, 'Deku Nut Capacity', ("Lost Woods", "Forest Area", "Deku Scrubs", "Deku Scrub Upgrades", "Grottos",))), + ("LW Scrubs Grotto Deku Scrub Rear", ("GrottoScrub", 0xF5, 0x33, None, 'Buy Deku Seeds (30)', ("Lost Woods", "Forest Area", "Deku Scrubs", "Grottos",))), ("LW GS Bean Patch Near Bridge", ("GS Token", 0x0D, 0x01, None, 'Gold Skulltula Token', ("Lost Woods", "Forest Area", "Gold Skulltulas",))), ("LW GS Bean Patch Near Theater", ("GS Token", 0x0D, 0x02, None, 'Gold Skulltula Token', ("Lost Woods", "Forest Area", "Gold Skulltulas",))), ("LW GS Above Theater", ("GS Token", 0x0D, 0x04, None, 'Gold Skulltula Token', ("Lost Woods", "Forest Area", "Gold Skulltulas",))), @@ -200,8 +200,8 @@ def shop_address(shop_id: int, shelf_id: int) -> int: # Sacred Forest Meadow ("SFM Wolfos Grotto Chest", ("Chest", 0x3E, 0x11, None, 'Rupees (50)', ("Sacred Forest Meadow", "Forest Area", "Grottos", "Chests",))), - ("SFM Deku Scrub Grotto Front", ("GrottoScrub", 0xEE, 0x3A, None, 'Buy Green Potion', ("Sacred Forest Meadow", "Forest Area", "Deku Scrubs", "Grottos",))), - ("SFM Deku Scrub Grotto Rear", ("GrottoScrub", 0xEE, 0x39, None, 'Buy Red Potion for 30 Rupees', ("Sacred Forest Meadow", "Forest Area", "Deku Scrubs", "Grottos",))), + ("SFM Storms Grotto Deku Scrub Front", ("GrottoScrub", 0xEE, 0x3A, None, 'Buy Green Potion', ("Sacred Forest Meadow", "Forest Area", "Deku Scrubs", "Grottos",))), + ("SFM Storms Grotto Deku Scrub Rear", ("GrottoScrub", 0xEE, 0x39, None, 'Buy Red Potion for 30 Rupees', ("Sacred Forest Meadow", "Forest Area", "Deku Scrubs", "Grottos",))), ("SFM GS", ("GS Token", 0x0D, 0x08, None, 'Gold Skulltula Token', ("Sacred Forest Meadow", "Forest Area", "Gold Skulltulas",))), # Sacred Forest Meadow Beehives ("SFM Storms Grotto Beehive", ("Beehive", 0x3E, (9,0x0E,3), None, 'Rupees (20)', ("Sacred Forest Meadow", "Forest Area", "Grottos", "Beehives",))), @@ -227,10 +227,10 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("HF Tektite Grotto Freestanding PoH", ("Collectable", 0x3E, 0x01, None, 'Piece of Heart', ("Hyrule Field", "Grottos", "Freestandings",))), ("HF Southeast Grotto Chest", ("Chest", 0x3E, 0x02, None, 'Rupees (20)', ("Hyrule Field", "Grottos", "Chests",))), ("HF Open Grotto Chest", ("Chest", 0x3E, 0x03, None, 'Rupees (5)', ("Hyrule Field", "Grottos", "Chests",))), - ("HF Deku Scrub Grotto", ("GrottoScrub", 0xE6, 0x3E, None, 'Piece of Heart', ("Hyrule Field", "Deku Scrubs", "Deku Scrub Upgrades", "Grottos",))), + ("HF Inside Fence Grotto Deku Scrub", ("GrottoScrub", 0xE6, 0x3E, None, 'Piece of Heart', ("Hyrule Field", "Deku Scrubs", "Deku Scrub Upgrades", "Grottos",))), ("HF Cow Grotto Cow", ("NPC", 0x3E, 0x16, None, 'Milk', ("Hyrule Field", "Cows", "Grottos",))), - ("HF GS Cow Grotto", ("GS Token", 0x0A, 0x01, None, 'Gold Skulltula Token', ("Hyrule Field", "Gold Skulltulas", "Grottos",))), - ("HF GS Near Kak Grotto", ("GS Token", 0x0A, 0x02, None, 'Gold Skulltula Token', ("Hyrule Field", "Gold Skulltulas", "Grottos",))), + ("HF Cow Grotto GS", ("GS Token", 0x0A, 0x01, None, 'Gold Skulltula Token', ("Hyrule Field", "Gold Skulltulas", "Grottos",))), + ("HF Near Kak Grotto GS", ("GS Token", 0x0A, 0x02, None, 'Gold Skulltula Token', ("Hyrule Field", "Gold Skulltulas", "Grottos",))), # Hyrule Field Pots ("HF Cow Grotto Pot 1", ("Pot", 0x3E, (4,4,6), None, 'Deku Nuts (5)', ("Hyrule Field", "Grottos", "Pots",))), ("HF Cow Grotto Pot 2", ("Pot", 0x3E, (4,4,8), None, 'Rupees (5)', ("Hyrule Field", "Grottos", "Pots",))), @@ -266,8 +266,8 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("Market Treasure Chest Game Room 5 Bottom", ("Chest", 0x10, 0x08, None, 'Rupees (Treasure Chest Game) (20)', ("Market", "Minigames", "Chests",))), ("Market Treasure Chest Game Room 5 Top", ("Chest", 0x10, 0x09, None, 'Small Key (Treasure Chest Game)', ("Market", "Minigames", "Chests",))), ("Market Treasure Chest Game Reward", ("Chest", 0x10, 0x0A, None, 'Piece of Heart (Treasure Chest Game)', ("Market", "Minigames", "Chests",))), - ("Market 10 Big Poes", ("NPC", 0x4D, 0x0F, None, 'Bottle', ("Market", "NPCs",))), - ("Market GS Guard House", ("GS Token", 0x0E, 0x08, None, 'Gold Skulltula Token', ("Market", "Gold Skulltulas",))), + ("Market Guard House 10 Big Poes", ("NPC", 0x4D, 0x0F, None, 'Bottle', ("Market", "NPCs",))), + ("Market Guard House GS", ("GS Token", 0x0E, 0x08, None, 'Gold Skulltula Token', ("Market", "Gold Skulltulas",))), ("Market Mask Shop Item 1", ("MaskShop", 0x33, 0x53, (shop_address(10, 0), None), 'Gerudo Mask', ("Market", "Shops"))), ("Market Mask Shop Item 2", ("MaskShop", 0x33, 0x52, (shop_address(10, 1), None), 'Zora Mask', ("Market", "Shops"))), ("Market Mask Shop Item 3", ("MaskShop", 0x33, 0x1C, (shop_address(10, 2), None), 'Mask of Truth', ("Market", "Shops"))), @@ -301,7 +301,7 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("Market Bombchu Shop Item 7", ("Shop", 0x32, 0x36, (shop_address(2, 6), None), 'Buy Bombchu (20)', ("Market", "Shops",))), ("Market Bombchu Shop Item 8", ("Shop", 0x32, 0x37, (shop_address(2, 7), None), 'Buy Bombchu (20)', ("Market", "Shops",))), - ("ToT Light Arrows Cutscene", ("Cutscene", 0xFF, 0x01, None, 'Light Arrows', ("Temple of Time", "NPCs",))), + ("Temple of Time Light Arrow Cutscene", ("Cutscene", 0xFF, 0x01, None, 'Light Arrows', ("Temple of Time", "NPCs",))), # Market Pots/Crates ("Market Night Red Rupee Crate", ("Crate", 0x21, (0,0,23), None, 'Rupees (20)', ("Market", "Crates",))), ("Market Night Green Rupee Crate 1", ("Crate", 0x21, (0,0,24), None, 'Rupee (1)', ("Market", "Crates",))), @@ -390,9 +390,9 @@ def shop_address(shop_id: int, shelf_id: int) -> int: # Hyrule Castle ("HC Malon Egg", ("NPC", 0x5F, 0x47, None, 'Weird Egg', ("Hyrule Castle", "NPCs",))), ("HC Zeldas Letter", ("NPC", 0x4A, 0x0B, None, 'Zeldas Letter', ("Hyrule Castle", "NPCs",))), - ("HC Great Fairy Reward", ("Cutscene", 0xFF, 0x11, None, 'Dins Fire', ("Hyrule Castle", "Great Fairies",))), + ("HC Great Fairy Fountain Reward", ("Cutscene", 0xFF, 0x11, None, 'Dins Fire', ("Hyrule Castle", "Great Fairies",))), ("HC GS Tree", ("GS Token", 0x0E, 0x04, None, 'Gold Skulltula Token', ("Hyrule Castle", "Gold Skulltulas",))), - ("HC GS Storms Grotto", ("GS Token", 0x0E, 0x02, None, 'Gold Skulltula Token', ("Hyrule Castle", "Gold Skulltulas", "Grottos",))), + ("HC Storms Grotto GS", ("GS Token", 0x0E, 0x02, None, 'Gold Skulltula Token', ("Hyrule Castle", "Gold Skulltulas", "Grottos",))), ("HC Storms Grotto Pot 1", ("Pot", 0x3E, (8,0x16,7), None, 'Rupees (20)', ("Hyrule Castle", "Grottos", "Pots",))), ("HC Storms Grotto Pot 2", ("Pot", 0x3E, (8,0x16,8), None, 'Bombs (5)', ("Hyrule Castle", "Grottos", "Pots",))), ("HC Storms Grotto Pot 3", ("Pot", 0x3E, (8,0x16,10), None, 'Arrows (5)', ("Hyrule Castle", "Grottos", "Pots",))), @@ -413,11 +413,11 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("HC Castle Moat Wonderitem 10", ("Wonderitem", 0x5F, (0,0,42), None, 'Rupee (1)', ("Hyrule Castle", "Wonderitem"))), ("HC Zeldas Courtyard Mario Wonderitem", ("Wonderitem", 0x4A, (0,0,6), None, 'Rupees (20)', ("Hyrule Castle", "Wonderitem"))), - ("LLR Talons Chickens", ("NPC", 0x4C, 0x14, None, 'Bottle with Milk', ("Lon Lon Ranch", "Minigames",))), - ("LLR Freestanding PoH", ("Collectable", 0x4C, 0x01, None, 'Piece of Heart', ("Lon Lon Ranch", "Freestandings",))), - ("LLR Deku Scrub Grotto Left", ("GrottoScrub", 0xFC, 0x30, None, 'Buy Deku Nut (5)', ("Lon Lon Ranch", "Deku Scrubs", "Grottos",))), - ("LLR Deku Scrub Grotto Center", ("GrottoScrub", 0xFC, 0x33, None, 'Buy Deku Seeds (30)', ("Lon Lon Ranch", "Deku Scrubs", "Grottos",))), - ("LLR Deku Scrub Grotto Right", ("GrottoScrub", 0xFC, 0x37, None, 'Buy Bombs (5) for 35 Rupees', ("Lon Lon Ranch", "Deku Scrubs", "Grottos",))), + ("LLR Talons House Chickens", ("NPC", 0x4C, 0x14, None, 'Bottle with Milk', ("Lon Lon Ranch", "Minigames",))), + ("LLR Tower Freestanding PoH", ("Collectable", 0x4C, 0x01, None, 'Piece of Heart', ("Lon Lon Ranch", "Freestandings",))), + ("LLR Grotto Deku Scrub Left", ("GrottoScrub", 0xFC, 0x30, None, 'Buy Deku Nut (5)', ("Lon Lon Ranch", "Deku Scrubs", "Grottos",))), + ("LLR Grotto Deku Scrub Center", ("GrottoScrub", 0xFC, 0x33, None, 'Buy Deku Seeds (30)', ("Lon Lon Ranch", "Deku Scrubs", "Grottos",))), + ("LLR Grotto Deku Scrub Right", ("GrottoScrub", 0xFC, 0x37, None, 'Buy Bombs (5) for 35 Rupees', ("Lon Lon Ranch", "Deku Scrubs", "Grottos",))), ("LLR Stables Left Cow", ("NPC", 0x36, 0x15, None, 'Milk', ("Lon Lon Ranch", "Cows",))), ("LLR Stables Right Cow", ("NPC", 0x36, 0x16, None, 'Milk', ("Lon Lon Ranch", "Cows",))), ("LLR Tower Left Cow", ("NPC", 0x4C, 0x16, None, 'Milk', ("Lon Lon Ranch", "Cows",))), @@ -457,19 +457,19 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("Kak Anju as Child", ("NPC", 0x52, 0x0F, None, 'Bottle', ("Kakariko Village", "Minigames",))), ("Kak Anju as Adult", ("NPC", 0x52, 0x1D, None, 'Pocket Egg', ("Kakariko Village", "NPCs",))), ("Kak Anju Trade Pocket Cucco", ("NPC", 0x52, 0x0E, None, 'Cojiro', ("Kakariko Village", "Kakariko",))), - ("Kak Granny Trade Odd Mushroom", ("NPC", 0x4E, 0x20, None, 'Odd Potion', ("Kakariko Village", "Kakariko",))), - ("Kak Granny Buy Blue Potion", ("NPC", 0x4E, 0x12, None, 'Blue Potion', ("Kakariko Village", "Kakariko",))), + ("Kak Odd Medicine Building Trade Odd Mushroom", ("NPC", 0x4E, 0x20, None, 'Odd Potion', ("Kakariko Village", "Kakariko",))), + ("Kak Odd Medicine Building Buy Blue Potion", ("NPC", 0x4E, 0x12, None, 'Blue Potion', ("Kakariko Village", "Kakariko",))), ("Kak Impas House Freestanding PoH", ("Collectable", 0x37, 0x01, None, 'Piece of Heart', ("Kakariko Village", "Freestandings",))), ("Kak Windmill Freestanding PoH", ("Collectable", 0x48, 0x01, None, 'Piece of Heart', ("Kakariko Village", "Freestandings",))), ("Kak Man on Roof", ("NPC", 0x52, 0x3E, None, 'Piece of Heart', ("Kakariko Village", "NPCs",))), ("Kak Open Grotto Chest", ("Chest", 0x3E, 0x08, None, 'Rupees (20)', ("Kakariko Village", "Grottos", "Chests",))), ("Kak Redead Grotto Chest", ("Chest", 0x3E, 0x0A, None, 'Rupees (200)', ("Kakariko Village", "Grottos", "Chests",))), ("Kak Shooting Gallery Reward", ("NPC", 0x42, 0x30, None, 'Bow', ("Kakariko Village", "Minigames",))), - ("Kak 10 Gold Skulltula Reward", ("NPC", 0x50, 0x45, None, 'Progressive Wallet', ("Kakariko Village", "Skulltula House", "NPCs",))), - ("Kak 20 Gold Skulltula Reward", ("NPC", 0x50, 0x39, None, 'Stone of Agony', ("Kakariko Village", "Skulltula House", "NPCs",))), - ("Kak 30 Gold Skulltula Reward", ("NPC", 0x50, 0x46, None, 'Progressive Wallet', ("Kakariko Village", "Skulltula House", "NPCs",))), - ("Kak 40 Gold Skulltula Reward", ("NPC", 0x50, 0x03, None, 'Bombchus (10)', ("Kakariko Village", "Skulltula House", "NPCs",))), - ("Kak 50 Gold Skulltula Reward", ("NPC", 0x50, 0x3E, None, 'Piece of Heart', ("Kakariko Village", "Skulltula House", "NPCs",))), + ("Kak House of Skulltula 10 Gold Skulltula Reward", ("NPC", 0x50, 0x45, None, 'Progressive Wallet', ("Kakariko Village", "Skulltula House", "NPCs",))), + ("Kak House of Skulltula 20 Gold Skulltula Reward", ("NPC", 0x50, 0x39, None, 'Stone of Agony', ("Kakariko Village", "Skulltula House", "NPCs",))), + ("Kak House of Skulltula 30 Gold Skulltula Reward", ("NPC", 0x50, 0x46, None, 'Progressive Wallet', ("Kakariko Village", "Skulltula House", "NPCs",))), + ("Kak House of Skulltula 40 Gold Skulltula Reward", ("NPC", 0x50, 0x03, None, 'Bombchus (10)', ("Kakariko Village", "Skulltula House", "NPCs",))), + ("Kak House of Skulltula 50 Gold Skulltula Reward", ("NPC", 0x50, 0x3E, None, 'Piece of Heart', ("Kakariko Village", "Skulltula House", "NPCs",))), ("Kak Impas House Cow", ("NPC", 0x37, 0x15, None, 'Milk', ("Kakariko Village", "Cows",))), ("Kak GS Tree", ("GS Token", 0x10, 0x20, None, 'Gold Skulltula Token', ("Kakariko Village", "Gold Skulltulas",))), ("Kak GS Near Gate Guard", ("GS Token", 0x10, 0x02, None, 'Gold Skulltula Token', ("Kakariko Village", "Gold Skulltulas",))), @@ -538,50 +538,50 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("Graveyard Royal Familys Tomb Chest", ("Chest", 0x41, 0x00, None, 'Bombs (5)', ("Graveyard", "Grottos", "Chests",))), ("Graveyard Freestanding PoH", ("Collectable", 0x53, 0x04, None, 'Piece of Heart', ("Graveyard", "Freestandings",))), ("Graveyard Dampe Gravedigging Tour", ("Collectable", 0x53, 0x08, None, 'Piece of Heart', ("Graveyard", "Minigames",))), - ("Graveyard Dampe Race Hookshot Chest", ("Chest", 0x48, 0x00, None, 'Progressive Hookshot', ("Graveyard", "Grottos", "Minigames", "Chests",))), - ("Graveyard Dampe Race Freestanding PoH", ("Collectable", 0x48, 0x07, None, 'Piece of Heart', ("Graveyard", "Grottos", "Minigames", "Freestandings",))), + ("Graveyard Dampes Grave Hookshot Chest", ("Chest", 0x48, 0x00, None, 'Progressive Hookshot', ("Graveyard", "Grottos", "Minigames", "Chests",))), + ("Graveyard Dampes Grave Freestanding PoH", ("Collectable", 0x48, 0x07, None, 'Piece of Heart', ("Graveyard", "Grottos", "Minigames", "Freestandings",))), ("Graveyard GS Bean Patch", ("GS Token", 0x10, 0x01, None, 'Gold Skulltula Token', ("Graveyard", "Gold Skulltulas",))), ("Graveyard GS Wall", ("GS Token", 0x10, 0x80, None, 'Gold Skulltula Token', ("Graveyard", "Gold Skulltulas",))), # Graveyard Freestanding - ("Graveyard Dampe Race Rupee 1", ("Freestanding", 0x48, (1,0,1), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), - ("Graveyard Dampe Race Rupee 2", ("Freestanding", 0x48, (1,0,2), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), - ("Graveyard Dampe Race Rupee 3", ("Freestanding", 0x48, (1,0,3), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), - ("Graveyard Dampe Race Rupee 4", ("Freestanding", 0x48, (2,0,1), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), - ("Graveyard Dampe Race Rupee 5", ("Freestanding", 0x48, (2,0,2), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), - ("Graveyard Dampe Race Rupee 6", ("Freestanding", 0x48, (2,0,3), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), - ("Graveyard Dampe Race Rupee 7", ("Freestanding", 0x48, (3,0,1), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), - ("Graveyard Dampe Race Rupee 8", ("Freestanding", 0x48, (3,0,2), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), + ("Graveyard Dampes Grave Rupee 1", ("Freestanding", 0x48, (1,0,1), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), + ("Graveyard Dampes Grave Rupee 2", ("Freestanding", 0x48, (1,0,2), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), + ("Graveyard Dampes Grave Rupee 3", ("Freestanding", 0x48, (1,0,3), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), + ("Graveyard Dampes Grave Rupee 4", ("Freestanding", 0x48, (2,0,1), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), + ("Graveyard Dampes Grave Rupee 5", ("Freestanding", 0x48, (2,0,2), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), + ("Graveyard Dampes Grave Rupee 6", ("Freestanding", 0x48, (2,0,3), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), + ("Graveyard Dampes Grave Rupee 7", ("Freestanding", 0x48, (3,0,1), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), + ("Graveyard Dampes Grave Rupee 8", ("Freestanding", 0x48, (3,0,2), None, 'Rupee (1)', ("Graveyard", "Grottos", "Freestandings",))), # Graveyard Pots/Crates ("Graveyard Freestanding PoH Crate", ("Crate", 0x53, [(1,0,22),(1,1,24),(1,2,34),(1,3,34)],None,'Nothing', ("Graveyard", "Crates"))), - ("Graveyard Dampe Pot 1", ("Pot", 0x48, (0,0,1), None, 'Recovery Heart', ("Graveyard", "Grottos", "Pots",))), - ("Graveyard Dampe Pot 2", ("Pot", 0x48, (0,0,2), None, 'Deku Nuts (5)', ("Graveyard", "Grottos", "Pots",))), - ("Graveyard Dampe Pot 3", ("Pot", 0x48, (0,0,3), None, 'Bombs (5)', ("Graveyard", "Grottos", "Pots",))), - ("Graveyard Dampe Pot 4", ("Pot", 0x48, (0,0,4), None, 'Arrows (10)', ("Graveyard", "Grottos", "Pots",))), - ("Graveyard Dampe Pot 5", ("Pot", 0x48, (0,0,5), None, 'Rupees (20)', ("Graveyard", "Grottos", "Pots",))), - ("Graveyard Dampe Pot 6", ("Pot", 0x48, (0,0,6), None, 'Rupees (20)', ("Graveyard", "Grottos", "Pots",))), + ("Graveyard Dampes Grave Pot 1", ("Pot", 0x48, (0,0,1), None, 'Recovery Heart', ("Graveyard", "Grottos", "Pots",))), + ("Graveyard Dampes Grave Pot 2", ("Pot", 0x48, (0,0,2), None, 'Deku Nuts (5)', ("Graveyard", "Grottos", "Pots",))), + ("Graveyard Dampes Grave Pot 3", ("Pot", 0x48, (0,0,3), None, 'Bombs (5)', ("Graveyard", "Grottos", "Pots",))), + ("Graveyard Dampes Grave Pot 4", ("Pot", 0x48, (0,0,4), None, 'Arrows (10)', ("Graveyard", "Grottos", "Pots",))), + ("Graveyard Dampes Grave Pot 5", ("Pot", 0x48, (0,0,5), None, 'Rupees (20)', ("Graveyard", "Grottos", "Pots",))), + ("Graveyard Dampes Grave Pot 6", ("Pot", 0x48, (0,0,6), None, 'Rupees (20)', ("Graveyard", "Grottos", "Pots",))), # Graveyard Wonderitems - ("Graveyard Dampe Race Wonderitem 1", ("Wonderitem", 0x48, (1,0,6), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 2", ("Wonderitem", 0x48, (1,0,7), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 3", ("Wonderitem", 0x48, (1,0,8), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 4", ("Wonderitem", 0x48, (1,0,9), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 5", ("Wonderitem", 0x48, (1,0,10), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 6", ("Wonderitem", 0x48, (2,0,8), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 7", ("Wonderitem", 0x48, (2,0,9), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 8", ("Wonderitem", 0x48, (2,0,10), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 9", ("Wonderitem", 0x48, (2,0,11), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 10", ("Wonderitem", 0x48, (2,0,12), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 11", ("Wonderitem", 0x48, (3,0,9), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 12", ("Wonderitem", 0x48, (3,0,10), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 13", ("Wonderitem", 0x48, (3,0,11), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 14", ("Wonderitem", 0x48, (3,0,12), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), - ("Graveyard Dampe Race Wonderitem 15", ("Wonderitem", 0x48, (3,0,13), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 1", ("Wonderitem", 0x48, (1,0,6), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 2", ("Wonderitem", 0x48, (1,0,7), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 3", ("Wonderitem", 0x48, (1,0,8), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 4", ("Wonderitem", 0x48, (1,0,9), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 5", ("Wonderitem", 0x48, (1,0,10), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 6", ("Wonderitem", 0x48, (2,0,8), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 7", ("Wonderitem", 0x48, (2,0,9), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 8", ("Wonderitem", 0x48, (2,0,10), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 9", ("Wonderitem", 0x48, (2,0,11), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 10", ("Wonderitem", 0x48, (2,0,12), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 11", ("Wonderitem", 0x48, (3,0,9), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 12", ("Wonderitem", 0x48, (3,0,10), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 13", ("Wonderitem", 0x48, (3,0,11), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 14", ("Wonderitem", 0x48, (3,0,12), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), + ("Graveyard Dampes Grave Wonderitem 15", ("Wonderitem", 0x48, (3,0,13), None, 'Rupees (5)', ("Graveyard", "Grottos", "Wonderitem"))), # Death Mountain Trail ("DMT Freestanding PoH", ("Collectable", 0x60, 0x1E, None, 'Piece of Heart', ("Death Mountain Trail", "Freestandings",))), ("DMT Chest", ("Chest", 0x60, 0x01, None, 'Rupees (50)', ("Death Mountain Trail", "Chests",))), ("DMT Storms Grotto Chest", ("Chest", 0x3E, 0x17, None, 'Rupees (200)', ("Death Mountain Trail", "Grottos", "Chests",))), - ("DMT Great Fairy Reward", ("Cutscene", 0xFF, 0x13, None, 'Magic Meter', ("Death Mountain Trail", "Great Fairies",))), + ("DMT Great Fairy Fountain Reward", ("Cutscene", 0xFF, 0x13, None, 'Magic Meter', ("Death Mountain Trail", "Great Fairies",))), ("DMT Biggoron", ("NPC", 0x60, 0x57, None, 'Biggoron Sword', ("Death Mountain Trail", "NPCs",))), ("DMT Trade Broken Sword", ("NPC", 0x60, 0x23, None, 'Prescription', ("Death Mountain Trail", "Death Mountain",))), ("DMT Trade Eyedrops", ("NPC", 0x60, 0x26, None, 'Claim Check', ("Death Mountain Trail", "Death Mountain",))), @@ -618,9 +618,9 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("GC Maze Left Chest", ("Chest", 0x62, 0x00, None, 'Rupees (200)', ("Goron City", "Chests",))), ("GC Maze Center Chest", ("Chest", 0x62, 0x02, None, 'Rupees (50)', ("Goron City", "Chests",))), ("GC Maze Right Chest", ("Chest", 0x62, 0x01, None, 'Rupees (50)', ("Goron City", "Chests",))), - ("GC Deku Scrub Grotto Left", ("GrottoScrub", 0xFB, 0x30, None, 'Buy Deku Nut (5)', ("Goron City", "Deku Scrubs", "Grottos",))), - ("GC Deku Scrub Grotto Center", ("GrottoScrub", 0xFB, 0x33, None, 'Buy Arrows (30)', ("Goron City", "Deku Scrubs", "Grottos",))), - ("GC Deku Scrub Grotto Right", ("GrottoScrub", 0xFB, 0x37, None, 'Buy Bombs (5) for 35 Rupees', ("Goron City", "Deku Scrubs", "Grottos",))), + ("GC Grotto Deku Scrub Left", ("GrottoScrub", 0xFB, 0x30, None, 'Buy Deku Nut (5)', ("Goron City", "Deku Scrubs", "Grottos",))), + ("GC Grotto Deku Scrub Center", ("GrottoScrub", 0xFB, 0x33, None, 'Buy Arrows (30)', ("Goron City", "Deku Scrubs", "Grottos",))), + ("GC Grotto Deku Scrub Right", ("GrottoScrub", 0xFB, 0x37, None, 'Buy Bombs (5) for 35 Rupees', ("Goron City", "Deku Scrubs", "Grottos",))), ("GC GS Center Platform", ("GS Token", 0x0F, 0x20, None, 'Gold Skulltula Token', ("Goron City", "Gold Skulltulas",))), ("GC GS Boulder Maze", ("GS Token", 0x0F, 0x40, None, 'Gold Skulltula Token', ("Goron City", "Gold Skulltulas",))), ("GC Shop Item 1", ("Shop", 0x2E, 0x30, (shop_address(8, 0), None), 'Buy Bombs (5) for 25 Rupees', ("Goron City", "Shops",))), @@ -657,11 +657,11 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("DMC Volcano Freestanding PoH", ("Collectable", 0x61, 0x08, None, 'Piece of Heart', ("Death Mountain Crater", "Freestandings",))), ("DMC Wall Freestanding PoH", ("Collectable", 0x61, 0x02, None, 'Piece of Heart', ("Death Mountain Crater", "Freestandings",))), ("DMC Upper Grotto Chest", ("Chest", 0x3E, 0x1A, None, 'Bombs (20)', ("Death Mountain Crater", "Grottos", "Chests",))), - ("DMC Great Fairy Reward", ("Cutscene", 0xFF, 0x14, None, 'Magic Meter', ("Death Mountain Crater", "Great Fairies",))), + ("DMC Great Fairy Fountain Reward", ("Cutscene", 0xFF, 0x14, None, 'Magic Meter', ("Death Mountain Crater", "Great Fairies",))), ("DMC Deku Scrub", ("Scrub", 0x61, 0x37, None, 'Buy Bombs (5) for 35 Rupees', ("Death Mountain Crater", "Deku Scrubs",))), - ("DMC Deku Scrub Grotto Left", ("GrottoScrub", 0xF9, 0x30, None, 'Buy Deku Nut (5)', ("Death Mountain Crater", "Deku Scrubs", "Grottos",))), - ("DMC Deku Scrub Grotto Center", ("GrottoScrub", 0xF9, 0x33, None, 'Buy Arrows (30)', ("Death Mountain Crater", "Deku Scrubs", "Grottos",))), - ("DMC Deku Scrub Grotto Right", ("GrottoScrub", 0xF9, 0x37, None, 'Buy Bombs (5) for 35 Rupees', ("Death Mountain Crater", "Deku Scrubs", "Grottos",))), + ("DMC Hammer Grotto Deku Scrub Left", ("GrottoScrub", 0xF9, 0x30, None, 'Buy Deku Nut (5)', ("Death Mountain Crater", "Deku Scrubs", "Grottos",))), + ("DMC Hammer Grotto Deku Scrub Center", ("GrottoScrub", 0xF9, 0x33, None, 'Buy Arrows (30)', ("Death Mountain Crater", "Deku Scrubs", "Grottos",))), + ("DMC Hammer Grotto Deku Scrub Right", ("GrottoScrub", 0xF9, 0x37, None, 'Buy Bombs (5) for 35 Rupees', ("Death Mountain Crater", "Deku Scrubs", "Grottos",))), ("DMC GS Crate", ("GS Token", 0x0F, 0x80, None, 'Gold Skulltula Token', ("Death Mountain Crater", "Gold Skulltulas",))), ("DMC GS Bean Patch", ("GS Token", 0x0F, 0x01, None, 'Gold Skulltula Token', ("Death Mountain Crater", "Gold Skulltulas",))), # Death Mountain Crater Freestanding @@ -702,8 +702,8 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("ZR Frogs Ocarina Game", ("NPC", 0x54, 0x76, None, 'Piece of Heart', ("Zora's River", "Minigames",))), ("ZR Near Open Grotto Freestanding PoH", ("Collectable", 0x54, 0x04, None, 'Piece of Heart', ("Zora's River", "Freestandings",))), ("ZR Near Domain Freestanding PoH", ("Collectable", 0x54, 0x0B, None, 'Piece of Heart', ("Zora's River", "Freestandings",))), - ("ZR Deku Scrub Grotto Front", ("GrottoScrub", 0xEB, 0x3A, None, 'Buy Green Potion', ("Zora's River", "Deku Scrubs", "Grottos",))), - ("ZR Deku Scrub Grotto Rear", ("GrottoScrub", 0xEB, 0x39, None, 'Buy Red Potion for 30 Rupees', ("Zora's River", "Deku Scrubs", "Grottos",))), + ("ZR Storms Grotto Deku Scrub Front", ("GrottoScrub", 0xEB, 0x3A, None, 'Buy Green Potion', ("Zora's River", "Deku Scrubs", "Grottos",))), + ("ZR Storms Grotto Deku Scrub Rear", ("GrottoScrub", 0xEB, 0x39, None, 'Buy Red Potion for 30 Rupees', ("Zora's River", "Deku Scrubs", "Grottos",))), ("ZR GS Tree", ("GS Token", 0x11, 0x02, None, 'Gold Skulltula Token', ("Zora's River", "Gold Skulltulas",))), ("ZR GS Ladder", ("GS Token", 0x11, 0x01, None, 'Gold Skulltula Token', ("Zora's River", "Gold Skulltulas",))), ("ZR GS Near Raised Grottos", ("GS Token", 0x11, 0x10, None, 'Gold Skulltula Token', ("Zora's River", "Gold Skulltulas",))), @@ -777,7 +777,7 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("ZD Behind King Zora Beehive", ("Beehive", 0x58, (0,0,12), None, 'Rupees (20)', ("Zora's Domain", "Beehives",))), # Zora's Fountain - ("ZF Great Fairy Reward", ("Cutscene", 0xFF, 0x10, None, 'Farores Wind', ("Zora's Fountain", "Great Fairies",))), + ("ZF Great Fairy Fountain Reward", ("Cutscene", 0xFF, 0x10, None, 'Farores Wind', ("Zora's Fountain", "Great Fairies",))), ("ZF Iceberg Freestanding PoH", ("Collectable", 0x59, 0x01, None, 'Piece of Heart', ("Zora's Fountain", "Freestandings",))), ("ZF Bottom Freestanding PoH", ("Collectable", 0x59, 0x14, None, 'Piece of Heart', ("Zora's Fountain", "Freestandings",))), ("ZF GS Above the Log", ("GS Token", 0x11, 0x04, None, 'Gold Skulltula Token', ("Zora's Fountain", "Gold Skulltulas",))), @@ -813,20 +813,20 @@ def shop_address(shop_id: int, shelf_id: int) -> int: # Lake Hylia ("LH Underwater Item", ("NPC", 0x57, 0x15, None, 'Rutos Letter', ("Lake Hylia", "Freestandings",))), - ("LH Child Fishing", ("NPC", 0x49, 0x3E, None, 'Piece of Heart', ("Lake Hylia", "Minigames",))), - ("LH Adult Fishing", ("NPC", 0x49, 0x38, None, 'Progressive Scale', ("Lake Hylia", "Minigames",))), - ("LH Loach Fishing", ("NPC", 0x49, 0x56, None, 'Rupees (50)', ("Lake Hylia", "Minigames"))), + ("LH Fishing Hole Child Reward", ("NPC", 0x49, 0x3E, None, 'Piece of Heart', ("Lake Hylia", "Minigames",))), + ("LH Fishing Hole Adult Reward", ("NPC", 0x49, 0x38, None, 'Progressive Scale', ("Lake Hylia", "Minigames",))), + ("LH Fishing Hole Loach Reward", ("NPC", 0x49, 0x56, None, 'Rupees (50)', ("Lake Hylia", "Minigames"))), ("LH Lab Dive", ("NPC", 0x38, 0x3E, None, 'Piece of Heart', ("Lake Hylia", "NPCs",))), - ("LH Trade Eyeball Frog", ("NPC", 0x38, 0x25, None, 'Eyedrops', ("Lake Hylia",))), + ("LH Lab Trade Eyeball Frog", ("NPC", 0x38, 0x25, None, 'Eyedrops', ("Lake Hylia",))), ("LH Freestanding PoH", ("Collectable", 0x57, 0x1E, None, 'Piece of Heart', ("Lake Hylia", "Freestandings",))), ("LH Sun", ("NPC", 0x57, 0x58, None, 'Fire Arrows', ("Lake Hylia", "Freestandings",))), - ("LH Deku Scrub Grotto Left", ("GrottoScrub", 0xEF, 0x30, None, 'Buy Deku Nut (5)', ("Lake Hylia", "Deku Scrubs", "Grottos",))), - ("LH Deku Scrub Grotto Center", ("GrottoScrub", 0xEF, 0x33, None, 'Buy Deku Seeds (30)', ("Lake Hylia", "Deku Scrubs", "Grottos",))), - ("LH Deku Scrub Grotto Right", ("GrottoScrub", 0xEF, 0x37, None, 'Buy Bombs (5) for 35 Rupees', ("Lake Hylia", "Deku Scrubs", "Grottos",))), + ("LH Grotto Deku Scrub Left", ("GrottoScrub", 0xEF, 0x30, None, 'Buy Deku Nut (5)', ("Lake Hylia", "Deku Scrubs", "Grottos",))), + ("LH Grotto Deku Scrub Center", ("GrottoScrub", 0xEF, 0x33, None, 'Buy Deku Seeds (30)', ("Lake Hylia", "Deku Scrubs", "Grottos",))), + ("LH Grotto Deku Scrub Right", ("GrottoScrub", 0xEF, 0x37, None, 'Buy Bombs (5) for 35 Rupees', ("Lake Hylia", "Deku Scrubs", "Grottos",))), ("LH GS Bean Patch", ("GS Token", 0x12, 0x01, None, 'Gold Skulltula Token', ("Lake Hylia", "Gold Skulltulas",))), ("LH GS Lab Wall", ("GS Token", 0x12, 0x04, None, 'Gold Skulltula Token', ("Lake Hylia", "Gold Skulltulas",))), ("LH GS Small Island", ("GS Token", 0x12, 0x02, None, 'Gold Skulltula Token', ("Lake Hylia", "Gold Skulltulas",))), - ("LH GS Lab Crate", ("GS Token", 0x12, 0x08, None, 'Gold Skulltula Token', ("Lake Hylia", "Gold Skulltulas",))), + ("LH Lab GS Crate", ("GS Token", 0x12, 0x08, None, 'Gold Skulltula Token', ("Lake Hylia", "Gold Skulltulas",))), ("LH GS Tree", ("GS Token", 0x12, 0x10, None, 'Gold Skulltula Token', ("Lake Hylia", "Gold Skulltulas",))), # Lake Hylia Freestanding ("LH Underwater Near Shore Green Rupee", ("Freestanding", 0x57, (0,0,50), None, 'Rupee (1)', ("Lake Hylia", "Freestandings",))), @@ -842,8 +842,8 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("GV Crate Freestanding PoH", ("Collectable", 0x5A, 0x02, None, 'Piece of Heart', ("Gerudo Valley", "Freestandings",))), ("GV Waterfall Freestanding PoH", ("Collectable", 0x5A, 0x01, None, 'Piece of Heart', ("Gerudo Valley", "Freestandings",))), ("GV Chest", ("Chest", 0x5A, 0x00, None, 'Rupees (50)', ("Gerudo Valley", "Chests",))), - ("GV Deku Scrub Grotto Front", ("GrottoScrub", 0xF0, 0x3A, None, 'Buy Green Potion', ("Gerudo Valley", "Deku Scrubs", "Grottos",))), - ("GV Deku Scrub Grotto Rear", ("GrottoScrub", 0xF0, 0x39, None, 'Buy Red Potion for 30 Rupees', ("Gerudo Valley", "Deku Scrubs", "Grottos",))), + ("GV Storms Grotto Deku Scrub Front", ("GrottoScrub", 0xF0, 0x3A, None, 'Buy Green Potion', ("Gerudo Valley", "Deku Scrubs", "Grottos",))), + ("GV Storms Grotto Deku Scrub Rear", ("GrottoScrub", 0xF0, 0x39, None, 'Buy Red Potion for 30 Rupees', ("Gerudo Valley", "Deku Scrubs", "Grottos",))), ("GV Trade Poachers Saw", ("NPC", 0x5A, 0x22, None, 'Broken Sword', ("Gerudo Valley", "Gerudo",))), ("GV Cow", ("NPC", 0x5A, 0x15, None, 'Milk', ("Gerudo Valley", "Cows",))), ("GV GS Small Bridge", ("GS Token", 0x13, 0x02, None, 'Gold Skulltula Token', ("Gerudo Valley", "Gold Skulltulas",))), @@ -969,10 +969,10 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("Wasteland Crate Near Colossus", ("Crate", 0x5E, (1,0,34),None, 'Rupee (1)', ("Haunted Wasteland", "Crates",))), # Desert Colossus - ("Colossus Great Fairy Reward", ("Cutscene", 0xFF, 0x12, None, 'Nayrus Love', ("Desert Colossus", "Great Fairies",))), + ("Colossus Great Fairy Fountain Reward", ("Cutscene", 0xFF, 0x12, None, 'Nayrus Love', ("Desert Colossus", "Great Fairies",))), ("Colossus Freestanding PoH", ("Collectable", 0x5C, 0x0D, None, 'Piece of Heart', ("Desert Colossus", "Freestandings",))), - ("Colossus Deku Scrub Grotto Front", ("GrottoScrub", 0xFD, 0x3A, None, 'Buy Green Potion', ("Desert Colossus", "Deku Scrubs", "Grottos",))), - ("Colossus Deku Scrub Grotto Rear", ("GrottoScrub", 0xFD, 0x39, None, 'Buy Red Potion for 30 Rupees', ("Desert Colossus", "Deku Scrubs", "Grottos",))), + ("Colossus Grotto Deku Scrub Front", ("GrottoScrub", 0xFD, 0x3A, None, 'Buy Green Potion', ("Desert Colossus", "Deku Scrubs", "Grottos",))), + ("Colossus Grotto Deku Scrub Rear", ("GrottoScrub", 0xFD, 0x39, None, 'Buy Red Potion for 30 Rupees', ("Desert Colossus", "Deku Scrubs", "Grottos",))), ("Colossus GS Bean Patch", ("GS Token", 0x15, 0x01, None, 'Gold Skulltula Token', ("Desert Colossus", "Gold Skulltulas",))), ("Colossus GS Tree", ("GS Token", 0x15, 0x08, None, 'Gold Skulltula Token', ("Desert Colossus", "Gold Skulltulas",))), ("Colossus GS Hill", ("GS Token", 0x15, 0x04, None, 'Gold Skulltula Token', ("Desert Colossus", "Gold Skulltulas",))), @@ -987,7 +987,7 @@ def shop_address(shop_id: int, shelf_id: int) -> int: ("Colossus Tree Wonderitem 5", ("Wonderitem", 0x5C, [(0,0,24),(0,2,26)], None, 'Rupees (20)', ("Desert Colossus", "Wonderitem"))), # Outside Ganon's Castle - ("OGC Great Fairy Reward", ("Cutscene", 0xFF, 0x15, None, 'Double Defense', ("Outside Ganon's Castle", "Great Fairies",))), + ("OGC Great Fairy Fountain Reward", ("Cutscene", 0xFF, 0x15, None, 'Double Defense', ("Outside Ganon's Castle", "Great Fairies",))), ("OGC GS", ("GS Token", 0x0E, 0x01, None, 'Gold Skulltula Token', ("Outside Ganon's Castle", "Gold Skulltulas",))), ## Dungeons @@ -2652,3 +2652,92 @@ def location_is_viewable(loc_name: str, correct_chest_appearances: str, fast_che or loc_name in location_groups['CanSee'] or (world is not None and world.bigocto_location() is not None and world.bigocto_location().name == loc_name) ) + + +# Mapping of old location names to current ones for better plando backwards compatibility +LOCATION_ALIASES: dict[str, str] = { + "KF Midos Top Left Chest": "KF Midos House Top Left Chest", + "KF Midos Top Right Chest": "KF Midos House Top Right Chest", + "KF Midos Bottom Left Chest": "KF Midos House Bottom Left Chest", + "KF Midos Bottom Right Chest": "KF Midos House Bottom Right Chest", + "LW Deku Scrub Grotto Front": "LW Scrubs Grotto Deku Scrub Front", + "LW Deku Scrub Grotto Rear": "LW Scrubs Grotto Deku Scrub Rear", + "SFM Deku Scrub Grotto Front": "SFM Storms Grotto Deku Scrub Front", + "SFM Deku Scrub Grotto Rear": "SFM Storms Grotto Deku Scrub Rear", + "HF Deku Scrub Grotto": "HF Inside Fence Grotto Deku Scrub", + "HF GS Cow Grotto": "HF Cow Grotto GS", + "HF GS Near Kak Grotto": "HF Near Kak Grotto GS", + "Market 10 Big Poes": "Market Guard House 10 Big Poes", + "Market GS Guard House": "Market Guard House GS", + "ToT Light Arrows Cutscene": "Temple of Time Light Arrow Cutscene", + "HC Great Fairy Reward": "HC Great Fairy Fountain Reward", + "HC GS Storms Grotto": "HC Storms Grotto GS", + "LLR Talons Chickens": "LLR Talons House Chickens", + "LLR Freestanding PoH": "LLR Tower Freestanding PoH", + "LLR Deku Scrub Grotto Left": "LLR Grotto Deku Scrub Left", + "LLR Deku Scrub Grotto Center": "LLR Grotto Deku Scrub Center", + "LLR Deku Scrub Grotto Right": "LLR Grotto Deku Scrub Right", + "Kak Granny Trade Odd Mushroom": "Kak Odd Medicine Building Trade Odd Mushroom", + "Kak Granny Buy Blue Potion": "Kak Odd Medicine Building Buy Blue Potion", + "Kak 10 Gold Skulltula Reward": "Kak House of Skulltula 10 Gold Skulltula Reward", + "Kak 20 Gold Skulltula Reward": "Kak House of Skulltula 20 Gold Skulltula Reward", + "Kak 30 Gold Skulltula Reward": "Kak House of Skulltula 30 Gold Skulltula Reward", + "Kak 40 Gold Skulltula Reward": "Kak House of Skulltula 40 Gold Skulltula Reward", + "Kak 50 Gold Skulltula Reward": "Kak House of Skulltula 50 Gold Skulltula Reward", + "Graveyard Dampe Race Hookshot Chest": "Graveyard Dampes Grave Hookshot Chest", + "Graveyard Dampe Race Freestanding PoH": "Graveyard Dampes Grave Freestanding PoH", + "Graveyard Dampe Race Rupee 1": "Graveyard Dampes Grave Rupee 1", + "Graveyard Dampe Race Rupee 2": "Graveyard Dampes Grave Rupee 2", + "Graveyard Dampe Race Rupee 3": "Graveyard Dampes Grave Rupee 3", + "Graveyard Dampe Race Rupee 4": "Graveyard Dampes Grave Rupee 4", + "Graveyard Dampe Race Rupee 5": "Graveyard Dampes Grave Rupee 5", + "Graveyard Dampe Race Rupee 6": "Graveyard Dampes Grave Rupee 6", + "Graveyard Dampe Race Rupee 7": "Graveyard Dampes Grave Rupee 7", + "Graveyard Dampe Race Rupee 8": "Graveyard Dampes Grave Rupee 8", + "Graveyard Dampe Pot 1": "Graveyard Dampes Grave Pot 1", + "Graveyard Dampe Pot 2": "Graveyard Dampes Grave Pot 2", + "Graveyard Dampe Pot 3": "Graveyard Dampes Grave Pot 3", + "Graveyard Dampe Pot 4": "Graveyard Dampes Grave Pot 4", + "Graveyard Dampe Pot 5": "Graveyard Dampes Grave Pot 5", + "Graveyard Dampe Pot 6": "Graveyard Dampes Grave Pot 6", + "Graveyard Dampe Race Wonderitem 1": "Graveyard Dampes Grave Wonderitem 1", + "Graveyard Dampe Race Wonderitem 2": "Graveyard Dampes Grave Wonderitem 2", + "Graveyard Dampe Race Wonderitem 3": "Graveyard Dampes Grave Wonderitem 3", + "Graveyard Dampe Race Wonderitem 4": "Graveyard Dampes Grave Wonderitem 4", + "Graveyard Dampe Race Wonderitem 5": "Graveyard Dampes Grave Wonderitem 5", + "Graveyard Dampe Race Wonderitem 6": "Graveyard Dampes Grave Wonderitem 6", + "Graveyard Dampe Race Wonderitem 7": "Graveyard Dampes Grave Wonderitem 7", + "Graveyard Dampe Race Wonderitem 8": "Graveyard Dampes Grave Wonderitem 8", + "Graveyard Dampe Race Wonderitem 9": "Graveyard Dampes Grave Wonderitem 9", + "Graveyard Dampe Race Wonderitem 10": "Graveyard Dampes Grave Wonderitem 10", + "Graveyard Dampe Race Wonderitem 11": "Graveyard Dampes Grave Wonderitem 11", + "Graveyard Dampe Race Wonderitem 12": "Graveyard Dampes Grave Wonderitem 12", + "Graveyard Dampe Race Wonderitem 13": "Graveyard Dampes Grave Wonderitem 13", + "Graveyard Dampe Race Wonderitem 14": "Graveyard Dampes Grave Wonderitem 14", + "Graveyard Dampe Race Wonderitem 15": "Graveyard Dampes Grave Wonderitem 15", + "DMT Great Fairy Reward": "DMT Great Fairy Fountain Reward", + "GC Deku Scrub Grotto Left": "GC Grotto Deku Scrub Left", + "GC Deku Scrub Grotto Center": "GC Grotto Deku Scrub Center", + "GC Deku Scrub Grotto Right": "GC Grotto Deku Scrub Right", + "DMC Great Fairy Reward": "DMC Great Fairy Fountain Reward", + "DMC Deku Scrub Grotto Left": "DMC Hammer Grotto Deku Scrub Left", + "DMC Deku Scrub Grotto Center": "DMC Hammer Grotto Deku Scrub Center", + "DMC Deku Scrub Grotto Right": "DMC Hammer Grotto Deku Scrub Right", + "ZR Deku Scrub Grotto Front": "ZR Storms Grotto Deku Scrub Front", + "ZR Deku Scrub Grotto Rear": "ZR Storms Grotto Deku Scrub Rear", + "ZF Great Fairy Reward": "ZF Great Fairy Fountain Reward", + "LH Child Fishing": "LH Fishing Hole Child Reward", + "LH Adult Fishing": "LH Fishing Hole Adult Reward", + "LH Loach Fishing": "LH Fishing Hole Loach Reward", + "LH Trade Eyeball Frog": "LH Lab Trade Eyeball Frog", + "LH Deku Scrub Grotto Left": "LH Grotto Deku Scrub Left", + "LH Deku Scrub Grotto Center": "LH Grotto Deku Scrub Center", + "LH Deku Scrub Grotto Right": "LH Grotto Deku Scrub Right", + "LH GS Lab Crate": "LH Lab GS Crate", + "GV Deku Scrub Grotto Front": "GV Storms Grotto Deku Scrub Front", + "GV Deku Scrub Grotto Rear": "GV Storms Grotto Deku Scrub Rear", + "Colossus Great Fairy Reward": "Colossus Great Fairy Fountain Reward", + "Colossus Deku Scrub Grotto Front": "Colossus Grotto Deku Scrub Front", + "Colossus Deku Scrub Grotto Rear": "Colossus Grotto Deku Scrub Rear", + "OGC Great Fairy Reward": "OGC Great Fairy Fountain Reward", +} diff --git a/Patches.py b/Patches.py index b86af00ba3..44f1680bce 100644 --- a/Patches.py +++ b/Patches.py @@ -1610,7 +1610,7 @@ def calculate_traded_flags(world): shuffle_messages.shop_item_messages = [] # kokiri shop - shop_locations = [location for location in world.get_region('KF Kokiri Shop').locations if location.type == 'Shop'] # Need to filter because of the freestanding item in KF Shop + shop_locations = [location for location in world.get_region('KF Shop').locations if location.type == 'Shop'] # Need to filter because of the freestanding item in KF Shop shop_objs = place_shop_items(rom, world, shop_items, messages, shop_locations, True) shop_objs |= {0x00FC, 0x00B2, 0x0101, 0x0102, 0x00FD, 0x00C5} # Shop objects rom.write_byte(0x2587029, len(shop_objs)) @@ -1696,9 +1696,9 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p return message single_item_scrubs = { - 0x3E: world.get_location("HF Deku Scrub Grotto"), + 0x3E: world.get_location("HF Inside Fence Grotto Deku Scrub"), 0x77: world.get_location("LW Deku Scrub Near Bridge"), - 0x79: world.get_location("LW Deku Scrub Grotto Front"), + 0x79: world.get_location("LW Scrubs Grotto Deku Scrub Front"), } scrub_message_dict = {} @@ -1810,7 +1810,7 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p if 'unique_merchants' not in world.settings.misc_hints: update_message_by_id(messages, 0x500C, "Mysterious item! How about\x01\x05\x41100 Rupees\x05\x40?\x01\x1B\x05\x42Buy\x01Don't buy\x05\x40\x02") else: - location = world.get_location("Kak Granny Buy Blue Potion") + location = world.get_location("Kak Odd Medicine Building Buy Blue Potion") item_text = get_hint(get_item_generic_name(location.item), True).text wrapped_item_text = line_wrap(item_text, False, False, False) if wrapped_item_text != item_text: diff --git a/Plandomizer.py b/Plandomizer.py index 8f55b90796..2c7e390111 100644 --- a/Plandomizer.py +++ b/Plandomizer.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, Any, Optional import StartingItems -from Entrance import Entrance +from Entrance import Entrance, resolve_entrance_alias from EntranceShuffle import EntranceShuffleError, change_connections, confirm_replacement, validate_world, check_entrances_compatibility from Fill import FillError from Hints import HintArea, gossipLocations, GossipText @@ -18,7 +18,8 @@ from ItemPool import item_groups, get_junk_item, song_list, trade_items, child_trade_items from JSONDump import dump_obj, CollapseList, CollapseDict, AlignedDict, SortedDict from Location import Location, LocationIterator, LocationFactory -from LocationList import location_groups, location_table +from LocationList import location_groups, location_table, LOCATION_ALIASES +from Region import REGION_ALIASES from Search import Search from SettingsList import build_close_match, validate_settings, settings_versioning from Spoiler import Spoiler, HASH_ICONS, PASSWORD_NOTES @@ -189,6 +190,10 @@ def __init__(self, src_dict: dict[str, Optional[str]] | str) -> None: if 'from' in src_dict: src_dict['origin'] = src_dict['from'] del src_dict['from'] + if 'region' in src_dict: + src_dict['region'] = REGION_ALIASES.get(src_dict['region'], src_dict['region']) + if 'origin' in src_dict: + src_dict['origin'] = REGION_ALIASES.get(src_dict['origin'], src_dict['origin']) super().__init__({'region': None, 'origin': None}, src_dict) def to_json(self) -> str | CollapseDict: @@ -294,8 +299,8 @@ def update(self, src_dict: dict[str, Any], update_all: bool = False) -> None: 'trials': {name: TrialRecord(record) for (name, record) in src_dict.get('trials', {}).items()}, 'songs': {name: SongRecord(record) for (name, record) in src_dict.get('songs', {}).items()}, 'item_pool': {name: ItemPoolRecord(record) for (name, record) in src_dict.get('item_pool', {}).items()}, - 'entrances': {name: EntranceRecord(record) for (name, record) in src_dict.get('entrances', {}).items()}, - 'locations': {name: [LocationRecord(rec) for rec in record] if is_pattern(name) else LocationRecord(record) for (name, record) in src_dict.get('locations', {}).items() if not is_output_only(name)}, + 'entrances': {resolve_entrance_alias(name): EntranceRecord(record) for (name, record) in src_dict.get('entrances', {}).items()}, + 'locations': {LOCATION_ALIASES.get(name, name): [LocationRecord(rec) for rec in record] if is_pattern(name) else LocationRecord(record) for (name, record) in src_dict.get('locations', {}).items() if not is_output_only(name)}, 'woth_locations': None, 'goal_locations': None, 'barren_regions': None, diff --git a/Region.py b/Region.py index 7576f43247..a07922ea3a 100644 --- a/Region.py +++ b/Region.py @@ -168,3 +168,9 @@ def __str__(self) -> str: def __repr__(self) -> str: return f"{self.world.__repr__()} {self.name}" + + +# Mapping of old region names to current ones for better plando backwards compatibility +REGION_ALIASES: dict[str, str] = { + "KF Kokiri Shop": "KF Shop", +} diff --git a/World.py b/World.py index 29c87db9a2..ffbc644d8a 100644 --- a/World.py +++ b/World.py @@ -255,7 +255,7 @@ def __init__(self, world_id: int, settings: Settings, resolve_randomized_setting max_tokens = max(max_tokens, self.settings.ganon_bosskey_tokens) tokens = [50, 40, 30, 20, 10] for t in tokens: - if f'Kak {t} Gold Skulltula Reward' not in self.settings.disabled_locations: + if f'Kak House of Skulltula {t} Gold Skulltula Reward' not in self.settings.disabled_locations: max_tokens = max(max_tokens, t) break self.max_progressions['Gold Skulltula Token'] = max_tokens diff --git a/data/Glitched World/Overworld.json b/data/Glitched World/Overworld.json index 5717de9c40..89a2c8a64c 100644 --- a/data/Glitched World/Overworld.json +++ b/data/Glitched World/Overworld.json @@ -50,7 +50,7 @@ "KF Sarias House": "True", "KF House of Twins": "True", "KF Know It All House": "True", - "KF Kokiri Shop": "True", + "KF Shop": "True", "KF Outside Deku Tree": "'Showed Mido Sword & Shield' or Sticks or is_adult", "Lost Woods": "True", "LW Bridge": "can_leave_forest", @@ -87,10 +87,10 @@ { "region_name": "KF Midos House", "locations": { - "KF Midos Top Left Chest": "True", - "KF Midos Top Right Chest": "True", - "KF Midos Bottom Left Chest": "True", - "KF Midos Bottom Right Chest": "True" + "KF Midos House Top Left Chest": "True", + "KF Midos House Top Right Chest": "True", + "KF Midos House Bottom Left Chest": "True", + "KF Midos House Bottom Right Chest": "True" } }, { @@ -103,7 +103,7 @@ "region_name": "KF Know It All House" }, { - "region_name": "KF Kokiri Shop", + "region_name": "KF Shop", "locations": { "KF Shop Item 1": "True", "KF Shop Item 2": "True", @@ -263,20 +263,20 @@ { "region_name": "LH Lab", "locations": { - "LH Trade Eyeball Frog": "is_adult and Eyeball_Frog", + "LH Lab Trade Eyeball Frog": "is_adult and Eyeball_Frog", "LH Lab Dive": " (Progressive_Scale, 2) or (Iron_Boots and can_use(Hookshot)) or (has_bottle and can_use(Hover_Boots))", - "LH GS Lab Crate": "Iron_Boots and can_use(Hookshot)" + "LH Lab GS Crate": "Iron_Boots and can_use(Hookshot)" } }, { "region_name": "LH Fishing Hole", "time_passes": true, "locations": { - "LH Child Fishing": "is_child", - "LH Adult Fishing": "is_adult", - "LH Loach Fishing": "True" + "LH Fishing Hole Child Reward": "is_child", + "LH Fishing Hole Adult Reward": "is_adult", + "LH Fishing Hole Loach Reward": "True" } }, { @@ -393,7 +393,7 @@ { "region_name": "Colossus Great Fairy Fountain", "locations": { - "Colossus Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "Colossus Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" } }, { @@ -430,7 +430,7 @@ "Temple of Time Access": "True" }, "locations": { - "ToT Light Arrows Cutscene": "is_adult and can_trigger_lacs", + "Temple of Time Light Arrow Cutscene": "is_adult and can_trigger_lacs", "ToT Child Altar Hint": "is_child", "ToT Adult Altar Hint": "is_adult" }, @@ -498,7 +498,7 @@ { "region_name": "HC Great Fairy Fountain", "locations": { - "HC Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "HC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" } }, { @@ -516,7 +516,7 @@ { "region_name": "OGC Great Fairy Fountain", "locations": { - "OGC Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "OGC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" } }, { @@ -525,11 +525,11 @@ "Sell Big Poe": "is_adult and Bottle_with_Big_Poe" }, "locations": { - "Market 10 Big Poes": " + "Market Guard House 10 Big Poes": " is_adult and (Big_Poe or (Bottle_with_Big_Poe, big_poe_count))", "Market 10 Big Poes Hint": "is_adult", - "Market GS Guard House": "is_child" + "Market Guard House GS": "is_child" } }, { @@ -711,11 +711,11 @@ { "region_name": "Kak House of Skulltula", "locations": { - "Kak 10 Gold Skulltula Reward": "(Gold_Skulltula_Token, 10)", - "Kak 20 Gold Skulltula Reward": "(Gold_Skulltula_Token, 20)", - "Kak 30 Gold Skulltula Reward": "(Gold_Skulltula_Token, 30)", - "Kak 40 Gold Skulltula Reward": "(Gold_Skulltula_Token, 40)", - "Kak 50 Gold Skulltula Reward": "(Gold_Skulltula_Token, 50)", + "Kak House of Skulltula 10 Gold Skulltula Reward": "(Gold_Skulltula_Token, 10)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "(Gold_Skulltula_Token, 20)", + "Kak House of Skulltula 30 Gold Skulltula Reward": "(Gold_Skulltula_Token, 30)", + "Kak House of Skulltula 40 Gold Skulltula Reward": "(Gold_Skulltula_Token, 40)", + "Kak House of Skulltula 50 Gold Skulltula Reward": "(Gold_Skulltula_Token, 50)", "10 Skulltulas Reward Hint": "True", "20 Skulltulas Reward Hint": "True", "30 Skulltulas Reward Hint": "True", @@ -783,12 +783,12 @@ { "region_name": "Kak Odd Medicine Building", "locations": { - "Kak Granny Trade Odd Mushroom": "is_adult and Odd_Mushroom", + "Kak Odd Medicine Building Trade Odd Mushroom": "is_adult and Odd_Mushroom", # Granny will not sell her item without turning in odd mushroom # If the adult trade item(s) in the world are all after odd mushroom, # allow any of the later sequence items to satisfy logic. The patcher # sets the flag needed for her to sell stuff if odd mushroom can't be obtained. - "Kak Granny Buy Blue Potion": "Progressive_Wallet and is_adult and + "Kak Odd Medicine Building Buy Blue Potion": "Progressive_Wallet and is_adult and (Odd_Mushroom or ((Odd_Potion or Poachers_Saw or Broken_Sword or Prescription or Eyeball_Frog or Eyedrops or Claim_Check) and not adult_trade_shuffle))" } @@ -840,8 +840,8 @@ "region_name": "Graveyard Dampes Grave", "hint": "GRAVEYARD", "locations": { - "Graveyard Dampe Race Hookshot Chest": "True", - "Graveyard Dampe Race Freestanding PoH": "True", + "Graveyard Dampes Grave Hookshot Chest": "True", + "Graveyard Dampes Grave Freestanding PoH": "True", "Nut Pot": "True" } }, @@ -1064,13 +1064,13 @@ { "region_name": "DMC Great Fairy Fountain", "locations": { - "DMC Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "DMC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" } }, { "region_name": "DMT Great Fairy Fountain", "locations": { - "DMT Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "DMT Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" } }, { @@ -1185,7 +1185,7 @@ { "region_name": "ZF Great Fairy Fountain", "locations": { - "ZF Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "ZF Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" } }, { @@ -1213,7 +1213,7 @@ { "region_name": "LLR Talons House", "locations": { - "LLR Talons Chickens": "is_child and (skip_child_zelda or at('Hyrule Castle Grounds', is_child and (Weird_Egg or Chicken)))" + "LLR Talons House Chickens": "is_child and (skip_child_zelda or at('Hyrule Castle Grounds', is_child and (Weird_Egg or Chicken)))" } }, { @@ -1226,7 +1226,7 @@ { "region_name": "LLR Tower", "locations": { - "LLR Freestanding PoH": "True", + "LLR Tower Freestanding PoH": "True", "LLR Tower Left Cow": "can_play(Eponas_Song)", "LLR Tower Right Cow": "can_play(Eponas_Song)" } @@ -1268,8 +1268,8 @@ { "region_name": "LW Scrubs Grotto", "locations": { - "LW Deku Scrub Grotto Rear": "True", - "LW Deku Scrub Grotto Front": "True" + "LW Scrubs Grotto Deku Scrub Rear": "True", + "LW Scrubs Grotto Deku Scrub Front": "True" } }, { @@ -1281,8 +1281,8 @@ { "region_name": "SFM Storms Grotto", "locations": { - "SFM Deku Scrub Grotto Rear": "True", - "SFM Deku Scrub Grotto Front": "True" + "SFM Storms Grotto Deku Scrub Rear": "True", + "SFM Storms Grotto Deku Scrub Front": "True" } }, { @@ -1294,9 +1294,9 @@ { "region_name": "LLR Grotto", "locations": { - "LLR Deku Scrub Grotto Left": "True", - "LLR Deku Scrub Grotto Right": "True", - "LLR Deku Scrub Grotto Center": "True" + "LLR Grotto Deku Scrub Left": "True", + "LLR Grotto Deku Scrub Right": "True", + "LLR Grotto Deku Scrub Center": "True" } }, { @@ -1316,13 +1316,13 @@ { "region_name": "HF Inside Fence Grotto", "locations": { - "HF Deku Scrub Grotto": "can_stun_deku" + "HF Inside Fence Grotto Deku Scrub": "can_stun_deku" } }, { "region_name": "HF Cow Grotto", "locations": { - "HF GS Cow Grotto": " + "HF Cow Grotto GS": " has_fire_source and (can_use(Hookshot) or can_use(Boomerang))", "HF Cow Grotto Cow": "has_fire_source and can_play(Eponas_Song)", "HF Cow Grotto Gossip Stone": "has_fire_source" @@ -1341,7 +1341,7 @@ { "region_name": "HF Near Kak Grotto", "locations": { - "HF GS Near Kak Grotto": "can_use(Boomerang) or can_use(Hookshot)" + "HF Near Kak Grotto GS": "can_use(Boomerang) or can_use(Hookshot)" } }, { @@ -1354,7 +1354,7 @@ { "region_name": "HC Storms Grotto", "locations": { - "HC GS Storms Grotto": "(can_use(Boomerang) or can_isg) and (has_explosives or Blue_Fire)", + "HC Storms Grotto GS": "(can_use(Boomerang) or can_isg) and (has_explosives or Blue_Fire)", "HC Storms Grotto Gossip Stone": "has_explosives or Blue_Fire" } }, @@ -1387,9 +1387,9 @@ { "region_name": "GC Grotto", "locations": { - "GC Deku Scrub Grotto Left": "True", - "GC Deku Scrub Grotto Right": "True", - "GC Deku Scrub Grotto Center": "True" + "GC Grotto Deku Scrub Left": "True", + "GC Grotto Deku Scrub Right": "True", + "GC Grotto Deku Scrub Center": "True" } }, { @@ -1402,9 +1402,9 @@ { "region_name": "DMC Hammer Grotto", "locations": { - "DMC Deku Scrub Grotto Left": "True", - "DMC Deku Scrub Grotto Right": "True", - "DMC Deku Scrub Grotto Center": "True" + "DMC Hammer Grotto Deku Scrub Left": "True", + "DMC Hammer Grotto Deku Scrub Right": "True", + "DMC Hammer Grotto Deku Scrub Center": "True" } }, { @@ -1420,30 +1420,30 @@ { "region_name": "ZR Storms Grotto", "locations": { - "ZR Deku Scrub Grotto Rear": "True", - "ZR Deku Scrub Grotto Front": "True" + "ZR Storms Grotto Deku Scrub Rear": "True", + "ZR Storms Grotto Deku Scrub Front": "True" } }, { "region_name": "LH Grotto", "locations": { - "LH Deku Scrub Grotto Left": "True", - "LH Deku Scrub Grotto Right": "True", - "LH Deku Scrub Grotto Center": "True" + "LH Grotto Deku Scrub Left": "True", + "LH Grotto Deku Scrub Right": "True", + "LH Grotto Deku Scrub Center": "True" } }, { "region_name": "Colossus Grotto", "locations": { - "Colossus Deku Scrub Grotto Rear": "True", - "Colossus Deku Scrub Grotto Front": "True" + "Colossus Grotto Deku Scrub Rear": "True", + "Colossus Grotto Deku Scrub Front": "True" } }, { "region_name": "GV Storms Grotto", "locations": { - "GV Deku Scrub Grotto Rear": "True", - "GV Deku Scrub Grotto Front": "True" + "GV Storms Grotto Deku Scrub Rear": "True", + "GV Storms Grotto Deku Scrub Front": "True" } } ] diff --git a/data/Hints/league.json b/data/Hints/league.json index 2e761b6590..03df6a5a86 100644 --- a/data/Hints/league.json +++ b/data/Hints/league.json @@ -15,9 +15,9 @@ { "location": "Sheik at Colossus", "types": ["sometimes"] }, { "location": "Sheik in Ice Cavern", "types": ["sometimes"] }, { "location": "LH Sun", "types": ["sometimes"] }, - { "location": "HC Great Fairy Reward", "types": ["sometimes"] }, - { "location": "OGC Great Fairy Reward", "types": ["sometimes"] }, - { "location": "Kak 20 Gold Skulltula Reward", "types": ["sometimes"] }, + { "location": "HC Great Fairy Fountain Reward", "types": ["sometimes"] }, + { "location": "OGC Great Fairy Fountain Reward", "types": ["sometimes"] }, + { "location": "Kak House of Skulltula 20 Gold Skulltula Reward", "types": ["sometimes"] }, { "location": "GF HBA 1500 Points", "types": ["sometimes"] }, { "location": "GC Maze Left Chest", "types": ["sometimes"] }, { "location": "GV Chest", "types": ["sometimes"] }, diff --git a/data/Hints/scrubs.json b/data/Hints/scrubs.json index e6a11e121e..d967c7afc9 100644 --- a/data/Hints/scrubs.json +++ b/data/Hints/scrubs.json @@ -9,7 +9,7 @@ ], "remove_locations": [ { "location": "Hyrule Castle", "types": ["barren"] }, - { "location": "OGC Great Fairy Reward", "types": ["always"] }, + { "location": "OGC Great Fairy Fountain Reward", "types": ["always"] }, { "location": "Sheik at Temple", "types": ["always", "sometimes"] }, { "location": "ZR Frogs Rewards", "types": ["dual_always", "dual"] }, { "location": "Sheik in Forest", "types": ["sometimes"] }, diff --git a/data/World/Overworld.json b/data/World/Overworld.json index b7e0aebed5..d5e5f8b0a9 100644 --- a/data/World/Overworld.json +++ b/data/World/Overworld.json @@ -201,7 +201,7 @@ "KF Sarias House": "True", "KF House of Twins": "True", "KF Know It All House": "True", - "KF Kokiri Shop": "True", + "KF Shop": "True", "KF Outside Deku Tree": "is_adult or open_forest == 'open' or 'Showed Mido Sword & Shield'", "Lost Woods": "True", "LW Bridge From Forest": "can_leave_forest", @@ -247,10 +247,10 @@ "region_name": "KF Midos House", "scene": "KF Midos House", "locations": { - "KF Midos Top Left Chest": "True", - "KF Midos Top Right Chest": "True", - "KF Midos Bottom Left Chest": "True", - "KF Midos Bottom Right Chest": "True" + "KF Midos House Top Left Chest": "True", + "KF Midos House Top Right Chest": "True", + "KF Midos House Bottom Left Chest": "True", + "KF Midos House Bottom Right Chest": "True" }, "exits": { "Kokiri Forest": "True" @@ -292,8 +292,8 @@ } }, { - "region_name": "KF Kokiri Shop", - "scene": "KF Kokiri Shop", + "region_name": "KF Shop", + "scene": "KF Shop", "locations": { "KF Shop Wonderitem": "True", "KF Shop Item 1": "True", @@ -584,14 +584,14 @@ (('Eyeball Frog Access' and not adult_trade_shuffle) or (Eyeball_Frog and disable_trade_revert))" }, "locations": { - "LH Trade Eyeball Frog": "'Eyedrops Access'", + "LH Lab Trade Eyeball Frog": "'Eyedrops Access'", "LH Lab Dive": " (Progressive_Scale, 2) or (logic_lab_diving and is_adult and Iron_Boots and Hookshot)", "LH Lab Dive Red Rupee 1": "(Progressive_Scale, 2) or can_use(Iron_Boots)", "LH Lab Dive Red Rupee 2": "(Progressive_Scale, 2) or can_use(Iron_Boots)", "LH Lab Dive Red Rupee 3": "(Progressive_Scale, 2) or can_use(Iron_Boots)", - "LH GS Lab Crate": " + "LH Lab GS Crate": " Iron_Boots and can_use(Hookshot) and (deadly_bonks != 'ohko' or Fairy or (can_use(Nayrus_Love) and not shuffle_interior_entrances))" }, @@ -603,9 +603,9 @@ "region_name": "LH Fishing Hole", "scene": "LH Fishing Hole", "locations": { - "LH Child Fishing": "is_child", - "LH Adult Fishing": "is_adult", - "LH Loach Fishing": "True" + "LH Fishing Hole Child Reward": "is_child", + "LH Fishing Hole Adult Reward": "is_adult", + "LH Fishing Hole Loach Reward": "True" }, "exits": { "LH Fishing Island": "True" @@ -1202,7 +1202,7 @@ "region_name": "Colossus Great Fairy Fountain", "scene": "Colossus Great Fairy Fountain", "locations": { - "Colossus Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "Colossus Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" }, "exits": { "Desert Colossus": "True" @@ -1306,7 +1306,7 @@ "Temple of Time Access": "True" }, "locations": { - "ToT Light Arrows Cutscene": "is_adult and can_trigger_lacs", + "Temple of Time Light Arrow Cutscene": "is_adult and can_trigger_lacs", "ToT Child Altar Hint": "is_child", "ToT Adult Altar Hint": "is_adult" }, @@ -1405,7 +1405,7 @@ "region_name": "HC Great Fairy Fountain", "scene": "HC Great Fairy Fountain", "locations": { - "HC Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "HC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" }, "exits": { "Castle Grounds": "True" @@ -1438,7 +1438,7 @@ "region_name": "OGC Great Fairy Fountain", "scene": "OGC Great Fairy Fountain", "locations": { - "OGC Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "OGC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" }, "exits": { "Castle Grounds": "True" @@ -1451,7 +1451,7 @@ "Sell Big Poe": "is_adult and Bottle_with_Big_Poe" }, "locations": { - "Market 10 Big Poes": " + "Market Guard House 10 Big Poes": " is_adult and (Big_Poe or (Bottle_with_Big_Poe, big_poe_count))", "Market 10 Big Poes Hint": "is_adult", "Market Guard House Child Crate 1": "is_child and can_break_crate", @@ -1513,7 +1513,7 @@ "Market Guard House Adult Pot 9": "is_adult", "Market Guard House Adult Pot 10": "is_adult", "Market Guard House Adult Pot 11": "is_adult", - "Market GS Guard House": "is_child and can_break_crate" + "Market Guard House GS": "is_child and can_break_crate" }, "exits": { "Market Entrance": "True" @@ -1825,11 +1825,11 @@ "region_name": "Kak House of Skulltula", "scene": "Kak House of Skulltula", "locations": { - "Kak 10 Gold Skulltula Reward": "(Gold_Skulltula_Token, 10)", - "Kak 20 Gold Skulltula Reward": "(Gold_Skulltula_Token, 20)", - "Kak 30 Gold Skulltula Reward": "(Gold_Skulltula_Token, 30)", - "Kak 40 Gold Skulltula Reward": "(Gold_Skulltula_Token, 40)", - "Kak 50 Gold Skulltula Reward": "(Gold_Skulltula_Token, 50)", + "Kak House of Skulltula 10 Gold Skulltula Reward": "(Gold_Skulltula_Token, 10)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "(Gold_Skulltula_Token, 20)", + "Kak House of Skulltula 30 Gold Skulltula Reward": "(Gold_Skulltula_Token, 30)", + "Kak House of Skulltula 40 Gold Skulltula Reward": "(Gold_Skulltula_Token, 40)", + "Kak House of Skulltula 50 Gold Skulltula Reward": "(Gold_Skulltula_Token, 50)", "10 Skulltulas Reward Hint": "True", "20 Skulltulas Reward Hint": "True", "30 Skulltulas Reward Hint": "True", @@ -1947,9 +1947,9 @@ (('Odd Mushroom Access' and not adult_trade_shuffle) or (Odd_Mushroom and disable_trade_revert))" }, "locations": { - "Kak Granny Trade Odd Mushroom": "'Odd Potion Access'", + "Kak Odd Medicine Building Trade Odd Mushroom": "'Odd Potion Access'", # Granny will not sell her item without turning in odd mushroom - "Kak Granny Buy Blue Potion": "Progressive_Wallet and ('Odd Potion Access' or + "Kak Odd Medicine Building Buy Blue Potion": "Progressive_Wallet and ('Odd Potion Access' or ((selected_adult_trade_item == 'Odd Potion' or selected_adult_trade_item == 'Poachers Saw' or selected_adult_trade_item == 'Broken Sword' or selected_adult_trade_item == 'Prescription' or selected_adult_trade_item == 'Eyeball Frog' or selected_adult_trade_item == 'Eyedrops' or @@ -2024,38 +2024,38 @@ "Dampes Windmill Access": "is_adult and can_play(Song_of_Time)" }, "locations": { - "Graveyard Dampe Race Hookshot Chest": "True", - "Graveyard Dampe Race Freestanding PoH": "is_adult or logic_child_dampe_race_poh", - "Graveyard Dampe Race Rupee 1": "True", - "Graveyard Dampe Race Rupee 2": "True", - "Graveyard Dampe Race Rupee 3": "True", - "Graveyard Dampe Race Rupee 4": "True", - "Graveyard Dampe Race Rupee 5": "True", - "Graveyard Dampe Race Rupee 6": "True", - "Graveyard Dampe Race Rupee 7": "True", - "Graveyard Dampe Race Rupee 8": "True", - "Graveyard Dampe Pot 1": "True", - "Graveyard Dampe Pot 2": "True", - "Graveyard Dampe Pot 3": "True", - "Graveyard Dampe Pot 4": "True", - "Graveyard Dampe Pot 5": "True", - "Graveyard Dampe Pot 6": "True", + "Graveyard Dampes Grave Hookshot Chest": "True", + "Graveyard Dampes Grave Freestanding PoH": "is_adult or logic_child_dampe_race_poh", + "Graveyard Dampes Grave Rupee 1": "True", + "Graveyard Dampes Grave Rupee 2": "True", + "Graveyard Dampes Grave Rupee 3": "True", + "Graveyard Dampes Grave Rupee 4": "True", + "Graveyard Dampes Grave Rupee 5": "True", + "Graveyard Dampes Grave Rupee 6": "True", + "Graveyard Dampes Grave Rupee 7": "True", + "Graveyard Dampes Grave Rupee 8": "True", + "Graveyard Dampes Grave Pot 1": "True", + "Graveyard Dampes Grave Pot 2": "True", + "Graveyard Dampes Grave Pot 3": "True", + "Graveyard Dampes Grave Pot 4": "True", + "Graveyard Dampes Grave Pot 5": "True", + "Graveyard Dampes Grave Pot 6": "True", "Nut Pot": "True", - "Graveyard Dampe Race Wonderitem 1": "True", - "Graveyard Dampe Race Wonderitem 2": "True", - "Graveyard Dampe Race Wonderitem 3": "True", - "Graveyard Dampe Race Wonderitem 4": "True", - "Graveyard Dampe Race Wonderitem 5": "True", - "Graveyard Dampe Race Wonderitem 6": "True", - "Graveyard Dampe Race Wonderitem 7": "True", - "Graveyard Dampe Race Wonderitem 8": "True", - "Graveyard Dampe Race Wonderitem 9": "True", - "Graveyard Dampe Race Wonderitem 10": "True", - "Graveyard Dampe Race Wonderitem 11": "True", - "Graveyard Dampe Race Wonderitem 12": "True", - "Graveyard Dampe Race Wonderitem 13": "True", - "Graveyard Dampe Race Wonderitem 14": "True", - "Graveyard Dampe Race Wonderitem 15": "True" + "Graveyard Dampes Grave Wonderitem 1": "True", + "Graveyard Dampes Grave Wonderitem 2": "True", + "Graveyard Dampes Grave Wonderitem 3": "True", + "Graveyard Dampes Grave Wonderitem 4": "True", + "Graveyard Dampes Grave Wonderitem 5": "True", + "Graveyard Dampes Grave Wonderitem 6": "True", + "Graveyard Dampes Grave Wonderitem 7": "True", + "Graveyard Dampes Grave Wonderitem 8": "True", + "Graveyard Dampes Grave Wonderitem 9": "True", + "Graveyard Dampes Grave Wonderitem 10": "True", + "Graveyard Dampes Grave Wonderitem 11": "True", + "Graveyard Dampes Grave Wonderitem 12": "True", + "Graveyard Dampes Grave Wonderitem 13": "True", + "Graveyard Dampes Grave Wonderitem 14": "True", + "Graveyard Dampes Grave Wonderitem 15": "True" }, "exits": { "Graveyard": "True", @@ -2460,7 +2460,7 @@ "region_name": "DMC Great Fairy Fountain", "scene": "DMC Great Fairy Fountain", "locations": { - "DMC Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "DMC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" }, "exits": { "DMC Lower Local": "True" @@ -2470,7 +2470,7 @@ "region_name": "DMT Great Fairy Fountain", "scene": "DMT Great Fairy Fountain", "locations": { - "DMT Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "DMT Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" }, "exits": { "Death Mountain Summit": "True" @@ -2746,7 +2746,7 @@ "region_name": "ZF Great Fairy Fountain", "scene": "ZF Great Fairy Fountain", "locations": { - "ZF Great Fairy Reward": "can_play(Zeldas_Lullaby)" + "ZF Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)" }, "exits": { "Zoras Fountain": "True" @@ -2792,7 +2792,7 @@ "region_name": "LLR Talons House", "scene": "LLR Talons House", "locations": { - "LLR Talons Chickens": " + "LLR Talons House Chickens": " is_child and at_day and (skip_child_zelda or at('Hyrule Castle Grounds', is_child and (Weird_Egg or Chicken)))", "LLR Talons House Pot 1": "True", @@ -2818,7 +2818,7 @@ "region_name": "LLR Tower", "scene": "LLR Tower", "locations": { - "LLR Freestanding PoH": "is_child", + "LLR Tower Freestanding PoH": "is_child", "LLR Tower Left Cow": "can_play(Eponas_Song)", "LLR Tower Right Cow": "can_play(Eponas_Song)" }, @@ -2895,8 +2895,8 @@ "region_name": "LW Scrubs Grotto", "scene": "LW Scrubs Grotto", "locations": { - "LW Deku Scrub Grotto Rear": "can_stun_deku", - "LW Deku Scrub Grotto Front": "can_stun_deku", + "LW Scrubs Grotto Deku Scrub Rear": "can_stun_deku", + "LW Scrubs Grotto Deku Scrub Front": "can_stun_deku", "LW Scrubs Grotto Beehive": "can_break_upper_beehive" }, "exits": { @@ -2917,8 +2917,8 @@ "region_name": "SFM Storms Grotto", "scene": "SFM Storms Grotto", "locations": { - "SFM Deku Scrub Grotto Rear": "can_stun_deku", - "SFM Deku Scrub Grotto Front": "can_stun_deku", + "SFM Storms Grotto Deku Scrub Rear": "can_stun_deku", + "SFM Storms Grotto Deku Scrub Front": "can_stun_deku", "SFM Storms Grotto Beehive": "can_break_upper_beehive" }, "exits": { @@ -2940,9 +2940,9 @@ "region_name": "LLR Grotto", "scene": "LLR Grotto", "locations": { - "LLR Deku Scrub Grotto Left": "can_stun_deku", - "LLR Deku Scrub Grotto Right": "can_stun_deku", - "LLR Deku Scrub Grotto Center": "can_stun_deku", + "LLR Grotto Deku Scrub Left": "can_stun_deku", + "LLR Grotto Deku Scrub Right": "can_stun_deku", + "LLR Grotto Deku Scrub Center": "can_stun_deku", "LLR Grotto Beehive": "can_break_upper_beehive" }, "exits": { @@ -2987,7 +2987,7 @@ "region_name": "HF Inside Fence Grotto", "scene": "HF Inside Fence Grotto", "locations": { - "HF Deku Scrub Grotto": "can_stun_deku", + "HF Inside Fence Grotto Deku Scrub": "can_stun_deku", "HF Inside Fence Grotto Beehive": "can_break_lower_beehive" }, "exits": { @@ -2998,7 +2998,7 @@ "region_name": "HF Cow Grotto", "scene": "HF Cow Grotto", "locations": { - "HF GS Cow Grotto": "has_fire_source and (can_use(Hookshot) or can_use(Boomerang))", + "HF Cow Grotto GS": "has_fire_source and (can_use(Hookshot) or can_use(Boomerang))", "HF Cow Grotto Cow": "has_fire_source and can_play(Eponas_Song)", "HF Cow Grotto Pot 1": "has_fire_source", "HF Cow Grotto Pot 2": "has_fire_source", @@ -3042,7 +3042,7 @@ "region_name": "HF Near Kak Grotto", "scene": "HF Near Kak Grotto", "locations": { - "HF GS Near Kak Grotto": "can_use(Boomerang) or can_use(Hookshot)" + "HF Near Kak Grotto GS": "can_use(Boomerang) or can_use(Hookshot)" }, "exits": { "Hyrule Field": "True" @@ -3062,7 +3062,7 @@ "region_name": "HC Storms Grotto", "scene": "HC Storms Grotto", "locations": { - "HC GS Storms Grotto": " + "HC Storms Grotto GS": " (can_blast_or_smash or (is_child and logic_castle_storms_gs)) and (can_use(Boomerang) or can_use(Hookshot))", "HC Storms Grotto Pot 1": "can_blast_or_smash", @@ -3148,9 +3148,9 @@ "region_name": "GC Grotto", "scene": "GC Grotto", "locations": { - "GC Deku Scrub Grotto Left": "can_stun_deku", - "GC Deku Scrub Grotto Right": "can_stun_deku", - "GC Deku Scrub Grotto Center": "can_stun_deku", + "GC Grotto Deku Scrub Left": "can_stun_deku", + "GC Grotto Deku Scrub Right": "can_stun_deku", + "GC Grotto Deku Scrub Center": "can_stun_deku", "GC Grotto Beehive": "can_break_upper_beehive" }, "exits": { @@ -3178,9 +3178,9 @@ "region_name": "DMC Hammer Grotto", "scene": "DMC Hammer Grotto", "locations": { - "DMC Deku Scrub Grotto Left": "can_stun_deku", - "DMC Deku Scrub Grotto Right": "can_stun_deku", - "DMC Deku Scrub Grotto Center": "can_stun_deku", + "DMC Hammer Grotto Deku Scrub Left": "can_stun_deku", + "DMC Hammer Grotto Deku Scrub Right": "can_stun_deku", + "DMC Hammer Grotto Deku Scrub Center": "can_stun_deku", "DMC Hammer Grotto Beehive": "can_break_upper_beehive" }, "exits": { @@ -3218,8 +3218,8 @@ "region_name": "ZR Storms Grotto", "scene": "ZR Storms Grotto", "locations": { - "ZR Deku Scrub Grotto Rear": "can_stun_deku", - "ZR Deku Scrub Grotto Front": "can_stun_deku", + "ZR Storms Grotto Deku Scrub Rear": "can_stun_deku", + "ZR Storms Grotto Deku Scrub Front": "can_stun_deku", "ZR Storms Grotto Beehive": "can_break_upper_beehive" }, "exits": { @@ -3230,9 +3230,9 @@ "region_name": "LH Grotto", "scene": "LH Grotto", "locations": { - "LH Deku Scrub Grotto Left": "can_stun_deku", - "LH Deku Scrub Grotto Right": "can_stun_deku", - "LH Deku Scrub Grotto Center": "can_stun_deku", + "LH Grotto Deku Scrub Left": "can_stun_deku", + "LH Grotto Deku Scrub Right": "can_stun_deku", + "LH Grotto Deku Scrub Center": "can_stun_deku", "LH Grotto Beehive": "can_break_upper_beehive" }, "exits": { @@ -3243,8 +3243,8 @@ "region_name": "Colossus Grotto", "scene": "Colossus Grotto", "locations": { - "Colossus Deku Scrub Grotto Rear": "can_stun_deku", - "Colossus Deku Scrub Grotto Front": "can_stun_deku", + "Colossus Grotto Deku Scrub Rear": "can_stun_deku", + "Colossus Grotto Deku Scrub Front": "can_stun_deku", "Colossus Grotto Beehive": "can_break_upper_beehive" }, "exits": { @@ -3272,8 +3272,8 @@ "region_name": "GV Storms Grotto", "scene": "GV Storms Grotto", "locations": { - "GV Deku Scrub Grotto Rear": "can_stun_deku", - "GV Deku Scrub Grotto Front": "can_stun_deku", + "GV Storms Grotto Deku Scrub Rear": "can_stun_deku", + "GV Storms Grotto Deku Scrub Front": "can_stun_deku", "GV Storms Grotto Beehive": "can_break_upper_beehive" }, "exits": { diff --git a/data/presets_default.json b/data/presets_default.json index eb991388bd..542754cccc 100644 --- a/data/presets_default.json +++ b/data/presets_default.json @@ -107,8 +107,8 @@ "logic_no_night_tokens_without_suns_song": true, "disabled_locations": [ "Deku Theater Mask of Truth", - "Kak 40 Gold Skulltula Reward", - "Kak 50 Gold Skulltula Reward", + "Kak House of Skulltula 40 Gold Skulltula Reward", + "Kak House of Skulltula 50 Gold Skulltula Reward", "GF HBA 1500 Points" ], "allowed_tricks": [], @@ -507,8 +507,8 @@ "logic_no_night_tokens_without_suns_song": false, "disabled_locations": [ "Deku Theater Mask of Truth", - "Kak 40 Gold Skulltula Reward", - "Kak 50 Gold Skulltula Reward" + "Kak House of Skulltula 40 Gold Skulltula Reward", + "Kak House of Skulltula 50 Gold Skulltula Reward" ], "allowed_tricks": [ "logic_fewer_tunic_requirements", @@ -939,8 +939,8 @@ "logic_no_night_tokens_without_suns_song": false, "disabled_locations": [ "Deku Theater Mask of Truth", - "Kak 40 Gold Skulltula Reward", - "Kak 50 Gold Skulltula Reward", + "Kak House of Skulltula 40 Gold Skulltula Reward", + "Kak House of Skulltula 50 Gold Skulltula Reward", "GF HBA 1500 Points" ], "allowed_tricks": [ @@ -1148,8 +1148,8 @@ "logic_no_night_tokens_without_suns_song": false, "disabled_locations": [ "Deku Theater Mask of Truth", - "Kak 40 Gold Skulltula Reward", - "Kak 50 Gold Skulltula Reward" + "Kak House of Skulltula 40 Gold Skulltula Reward", + "Kak House of Skulltula 50 Gold Skulltula Reward" ], "allowed_tricks": [ "logic_fewer_tunic_requirements", @@ -1750,8 +1750,8 @@ "disabled_locations": [ "Deku Theater Mask of Truth", "ZR Frogs Ocarina Game", - "Kak 40 Gold Skulltula Reward", - "Kak 50 Gold Skulltula Reward" + "Kak House of Skulltula 40 Gold Skulltula Reward", + "Kak House of Skulltula 50 Gold Skulltula Reward" ], "allowed_tricks": [ "logic_grottos_without_agony", @@ -2180,8 +2180,8 @@ "logic_no_night_tokens_without_suns_song": false, "disabled_locations": [ "Deku Theater Mask of Truth", - "Kak 40 Gold Skulltula Reward", - "Kak 50 Gold Skulltula Reward" + "Kak House of Skulltula 40 Gold Skulltula Reward", + "Kak House of Skulltula 50 Gold Skulltula Reward" ], "allowed_tricks": [ "logic_fewer_tunic_requirements", diff --git a/tests/disables.sav b/tests/disables.sav index c16611522d..242dda86b9 100644 --- a/tests/disables.sav +++ b/tests/disables.sav @@ -42,9 +42,9 @@ "shuffle_ganon_bosskey": "remove", "mq_dungeons_mode": "vanilla", "disabled_locations": [ - "Kak 30 Gold Skulltula Reward", - "Kak 40 Gold Skulltula Reward", - "Kak 50 Gold Skulltula Reward", + "Kak House of Skulltula 30 Gold Skulltula Reward", + "Kak House of Skulltula 40 Gold Skulltula Reward", + "Kak House of Skulltula 50 Gold Skulltula Reward", "Deku Theater Skull Mask", "Deku Theater Mask of Truth", "DMC Deku Scrub", @@ -53,8 +53,8 @@ "Colossus Freestanding PoH", "Graveyard Freestanding PoH", "Water Temple River Chest", - "LH Child Fishing", - "LH Adult Fishing", + "LH Fishing Hole Child Reward", + "LH Fishing Hole Adult Reward", "GF HBA 1000 Points", "GF HBA 1500 Points", "Wasteland Chest", diff --git a/tests/multiworld.sav b/tests/multiworld.sav index 68f0490efc..09d7700830 100644 --- a/tests/multiworld.sav +++ b/tests/multiworld.sav @@ -39,7 +39,7 @@ "shuffle_ganon_bosskey": "remove", "mq_dungeons_mode": "vanilla", "disabled_locations": [ -"Market 10 Big Poes", +"Market Guard House 10 Big Poes", "ZR Frogs Ocarina Game", "GF HBA 1500 Points", "Deku Theater Mask of Truth", diff --git a/tests/plando/boss_rush_dc_mq.json b/tests/plando/boss_rush_dc_mq.json index ae084ec434..683ae80483 100644 --- a/tests/plando/boss_rush_dc_mq.json +++ b/tests/plando/boss_rush_dc_mq.json @@ -87,7 +87,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Dodongos Cavern Beginning", "from": "Death Mountain"} } } diff --git a/tests/plando/boss_rush_dc_vanilla.json b/tests/plando/boss_rush_dc_vanilla.json index 4bfd717d1b..ba5b5f7cd1 100644 --- a/tests/plando/boss_rush_dc_vanilla.json +++ b/tests/plando/boss_rush_dc_vanilla.json @@ -84,7 +84,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Dodongos Cavern Beginning", "from": "Death Mountain"} } } diff --git a/tests/plando/boss_rush_deku_mq.json b/tests/plando/boss_rush_deku_mq.json index 5428ac34da..08942625f0 100644 --- a/tests/plando/boss_rush_deku_mq.json +++ b/tests/plando/boss_rush_deku_mq.json @@ -87,7 +87,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Child Spawn -> KF Links House": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Child Spawn -> KF Links House": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Deku Tree Lobby", "from": "KF Outside Deku Tree"} } } diff --git a/tests/plando/boss_rush_deku_vanilla.json b/tests/plando/boss_rush_deku_vanilla.json index abec524b23..e7d46acbbb 100644 --- a/tests/plando/boss_rush_deku_vanilla.json +++ b/tests/plando/boss_rush_deku_vanilla.json @@ -84,7 +84,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Child Spawn -> KF Links House": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Child Spawn -> KF Links House": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Deku Tree Lobby", "from": "KF Outside Deku Tree"} } } diff --git a/tests/plando/boss_rush_fire_mq.json b/tests/plando/boss_rush_fire_mq.json index 0c7e08ad50..16be030ad0 100644 --- a/tests/plando/boss_rush_fire_mq.json +++ b/tests/plando/boss_rush_fire_mq.json @@ -87,7 +87,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Fire Temple Lower", "from": "DMC Fire Temple Entrance"} } } diff --git a/tests/plando/boss_rush_fire_vanilla.json b/tests/plando/boss_rush_fire_vanilla.json index 2da8ea124f..f7940c5e7d 100644 --- a/tests/plando/boss_rush_fire_vanilla.json +++ b/tests/plando/boss_rush_fire_vanilla.json @@ -84,7 +84,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Fire Temple Lower", "from": "DMC Fire Temple Entrance"} } } diff --git a/tests/plando/boss_rush_forest_mq.json b/tests/plando/boss_rush_forest_mq.json index 89b24364e0..1683f5dcf2 100644 --- a/tests/plando/boss_rush_forest_mq.json +++ b/tests/plando/boss_rush_forest_mq.json @@ -87,7 +87,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Forest Temple Lobby", "from": "SFM Forest Temple Entrance Ledge"} } } diff --git a/tests/plando/boss_rush_forest_vanilla.json b/tests/plando/boss_rush_forest_vanilla.json index 736c574a95..99ed24e166 100644 --- a/tests/plando/boss_rush_forest_vanilla.json +++ b/tests/plando/boss_rush_forest_vanilla.json @@ -84,7 +84,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Forest Temple Lobby", "from": "SFM Forest Temple Entrance Ledge"} } } diff --git a/tests/plando/boss_rush_jabu_mq.json b/tests/plando/boss_rush_jabu_mq.json index c3e20a373c..8f18660ecd 100644 --- a/tests/plando/boss_rush_jabu_mq.json +++ b/tests/plando/boss_rush_jabu_mq.json @@ -87,7 +87,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Child Spawn -> KF Links House": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Child Spawn -> KF Links House": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Jabu Jabus Belly Beginning", "from": "Zoras Fountain"} } } diff --git a/tests/plando/boss_rush_jabu_vanilla.json b/tests/plando/boss_rush_jabu_vanilla.json index d0aafd6859..845e32772e 100644 --- a/tests/plando/boss_rush_jabu_vanilla.json +++ b/tests/plando/boss_rush_jabu_vanilla.json @@ -84,7 +84,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Child Spawn -> KF Links House": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Child Spawn -> KF Links House": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Jabu Jabus Belly Beginning", "from": "Zoras Fountain"} } } diff --git a/tests/plando/boss_rush_shadow_mq.json b/tests/plando/boss_rush_shadow_mq.json index ff2c6339c0..1cd8243ef1 100644 --- a/tests/plando/boss_rush_shadow_mq.json +++ b/tests/plando/boss_rush_shadow_mq.json @@ -87,7 +87,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Shadow Temple Entryway", "from": "Graveyard Warp Pad Region"} } } diff --git a/tests/plando/boss_rush_shadow_mq_vanilla_keys.json b/tests/plando/boss_rush_shadow_mq_vanilla_keys.json index 888d5a4da4..38297c5695 100644 --- a/tests/plando/boss_rush_shadow_mq_vanilla_keys.json +++ b/tests/plando/boss_rush_shadow_mq_vanilla_keys.json @@ -87,7 +87,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Shadow Temple Entryway", "from": "Graveyard Warp Pad Region"} }, "locations": { diff --git a/tests/plando/boss_rush_shadow_vanilla.json b/tests/plando/boss_rush_shadow_vanilla.json index e8a2309722..9348dc2496 100644 --- a/tests/plando/boss_rush_shadow_vanilla.json +++ b/tests/plando/boss_rush_shadow_vanilla.json @@ -84,7 +84,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Shadow Temple Entryway", "from": "Graveyard Warp Pad Region"} } } diff --git a/tests/plando/boss_rush_spirit_mq.json b/tests/plando/boss_rush_spirit_mq.json index 419f8810e9..7895886f49 100644 --- a/tests/plando/boss_rush_spirit_mq.json +++ b/tests/plando/boss_rush_spirit_mq.json @@ -87,7 +87,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Spirit Temple Lobby", "from": "Desert Colossus"} } } diff --git a/tests/plando/boss_rush_spirit_vanilla.json b/tests/plando/boss_rush_spirit_vanilla.json index f7f813db26..b9a8c1a250 100644 --- a/tests/plando/boss_rush_spirit_vanilla.json +++ b/tests/plando/boss_rush_spirit_vanilla.json @@ -83,7 +83,7 @@ "Ganons Castle": "vanilla" }, "entrances": { - "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Kokiri Shop"}, + "Adult Spawn -> Temple of Time": {"region": "Kokiri Forest", "from": "KF Shop"}, "KF Outside Deku Tree -> Deku Tree Lobby": {"region": "Spirit Temple Lobby", "from": "Desert Colossus"} } } diff --git a/tests/plando/negative-pattern-test.json b/tests/plando/negative-pattern-test.json index a8c4f0138a..64d5fc4e03 100644 --- a/tests/plando/negative-pattern-test.json +++ b/tests/plando/negative-pattern-test.json @@ -3,10 +3,10 @@ "shopsanity": "4" }, "locations": { - "Kak 10 Gold Skulltula Reward": "!Gold Skulltula Token", - "Kak 20 Gold Skulltula Reward": "!Gold Skulltula Token", - "Kak 30 Gold Skulltula Reward": "!Gold Skulltula Token", - "Kak 40 Gold Skulltula Reward": "!Gold Skulltula Token", - "Kak 50 Gold Skulltula Reward": "!Gold Skulltula Token" + "Kak House of Skulltula 10 Gold Skulltula Reward": "!Gold Skulltula Token", + "Kak House of Skulltula 20 Gold Skulltula Reward": "!Gold Skulltula Token", + "Kak House of Skulltula 30 Gold Skulltula Reward": "!Gold Skulltula Token", + "Kak House of Skulltula 40 Gold Skulltula Reward": "!Gold Skulltula Token", + "Kak House of Skulltula 50 Gold Skulltula Reward": "!Gold Skulltula Token" } } \ No newline at end of file diff --git a/tests/plando/one-hint-per-goal-dungeons.json b/tests/plando/one-hint-per-goal-dungeons.json index bd2b587e36..aee960a0ef 100644 --- a/tests/plando/one-hint-per-goal-dungeons.json +++ b/tests/plando/one-hint-per-goal-dungeons.json @@ -81,8 +81,8 @@ "Ganons Castle Light Trial First Right Chest": "Hover Boots", "Ganons Castle Light Trial Second Right Chest": "Heart Container", "Ganons Castle Light Trial Third Right Chest": "Gold Skulltula Token", - "OGC Great Fairy Reward": "Rupees (5)", - "KF Midos Top Left Chest": "Ocarina", + "OGC Great Fairy Fountain Reward": "Rupees (5)", + "KF Midos House Top Left Chest": "Ocarina", "Bottom of the Well Front Left Fake Wall Chest": "Bomb Bag", "Bottom of the Well Front Center Bombable Chest": "Small Key (Bottom of the Well)", "Bottom of the Well Back Left Bombable Chest": "Kokiri Sword", diff --git a/tests/plando/one-hint-per-goal-hearts.json b/tests/plando/one-hint-per-goal-hearts.json index 64aab9a821..908c3384c4 100644 --- a/tests/plando/one-hint-per-goal-hearts.json +++ b/tests/plando/one-hint-per-goal-hearts.json @@ -81,8 +81,8 @@ "Ganons Castle Light Trial First Right Chest": "Hover Boots", "Ganons Castle Light Trial Second Right Chest": "Heart Container", "Ganons Castle Light Trial Third Right Chest": "Gold Skulltula Token", - "OGC Great Fairy Reward": "Rupees (5)", - "KF Midos Top Left Chest": "Ocarina", + "OGC Great Fairy Fountain Reward": "Rupees (5)", + "KF Midos House Top Left Chest": "Ocarina", "Bottom of the Well Front Left Fake Wall Chest": "Bomb Bag", "Bottom of the Well Front Center Bombable Chest": "Small Key (Bottom of the Well)", "Bottom of the Well Back Left Bombable Chest": "Kokiri Sword", diff --git a/tests/plando/one-hint-per-goal-medallions.json b/tests/plando/one-hint-per-goal-medallions.json index fe8bea9fb3..e253b98473 100644 --- a/tests/plando/one-hint-per-goal-medallions.json +++ b/tests/plando/one-hint-per-goal-medallions.json @@ -81,8 +81,8 @@ "Ganons Castle Light Trial First Right Chest": "Hover Boots", "Ganons Castle Light Trial Second Right Chest": "Heart Container", "Ganons Castle Light Trial Third Right Chest": "Gold Skulltula Token", - "OGC Great Fairy Reward": "Rupees (5)", - "KF Midos Top Left Chest": "Ocarina", + "OGC Great Fairy Fountain Reward": "Rupees (5)", + "KF Midos House Top Left Chest": "Ocarina", "Bottom of the Well Front Left Fake Wall Chest": "Bomb Bag", "Bottom of the Well Front Center Bombable Chest": "Small Key (Bottom of the Well)", "Bottom of the Well Back Left Bombable Chest": "Kokiri Sword", diff --git a/tests/plando/one-hint-per-goal-skulls.json b/tests/plando/one-hint-per-goal-skulls.json index 360febf44d..4d8bd740b2 100644 --- a/tests/plando/one-hint-per-goal-skulls.json +++ b/tests/plando/one-hint-per-goal-skulls.json @@ -81,8 +81,8 @@ "Ganons Castle Light Trial First Right Chest": "Hover Boots", "Ganons Castle Light Trial Second Right Chest": "Heart Container", "Ganons Castle Light Trial Third Right Chest": "Gold Skulltula Token", - "OGC Great Fairy Reward": "Rupees (5)", - "KF Midos Top Left Chest": "Ocarina", + "OGC Great Fairy Fountain Reward": "Rupees (5)", + "KF Midos House Top Left Chest": "Ocarina", "Bottom of the Well Front Left Fake Wall Chest": "Bomb Bag", "Bottom of the Well Front Center Bombable Chest": "Small Key (Bottom of the Well)", "Bottom of the Well Back Left Bombable Chest": "Kokiri Sword", diff --git a/tests/plando/one-hint-per-goal-stones.json b/tests/plando/one-hint-per-goal-stones.json index 061528c227..4d3e63e4a8 100644 --- a/tests/plando/one-hint-per-goal-stones.json +++ b/tests/plando/one-hint-per-goal-stones.json @@ -81,8 +81,8 @@ "Ganons Castle Light Trial First Right Chest": "Hover Boots", "Ganons Castle Light Trial Second Right Chest": "Heart Container", "Ganons Castle Light Trial Third Right Chest": "Gold Skulltula Token", - "OGC Great Fairy Reward": "Rupees (5)", - "KF Midos Top Left Chest": "Ocarina", + "OGC Great Fairy Fountain Reward": "Rupees (5)", + "KF Midos House Top Left Chest": "Ocarina", "Bottom of the Well Front Left Fake Wall Chest": "Bomb Bag", "Bottom of the Well Front Center Bombable Chest": "Small Key (Bottom of the Well)", "Bottom of the Well Back Left Bombable Chest": "Kokiri Sword", diff --git a/tests/plando/one-hint-per-goal-triforce-hunt.json b/tests/plando/one-hint-per-goal-triforce-hunt.json index 0db47dc5d5..4ba2a44641 100644 --- a/tests/plando/one-hint-per-goal-triforce-hunt.json +++ b/tests/plando/one-hint-per-goal-triforce-hunt.json @@ -82,8 +82,8 @@ "Ganons Castle Light Trial First Right Chest": "Hover Boots", "Ganons Castle Light Trial Second Right Chest": "Heart Container", "Ganons Castle Light Trial Third Right Chest": "Gold Skulltula Token", - "OGC Great Fairy Reward": "Rupees (5)", - "KF Midos Top Left Chest": "Ocarina", + "OGC Great Fairy Fountain Reward": "Rupees (5)", + "KF Midos House Top Left Chest": "Ocarina", "Bottom of the Well Front Left Fake Wall Chest": "Bomb Bag", "Bottom of the Well Front Center Bombable Chest": "Small Key (Bottom of the Well)", "Bottom of the Well Back Left Bombable Chest": "Kokiri Sword", diff --git a/tests/plando/plando-adult-trade-in-list.json b/tests/plando/plando-adult-trade-in-list.json index 17dd816c70..1a641d8ead 100644 --- a/tests/plando/plando-adult-trade-in-list.json +++ b/tests/plando/plando-adult-trade-in-list.json @@ -18,12 +18,12 @@ "GF HBA 1500 Points": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Wasteland Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Colossus Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Colossus Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "ToT Light Arrows Cutscene": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Colossus Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Temple of Time Light Arrow Cutscene": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "HC Malon Egg": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "HC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "OGC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Market Guard House 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], @@ -32,11 +32,11 @@ "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Kak 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Kak 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Kak 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Kak 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Kak House of Skulltula 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Kak House of Skulltula 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Kak House of Skulltula 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Kak House of Skulltula 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Kak House of Skulltula 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], @@ -45,8 +45,8 @@ "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Graveyard Heart Piece Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Graveyard Royal Familys Tomb Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Graveyard Dampe Race Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Graveyard Dampe Race Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Graveyard Dampes Grave Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Graveyard Dampes Grave Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "DMT Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "DMT Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "DMT Biggoron": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], @@ -59,8 +59,8 @@ "GC Darunias Joy": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "DMC Wall Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "DMC Volcano Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "DMC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "DMT Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "DMC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "DMT Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "ZR Frogs Ocarina Game": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "ZR Frogs in the Rain": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "ZR Near Open Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], @@ -70,19 +70,19 @@ "ZD King Zora Thawed": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "ZF Iceberg Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "ZF Bottom Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "ZF Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "LLR Talons Chickens": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "LLR Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "ZF Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "LLR Talons House Chickens": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "LLR Tower Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Ganons Tower Boss Key Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "KF Storms Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "LW Near Shortcuts Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Deku Theater Skull Mask": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Deku Theater Mask of Truth": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "LW Deku Scrub Grotto Front": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "LW Scrubs Grotto Deku Scrub Front": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "SFM Wolfos Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "HF Southeast Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "HF Open Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "HF Deku Scrub Grotto": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "HF Inside Fence Grotto Deku Scrub": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "HF Near Market Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "HF Tektite Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Redead Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], diff --git a/tests/plando/plando-adult-trade-item-group-in-list.json b/tests/plando/plando-adult-trade-item-group-in-list.json index c35a8dbf29..9f1b1ab335 100644 --- a/tests/plando/plando-adult-trade-item-group-in-list.json +++ b/tests/plando/plando-adult-trade-item-group-in-list.json @@ -18,12 +18,12 @@ "GF HBA 1500 Points": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Wasteland Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Colossus Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Colossus Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "ToT Light Arrows Cutscene": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Colossus Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Temple of Time Light Arrow Cutscene": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "HC Malon Egg": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "HC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "OGC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Market Guard House 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], @@ -32,11 +32,11 @@ "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Kak 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Kak 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Kak 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Kak 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Kak House of Skulltula 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Kak House of Skulltula 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Kak House of Skulltula 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Kak House of Skulltula 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Kak House of Skulltula 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], @@ -45,8 +45,8 @@ "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Graveyard Heart Piece Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Graveyard Royal Familys Tomb Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Graveyard Dampe Race Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Graveyard Dampe Race Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Graveyard Dampes Grave Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Graveyard Dampes Grave Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "DMT Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "DMT Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "DMT Biggoron": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], @@ -59,8 +59,8 @@ "GC Darunias Joy": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "DMC Wall Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "DMC Volcano Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "DMC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "DMT Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "DMC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "DMT Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "ZR Frogs Ocarina Game": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "ZR Frogs in the Rain": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "ZR Near Open Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], @@ -70,19 +70,19 @@ "ZD King Zora Thawed": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "ZF Iceberg Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "ZF Bottom Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "ZF Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "LLR Talons Chickens": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "LLR Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "ZF Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "LLR Talons House Chickens": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "LLR Tower Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Ganons Tower Boss Key Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "KF Storms Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "LW Near Shortcuts Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Deku Theater Skull Mask": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Deku Theater Mask of Truth": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "LW Deku Scrub Grotto Front": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "LW Scrubs Grotto Deku Scrub Front": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "SFM Wolfos Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "HF Southeast Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "HF Open Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "HF Deku Scrub Grotto": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "HF Inside Fence Grotto Deku Scrub": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "HF Near Market Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "HF Tektite Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Redead Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], diff --git a/tests/plando/plando-adult-trade-item-group.json b/tests/plando/plando-adult-trade-item-group.json index 8e59f817e8..b58af16fc2 100644 --- a/tests/plando/plando-adult-trade-item-group.json +++ b/tests/plando/plando-adult-trade-item-group.json @@ -1,5 +1,5 @@ { "locations": { - "KF Midos Top Left Chest": "#AdultTrade" + "KF Midos House Top Left Chest": "#AdultTrade" } } \ No newline at end of file diff --git a/tests/plando/plando-bottle-item-group-in-list.json b/tests/plando/plando-bottle-item-group-in-list.json index 1fa47d4c65..a13cdc6c1e 100644 --- a/tests/plando/plando-bottle-item-group-in-list.json +++ b/tests/plando/plando-bottle-item-group-in-list.json @@ -18,12 +18,12 @@ "GF HBA 1500 Points": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Wasteland Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Colossus Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Colossus Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "ToT Light Arrows Cutscene": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Colossus Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Temple of Time Light Arrow Cutscene": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "HC Malon Egg": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "HC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "OGC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Market Guard House 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], @@ -32,11 +32,11 @@ "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Kak 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Kak 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Kak 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Kak 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Kak House of Skulltula 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Kak House of Skulltula 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Kak House of Skulltula 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Kak House of Skulltula 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Kak House of Skulltula 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], @@ -45,8 +45,8 @@ "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Graveyard Heart Piece Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Graveyard Royal Familys Tomb Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Graveyard Dampe Race Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Graveyard Dampe Race Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Graveyard Dampes Grave Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Graveyard Dampes Grave Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "DMT Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "DMT Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "DMT Biggoron": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], @@ -59,8 +59,8 @@ "GC Darunias Joy": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "DMC Wall Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "DMC Volcano Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "DMC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "DMT Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "DMC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "DMT Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "ZR Frogs Ocarina Game": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "ZR Frogs in the Rain": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "ZR Near Open Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], @@ -70,19 +70,19 @@ "ZD King Zora Thawed": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "ZF Iceberg Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "ZF Bottom Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "ZF Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "LLR Talons Chickens": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "LLR Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "ZF Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "LLR Talons House Chickens": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "LLR Tower Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Ganons Tower Boss Key Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "KF Storms Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "LW Near Shortcuts Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Deku Theater Skull Mask": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Deku Theater Mask of Truth": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "LW Deku Scrub Grotto Front": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "LW Scrubs Grotto Deku Scrub Front": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "SFM Wolfos Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "HF Southeast Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "HF Open Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "HF Deku Scrub Grotto": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "HF Inside Fence Grotto Deku Scrub": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "HF Near Market Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "HF Tektite Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Redead Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], diff --git a/tests/plando/plando-bottle-item-group.json b/tests/plando/plando-bottle-item-group.json index 1968c220ac..9f33506997 100644 --- a/tests/plando/plando-bottle-item-group.json +++ b/tests/plando/plando-bottle-item-group.json @@ -3,9 +3,9 @@ "zora_fountain": "open" }, "locations": { - "KF Midos Top Left Chest": "#Bottle", - "KF Midos Top Right Chest": "#Bottle", - "KF Midos Bottom Left Chest": "#Bottle", - "KF Midos Bottom Right Chest": "#Bottle" + "KF Midos House Top Left Chest": "#Bottle", + "KF Midos House Top Right Chest": "#Bottle", + "KF Midos House Bottom Left Chest": "#Bottle", + "KF Midos House Bottom Right Chest": "#Bottle" } } \ No newline at end of file diff --git a/tests/plando/plando-bottles-in-list.json b/tests/plando/plando-bottles-in-list.json index 38ead1f533..289d57548a 100644 --- a/tests/plando/plando-bottles-in-list.json +++ b/tests/plando/plando-bottles-in-list.json @@ -18,12 +18,12 @@ "GF HBA 1500 Points": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Wasteland Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Colossus Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Colossus Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "ToT Light Arrows Cutscene": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Colossus Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Temple of Time Light Arrow Cutscene": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "HC Malon Egg": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "HC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "OGC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Market Guard House 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], @@ -32,11 +32,11 @@ "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Kak 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Kak 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Kak 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Kak 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Kak House of Skulltula 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Kak House of Skulltula 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Kak House of Skulltula 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Kak House of Skulltula 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Kak House of Skulltula 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], @@ -45,8 +45,8 @@ "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Graveyard Heart Piece Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Graveyard Royal Familys Tomb Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Graveyard Dampe Race Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Graveyard Dampe Race Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Graveyard Dampes Grave Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Graveyard Dampes Grave Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "DMT Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "DMT Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "DMT Biggoron": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], @@ -59,8 +59,8 @@ "GC Darunias Joy": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "DMC Wall Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "DMC Volcano Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "DMC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "DMT Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "DMC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "DMT Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "ZR Frogs Ocarina Game": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "ZR Frogs in the Rain": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "ZR Near Open Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], @@ -70,19 +70,19 @@ "ZD King Zora Thawed": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "ZF Iceberg Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "ZF Bottom Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "ZF Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "LLR Talons Chickens": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "LLR Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "ZF Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "LLR Talons House Chickens": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "LLR Tower Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Ganons Tower Boss Key Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "KF Storms Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "LW Near Shortcuts Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Deku Theater Skull Mask": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Deku Theater Mask of Truth": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "LW Deku Scrub Grotto Front": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "LW Scrubs Grotto Deku Scrub Front": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "SFM Wolfos Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "HF Southeast Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "HF Open Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "HF Deku Scrub Grotto": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "HF Inside Fence Grotto Deku Scrub": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "HF Near Market Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "HF Tektite Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Redead Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], diff --git a/tests/plando/plando-ctmc-test-reverse.json b/tests/plando/plando-ctmc-test-reverse.json index fd363fd18c..172b4e6dc3 100644 --- a/tests/plando/plando-ctmc-test-reverse.json +++ b/tests/plando/plando-ctmc-test-reverse.json @@ -143,10 +143,10 @@ "Child Spawn -> KF Links House": {"region": "KF Midos House", "from": "Kokiri Forest"} }, "locations": { - "KF Midos Top Left Chest": "Small Key (Forest Temple)", - "KF Midos Top Right Chest": "Boss Key (Forest Temple)", - "KF Midos Bottom Left Chest": "Kokiri Sword", - "KF Midos Bottom Right Chest": "Deku Nuts (5)", + "KF Midos House Top Left Chest": "Small Key (Forest Temple)", + "KF Midos House Top Right Chest": "Boss Key (Forest Temple)", + "KF Midos House Bottom Left Chest": "Kokiri Sword", + "KF Midos House Bottom Right Chest": "Deku Nuts (5)", "KF Kokiri Sword Chest": "Small Key (Forest Temple)", "Shadow Temple Hover Boots Chest": "Small Key (Shadow Temple)", "Gerudo Training Ground Maze Path First Chest": "Progressive Scale", diff --git a/tests/plando/plando-ctmc-test.json b/tests/plando/plando-ctmc-test.json index 2a1d62ae29..0c99ba12a3 100644 --- a/tests/plando/plando-ctmc-test.json +++ b/tests/plando/plando-ctmc-test.json @@ -143,10 +143,10 @@ "Child Spawn -> KF Links House": {"region": "KF Midos House", "from": "Kokiri Forest"} }, "locations": { - "KF Midos Top Left Chest": "Kokiri Sword", - "KF Midos Top Right Chest": "Deku Nuts (5)", - "KF Midos Bottom Left Chest": "Small Key (Forest Temple)", - "KF Midos Bottom Right Chest": "Boss Key (Forest Temple)", + "KF Midos House Top Left Chest": "Kokiri Sword", + "KF Midos House Top Right Chest": "Deku Nuts (5)", + "KF Midos House Bottom Left Chest": "Small Key (Forest Temple)", + "KF Midos House Bottom Right Chest": "Boss Key (Forest Temple)", "KF Kokiri Sword Chest": "Small Key (Forest Temple)", "Shadow Temple Hover Boots Chest": "Small Key (Shadow Temple)", "Gerudo Training Ground Maze Path First Chest": "Progressive Scale", diff --git a/tests/plando/plando-fix-broken-drops-bad.json b/tests/plando/plando-fix-broken-drops-bad.json index c5142c2267..9bd7fd6962 100644 --- a/tests/plando/plando-fix-broken-drops-bad.json +++ b/tests/plando/plando-fix-broken-drops-bad.json @@ -20,7 +20,7 @@ }, "entrances": { "Kakariko Village -> Kak Bazaar": { - "region": "KF Kokiri Shop", + "region": "KF Shop", "from": "Kokiri Forest" } } diff --git a/tests/plando/plando-fix-broken-drops-good.json b/tests/plando/plando-fix-broken-drops-good.json index d9f4c7a45d..6dc1169b7d 100644 --- a/tests/plando/plando-fix-broken-drops-good.json +++ b/tests/plando/plando-fix-broken-drops-good.json @@ -28,7 +28,7 @@ }, "entrances": { "Kakariko Village -> Kak Bazaar": { - "region": "KF Kokiri Shop", + "region": "KF Shop", "from": "Kokiri Forest" } } diff --git a/tests/plando/plando-goals-exclusions-skulls-bridge.json b/tests/plando/plando-goals-exclusions-skulls-bridge.json index 34a5a3f75e..47b897f034 100644 --- a/tests/plando/plando-goals-exclusions-skulls-bridge.json +++ b/tests/plando/plando-goals-exclusions-skulls-bridge.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Requiem of Spirit", "Sheik in Kakariko": "Minuet of Forest", "Sheik at Temple": "Eponas Song", - "KF Midos Top Left Chest": "Rupees (5)", - "KF Midos Top Right Chest": "Eyeball Frog", - "KF Midos Bottom Left Chest": "Boomerang", - "KF Midos Bottom Right Chest": "Hover Boots", + "KF Midos House Top Left Chest": "Rupees (5)", + "KF Midos House Top Right Chest": "Eyeball Frog", + "KF Midos House Bottom Left Chest": "Boomerang", + "KF Midos House Bottom Right Chest": "Hover Boots", "KF Kokiri Sword Chest": "Rupees (20)", "KF Storms Grotto Chest": "Piece of Heart", "LW Ocarina Memory Game": "Rupees (5)", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Rupees (5)", "LW Skull Kid": "Dins Fire", "LW Deku Scrub Near Bridge": {"item": "Nayrus Love", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Mirror Shield", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Mirror Shield", "price": 40}, "SFM Wolfos Grotto Chest": "Piece of Heart", "HF Near Market Grotto Chest": "Arrows (5)", "HF Tektite Grotto Freestanding PoH": "Deku Stick Capacity", "HF Southeast Grotto Chest": "Rupees (20)", "HF Open Grotto Chest": "Stone of Agony", - "HF Deku Scrub Grotto": {"item": "Piece of Heart", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Piece of Heart", "price": 10}, "Market Shooting Gallery Reward": "Bombs (10)", "Market Bombchu Bowling First Prize": "Rupees (20)", "Market Bombchu Bowling Second Prize": "Recovery Heart", "Market Lost Dog": "Rupees (5)", "Market Treasure Chest Game Reward": "Rupees (20)", - "Market 10 Big Poes": "Deku Stick Capacity", - "ToT Light Arrows Cutscene": "Rupees (5)", - "HC Great Fairy Reward": "Light Arrows", - "LLR Talons Chickens": "Arrows (10)", - "LLR Freestanding PoH": "Deku Stick (1)", + "Market Guard House 10 Big Poes": "Deku Stick Capacity", + "Temple of Time Light Arrow Cutscene": "Rupees (5)", + "HC Great Fairy Fountain Reward": "Light Arrows", + "LLR Talons House Chickens": "Arrows (10)", + "LLR Tower Freestanding PoH": "Deku Stick (1)", "Kak Anju as Child": "Rupees (5)", "Kak Anju as Adult": "Slingshot", "Kak Impas House Freestanding PoH": "Deku Shield", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Farores Wind", "Kak Redead Grotto Chest": "Recovery Heart", "Kak Shooting Gallery Reward": "Piece of Heart (Treasure Chest Game)", - "Kak 10 Gold Skulltula Reward": "Rupees (5)", - "Kak 20 Gold Skulltula Reward": "Rupees (20)", - "Kak 30 Gold Skulltula Reward": "Magic Meter", - "Kak 40 Gold Skulltula Reward": "Heart Container", - "Kak 50 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Rupees (5)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Rupees (20)", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Magic Meter", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Heart Container", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Piece of Heart", "Graveyard Shield Grave Chest": "Magic Meter", "Graveyard Heart Piece Grave Chest": "Rupees (5)", "Graveyard Royal Familys Tomb Chest": "Arrows (10)", "Graveyard Freestanding PoH": "Piece of Heart", "Graveyard Dampe Gravedigging Tour": "Arrows (30)", - "Graveyard Dampe Race Hookshot Chest": "Rupees (5)", - "Graveyard Dampe Race Freestanding PoH": "Piece of Heart", + "Graveyard Dampes Grave Hookshot Chest": "Rupees (5)", + "Graveyard Dampes Grave Freestanding PoH": "Piece of Heart", "DMT Freestanding PoH": "Piece of Heart", "DMT Chest": "Bombchus (10)", "DMT Storms Grotto Chest": "Rupees (50)", - "DMT Great Fairy Reward": "Piece of Heart", + "DMT Great Fairy Fountain Reward": "Piece of Heart", "DMT Biggoron": "Bombs (5)", "GC Darunias Joy": "Bombs (5)", "GC Pot Freestanding PoH": "Slingshot", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Rupees (50)", "DMC Wall Freestanding PoH": "Arrows (30)", "DMC Upper Grotto Chest": "Heart Container", - "DMC Great Fairy Reward": "Arrows (10)", + "DMC Great Fairy Fountain Reward": "Arrows (10)", "ZR Open Grotto Chest": "Rupees (200)", "ZR Frogs in the Rain": "Deku Stick (1)", "ZR Frogs Ocarina Game": "Piece of Heart", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Piece of Heart", "ZD Chest": "Bow", "ZD King Zora Thawed": "Bottle with Fish", - "ZF Great Fairy Reward": "Rupees (50)", + "ZF Great Fairy Fountain Reward": "Rupees (50)", "ZF Iceberg Freestanding PoH": "Deku Stick (1)", "ZF Bottom Freestanding PoH": "Rupees (5)", "LH Underwater Item": "Deku Seeds (30)", - "LH Child Fishing": "Recovery Heart", - "LH Adult Fishing": "Rupees (20)", + "LH Fishing Hole Child Reward": "Recovery Heart", + "LH Fishing Hole Adult Reward": "Rupees (20)", "LH Lab Dive": "Deku Nuts (5)", "LH Freestanding PoH": "Deku Nuts (5)", "LH Sun": "Arrows (5)", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Arrows (30)", "GF HBA 1500 Points": "Rupees (50)", "Wasteland Chest": "Bomb Bag", - "Colossus Great Fairy Reward": "Piece of Heart", + "Colossus Great Fairy Fountain Reward": "Piece of Heart", "Colossus Freestanding PoH": "Heart Container", - "OGC Great Fairy Reward": "Bomb Bag", + "OGC Great Fairy Fountain Reward": "Bomb Bag", "Deku Tree Map Chest": "Rutos Letter", "Deku Tree Slingshot Room Side Chest": "Recovery Heart", "Deku Tree Slingshot Chest": "Piece of Heart", diff --git a/tests/plando/plando-goals-exclusions-skulls-gbk.json b/tests/plando/plando-goals-exclusions-skulls-gbk.json index 0bfa0575f3..396424ab29 100644 --- a/tests/plando/plando-goals-exclusions-skulls-gbk.json +++ b/tests/plando/plando-goals-exclusions-skulls-gbk.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Requiem of Spirit", "Sheik in Kakariko": "Minuet of Forest", "Sheik at Temple": "Eponas Song", - "KF Midos Top Left Chest": "Rupees (5)", - "KF Midos Top Right Chest": "Eyeball Frog", - "KF Midos Bottom Left Chest": "Boomerang", - "KF Midos Bottom Right Chest": "Hover Boots", + "KF Midos House Top Left Chest": "Rupees (5)", + "KF Midos House Top Right Chest": "Eyeball Frog", + "KF Midos House Bottom Left Chest": "Boomerang", + "KF Midos House Bottom Right Chest": "Hover Boots", "KF Kokiri Sword Chest": "Rupees (20)", "KF Storms Grotto Chest": "Piece of Heart", "LW Ocarina Memory Game": "Rupees (5)", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Rupees (5)", "LW Skull Kid": "Dins Fire", "LW Deku Scrub Near Bridge": {"item": "Nayrus Love", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Mirror Shield", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Mirror Shield", "price": 40}, "SFM Wolfos Grotto Chest": "Piece of Heart", "HF Near Market Grotto Chest": "Arrows (5)", "HF Tektite Grotto Freestanding PoH": "Deku Stick Capacity", "HF Southeast Grotto Chest": "Rupees (20)", "HF Open Grotto Chest": "Stone of Agony", - "HF Deku Scrub Grotto": {"item": "Piece of Heart", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Piece of Heart", "price": 10}, "Market Shooting Gallery Reward": "Bombs (10)", "Market Bombchu Bowling First Prize": "Rupees (20)", "Market Bombchu Bowling Second Prize": "Recovery Heart", "Market Lost Dog": "Rupees (5)", "Market Treasure Chest Game Reward": "Rupees (20)", - "Market 10 Big Poes": "Deku Stick Capacity", - "ToT Light Arrows Cutscene": "Rupees (5)", - "HC Great Fairy Reward": "Light Arrows", - "LLR Talons Chickens": "Arrows (10)", - "LLR Freestanding PoH": "Deku Stick (1)", + "Market Guard House 10 Big Poes": "Deku Stick Capacity", + "Temple of Time Light Arrow Cutscene": "Rupees (5)", + "HC Great Fairy Fountain Reward": "Light Arrows", + "LLR Talons House Chickens": "Arrows (10)", + "LLR Tower Freestanding PoH": "Deku Stick (1)", "Kak Anju as Child": "Rupees (5)", "Kak Anju as Adult": "Slingshot", "Kak Impas House Freestanding PoH": "Deku Shield", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Farores Wind", "Kak Redead Grotto Chest": "Recovery Heart", "Kak Shooting Gallery Reward": "Piece of Heart (Treasure Chest Game)", - "Kak 10 Gold Skulltula Reward": "Rupees (5)", - "Kak 20 Gold Skulltula Reward": "Rupees (20)", - "Kak 30 Gold Skulltula Reward": "Magic Meter", - "Kak 40 Gold Skulltula Reward": "Heart Container", - "Kak 50 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Rupees (5)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Rupees (20)", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Magic Meter", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Heart Container", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Piece of Heart", "Graveyard Shield Grave Chest": "Magic Meter", "Graveyard Heart Piece Grave Chest": "Rupees (5)", "Graveyard Royal Familys Tomb Chest": "Arrows (10)", "Graveyard Freestanding PoH": "Piece of Heart", "Graveyard Dampe Gravedigging Tour": "Arrows (30)", - "Graveyard Dampe Race Hookshot Chest": "Rupees (5)", - "Graveyard Dampe Race Freestanding PoH": "Piece of Heart", + "Graveyard Dampes Grave Hookshot Chest": "Rupees (5)", + "Graveyard Dampes Grave Freestanding PoH": "Piece of Heart", "DMT Freestanding PoH": "Piece of Heart", "DMT Chest": "Bombchus (10)", "DMT Storms Grotto Chest": "Rupees (50)", - "DMT Great Fairy Reward": "Piece of Heart", + "DMT Great Fairy Fountain Reward": "Piece of Heart", "DMT Biggoron": "Bombs (5)", "GC Darunias Joy": "Bombs (5)", "GC Pot Freestanding PoH": "Slingshot", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Rupees (50)", "DMC Wall Freestanding PoH": "Arrows (30)", "DMC Upper Grotto Chest": "Heart Container", - "DMC Great Fairy Reward": "Arrows (10)", + "DMC Great Fairy Fountain Reward": "Arrows (10)", "ZR Open Grotto Chest": "Rupees (200)", "ZR Frogs in the Rain": "Deku Stick (1)", "ZR Frogs Ocarina Game": "Piece of Heart", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Piece of Heart", "ZD Chest": "Bow", "ZD King Zora Thawed": "Bottle with Fish", - "ZF Great Fairy Reward": "Rupees (50)", + "ZF Great Fairy Fountain Reward": "Rupees (50)", "ZF Iceberg Freestanding PoH": "Deku Stick (1)", "ZF Bottom Freestanding PoH": "Rupees (5)", "LH Underwater Item": "Deku Seeds (30)", - "LH Child Fishing": "Recovery Heart", - "LH Adult Fishing": "Rupees (20)", + "LH Fishing Hole Child Reward": "Recovery Heart", + "LH Fishing Hole Adult Reward": "Rupees (20)", "LH Lab Dive": "Deku Nuts (5)", "LH Freestanding PoH": "Deku Nuts (5)", "LH Sun": "Arrows (5)", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Arrows (30)", "GF HBA 1500 Points": "Rupees (50)", "Wasteland Chest": "Bomb Bag", - "Colossus Great Fairy Reward": "Piece of Heart", + "Colossus Great Fairy Fountain Reward": "Piece of Heart", "Colossus Freestanding PoH": "Heart Container", - "OGC Great Fairy Reward": "Bomb Bag", + "OGC Great Fairy Fountain Reward": "Bomb Bag", "Deku Tree Map Chest": "Rutos Letter", "Deku Tree Slingshot Room Side Chest": "Recovery Heart", "Deku Tree Slingshot Chest": "Piece of Heart", diff --git a/tests/plando/plando-goals-exclusions-var-dungeons.json b/tests/plando/plando-goals-exclusions-var-dungeons.json index 654f5f2e16..bc3c25248f 100644 --- a/tests/plando/plando-goals-exclusions-var-dungeons.json +++ b/tests/plando/plando-goals-exclusions-var-dungeons.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Song of Time", "Sheik in Kakariko": "Serenade of Water", "Sheik at Temple": "Zeldas Lullaby", - "KF Midos Top Left Chest": "Deku Shield", - "KF Midos Top Right Chest": "Piece of Heart", - "KF Midos Bottom Left Chest": "Rupees (20)", - "KF Midos Bottom Right Chest": "Piece of Heart", + "KF Midos House Top Left Chest": "Deku Shield", + "KF Midos House Top Right Chest": "Piece of Heart", + "KF Midos House Bottom Left Chest": "Rupees (20)", + "KF Midos House Bottom Right Chest": "Piece of Heart", "KF Kokiri Sword Chest": "Bomb Bag", "KF Storms Grotto Chest": "Arrows (10)", "LW Ocarina Memory Game": "Bottle with Bugs", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Rupees (20)", "LW Skull Kid": "Light Arrows", "LW Deku Scrub Near Bridge": {"item": "Arrows (30)", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Rupee (1)", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Rupee (1)", "price": 40}, "SFM Wolfos Grotto Chest": "Rupees (50)", "HF Near Market Grotto Chest": "Rupees (5)", "HF Tektite Grotto Freestanding PoH": "Rupees (200)", "HF Southeast Grotto Chest": "Piece of Heart", "HF Open Grotto Chest": "Ice Arrows", - "HF Deku Scrub Grotto": {"item": "Deku Stick (1)", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Deku Stick (1)", "price": 10}, "Market Shooting Gallery Reward": "Piece of Heart", "Market Bombchu Bowling First Prize": "Piece of Heart", "Market Bombchu Bowling Second Prize": "Mirror Shield", "Market Lost Dog": "Bombs (5)", "Market Treasure Chest Game Reward": "Piece of Heart", - "Market 10 Big Poes": "Deku Seeds (30)", - "ToT Light Arrows Cutscene": "Rupees (5)", - "HC Great Fairy Reward": "Bombchus (20)", - "LLR Talons Chickens": "Deku Nuts (5)", - "LLR Freestanding PoH": "Heart Container", + "Market Guard House 10 Big Poes": "Deku Seeds (30)", + "Temple of Time Light Arrow Cutscene": "Rupees (5)", + "HC Great Fairy Fountain Reward": "Bombchus (20)", + "LLR Talons House Chickens": "Deku Nuts (5)", + "LLR Tower Freestanding PoH": "Heart Container", "Kak Anju as Child": "Bottle with Green Potion", "Kak Anju as Adult": "Rupees (200)", "Kak Impas House Freestanding PoH": "Deku Seeds (30)", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Deku Seeds (30)", "Kak Redead Grotto Chest": "Piece of Heart", "Kak Shooting Gallery Reward": "Piece of Heart", - "Kak 10 Gold Skulltula Reward": "Rupees (5)", - "Kak 20 Gold Skulltula Reward": "Piece of Heart", - "Kak 30 Gold Skulltula Reward": "Double Defense", - "Kak 40 Gold Skulltula Reward": "Bomb Bag", - "Kak 50 Gold Skulltula Reward": "Slingshot", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Rupees (5)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Double Defense", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Bomb Bag", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Slingshot", "Graveyard Shield Grave Chest": "Rupees (20)", "Graveyard Heart Piece Grave Chest": "Bomb Bag", "Graveyard Royal Familys Tomb Chest": "Rupees (200)", "Graveyard Freestanding PoH": "Bow", "Graveyard Dampe Gravedigging Tour": "Boomerang", - "Graveyard Dampe Race Hookshot Chest": "Piece of Heart", - "Graveyard Dampe Race Freestanding PoH": "Arrows (10)", + "Graveyard Dampes Grave Hookshot Chest": "Piece of Heart", + "Graveyard Dampes Grave Freestanding PoH": "Arrows (10)", "DMT Freestanding PoH": "Bottle with Green Potion", "DMT Chest": "Rupees (5)", "DMT Storms Grotto Chest": "Bombchus (10)", - "DMT Great Fairy Reward": "Rupees (5)", + "DMT Great Fairy Fountain Reward": "Rupees (5)", "DMT Biggoron": "Piece of Heart", "GC Darunias Joy": "Recovery Heart", "GC Pot Freestanding PoH": "Arrows (10)", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Rupees (20)", "DMC Wall Freestanding PoH": "Piece of Heart", "DMC Upper Grotto Chest": "Rupees (5)", - "DMC Great Fairy Reward": "Recovery Heart", + "DMC Great Fairy Fountain Reward": "Recovery Heart", "ZR Open Grotto Chest": "Recovery Heart", "ZR Frogs in the Rain": "Piece of Heart (Treasure Chest Game)", "ZR Frogs Ocarina Game": "Piece of Heart", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Arrows (5)", "ZD Chest": "Slingshot", "ZD King Zora Thawed": "Deku Stick Capacity", - "ZF Great Fairy Reward": "Bombs (20)", + "ZF Great Fairy Fountain Reward": "Bombs (20)", "ZF Iceberg Freestanding PoH": "Deku Nut Capacity", "ZF Bottom Freestanding PoH": "Rupees (5)", "LH Underwater Item": "Progressive Strength Upgrade", - "LH Child Fishing": "Arrows (10)", - "LH Adult Fishing": "Arrows (30)", + "LH Fishing Hole Child Reward": "Arrows (10)", + "LH Fishing Hole Adult Reward": "Arrows (30)", "LH Lab Dive": "Piece of Heart", "LH Freestanding PoH": "Rupees (5)", "LH Sun": "Farores Wind", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Heart Container", "GF HBA 1500 Points": "Recovery Heart", "Wasteland Chest": "Rupees (200)", - "Colossus Great Fairy Reward": "Rupees (50)", + "Colossus Great Fairy Fountain Reward": "Rupees (50)", "Colossus Freestanding PoH": "Piece of Heart", - "OGC Great Fairy Reward": "Deku Stick Capacity", + "OGC Great Fairy Fountain Reward": "Deku Stick Capacity", "Deku Tree Map Chest": "Progressive Hookshot", "Deku Tree Slingshot Room Side Chest": "Deku Nuts (5)", "Deku Tree Slingshot Chest": "Arrows (30)", diff --git a/tests/plando/plando-goals-exclusions-var-meds.json b/tests/plando/plando-goals-exclusions-var-meds.json index 408d29ae1c..42285c1847 100644 --- a/tests/plando/plando-goals-exclusions-var-meds.json +++ b/tests/plando/plando-goals-exclusions-var-meds.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Song of Time", "Sheik in Kakariko": "Serenade of Water", "Sheik at Temple": "Zeldas Lullaby", - "KF Midos Top Left Chest": "Deku Shield", - "KF Midos Top Right Chest": "Piece of Heart", - "KF Midos Bottom Left Chest": "Rupees (20)", - "KF Midos Bottom Right Chest": "Piece of Heart", + "KF Midos House Top Left Chest": "Deku Shield", + "KF Midos House Top Right Chest": "Piece of Heart", + "KF Midos House Bottom Left Chest": "Rupees (20)", + "KF Midos House Bottom Right Chest": "Piece of Heart", "KF Kokiri Sword Chest": "Bomb Bag", "KF Storms Grotto Chest": "Arrows (10)", "LW Ocarina Memory Game": "Bottle with Bugs", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Rupees (20)", "LW Skull Kid": "Light Arrows", "LW Deku Scrub Near Bridge": {"item": "Arrows (30)", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Rupee (1)", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Rupee (1)", "price": 40}, "SFM Wolfos Grotto Chest": "Rupees (50)", "HF Near Market Grotto Chest": "Rupees (5)", "HF Tektite Grotto Freestanding PoH": "Rupees (200)", "HF Southeast Grotto Chest": "Piece of Heart", "HF Open Grotto Chest": "Ice Arrows", - "HF Deku Scrub Grotto": {"item": "Deku Stick (1)", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Deku Stick (1)", "price": 10}, "Market Shooting Gallery Reward": "Piece of Heart", "Market Bombchu Bowling First Prize": "Piece of Heart", "Market Bombchu Bowling Second Prize": "Mirror Shield", "Market Lost Dog": "Bombs (5)", "Market Treasure Chest Game Reward": "Piece of Heart", - "Market 10 Big Poes": "Deku Seeds (30)", - "ToT Light Arrows Cutscene": "Rupees (5)", - "HC Great Fairy Reward": "Bombchus (20)", - "LLR Talons Chickens": "Deku Nuts (5)", - "LLR Freestanding PoH": "Heart Container", + "Market Guard House 10 Big Poes": "Deku Seeds (30)", + "Temple of Time Light Arrow Cutscene": "Rupees (5)", + "HC Great Fairy Fountain Reward": "Bombchus (20)", + "LLR Talons House Chickens": "Deku Nuts (5)", + "LLR Tower Freestanding PoH": "Heart Container", "Kak Anju as Child": "Bottle with Green Potion", "Kak Anju as Adult": "Rupees (200)", "Kak Impas House Freestanding PoH": "Deku Seeds (30)", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Deku Seeds (30)", "Kak Redead Grotto Chest": "Piece of Heart", "Kak Shooting Gallery Reward": "Piece of Heart", - "Kak 10 Gold Skulltula Reward": "Rupees (5)", - "Kak 20 Gold Skulltula Reward": "Piece of Heart", - "Kak 30 Gold Skulltula Reward": "Double Defense", - "Kak 40 Gold Skulltula Reward": "Bomb Bag", - "Kak 50 Gold Skulltula Reward": "Slingshot", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Rupees (5)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Double Defense", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Bomb Bag", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Slingshot", "Graveyard Shield Grave Chest": "Rupees (20)", "Graveyard Heart Piece Grave Chest": "Bomb Bag", "Graveyard Royal Familys Tomb Chest": "Rupees (200)", "Graveyard Freestanding PoH": "Bow", "Graveyard Dampe Gravedigging Tour": "Boomerang", - "Graveyard Dampe Race Hookshot Chest": "Piece of Heart", - "Graveyard Dampe Race Freestanding PoH": "Arrows (10)", + "Graveyard Dampes Grave Hookshot Chest": "Piece of Heart", + "Graveyard Dampes Grave Freestanding PoH": "Arrows (10)", "DMT Freestanding PoH": "Bottle with Green Potion", "DMT Chest": "Rupees (5)", "DMT Storms Grotto Chest": "Bombchus (10)", - "DMT Great Fairy Reward": "Rupees (5)", + "DMT Great Fairy Fountain Reward": "Rupees (5)", "DMT Biggoron": "Piece of Heart", "GC Darunias Joy": "Recovery Heart", "GC Pot Freestanding PoH": "Arrows (10)", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Rupees (20)", "DMC Wall Freestanding PoH": "Piece of Heart", "DMC Upper Grotto Chest": "Rupees (5)", - "DMC Great Fairy Reward": "Recovery Heart", + "DMC Great Fairy Fountain Reward": "Recovery Heart", "ZR Open Grotto Chest": "Recovery Heart", "ZR Frogs in the Rain": "Piece of Heart (Treasure Chest Game)", "ZR Frogs Ocarina Game": "Piece of Heart", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Arrows (5)", "ZD Chest": "Slingshot", "ZD King Zora Thawed": "Deku Stick Capacity", - "ZF Great Fairy Reward": "Bombs (20)", + "ZF Great Fairy Fountain Reward": "Bombs (20)", "ZF Iceberg Freestanding PoH": "Deku Nut Capacity", "ZF Bottom Freestanding PoH": "Rupees (5)", "LH Underwater Item": "Progressive Strength Upgrade", - "LH Child Fishing": "Arrows (10)", - "LH Adult Fishing": "Arrows (30)", + "LH Fishing Hole Child Reward": "Arrows (10)", + "LH Fishing Hole Adult Reward": "Arrows (30)", "LH Lab Dive": "Piece of Heart", "LH Freestanding PoH": "Rupees (5)", "LH Sun": "Farores Wind", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Heart Container", "GF HBA 1500 Points": "Recovery Heart", "Wasteland Chest": "Rupees (200)", - "Colossus Great Fairy Reward": "Rupees (50)", + "Colossus Great Fairy Fountain Reward": "Rupees (50)", "Colossus Freestanding PoH": "Piece of Heart", - "OGC Great Fairy Reward": "Deku Stick Capacity", + "OGC Great Fairy Fountain Reward": "Deku Stick Capacity", "Deku Tree Map Chest": "Progressive Hookshot", "Deku Tree Slingshot Room Side Chest": "Deku Nuts (5)", "Deku Tree Slingshot Chest": "Arrows (30)", diff --git a/tests/plando/plando-goals-exclusions-var-stones.json b/tests/plando/plando-goals-exclusions-var-stones.json index e96011d55e..61f4147bad 100644 --- a/tests/plando/plando-goals-exclusions-var-stones.json +++ b/tests/plando/plando-goals-exclusions-var-stones.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Song of Time", "Sheik in Kakariko": "Sarias Song", "Sheik at Temple": "Requiem of Spirit", - "KF Midos Top Left Chest": "Deku Nut Capacity", - "KF Midos Top Right Chest": "Piece of Heart", - "KF Midos Bottom Left Chest": "Rupees (50)", - "KF Midos Bottom Right Chest": "Arrows (30)", + "KF Midos House Top Left Chest": "Deku Nut Capacity", + "KF Midos House Top Right Chest": "Piece of Heart", + "KF Midos House Bottom Left Chest": "Rupees (50)", + "KF Midos House Bottom Right Chest": "Arrows (30)", "KF Kokiri Sword Chest": "Heart Container", "KF Storms Grotto Chest": "Bombchus (10)", "LW Ocarina Memory Game": "Arrows (10)", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Rupees (50)", "LW Skull Kid": "Heart Container", "LW Deku Scrub Near Bridge": {"item": "Piece of Heart", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Piece of Heart", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Piece of Heart", "price": 40}, "SFM Wolfos Grotto Chest": "Fire Arrows", "HF Near Market Grotto Chest": "Deku Shield", "HF Tektite Grotto Freestanding PoH": "Rupees (5)", "HF Southeast Grotto Chest": "Magic Meter", "HF Open Grotto Chest": "Rupees (200)", - "HF Deku Scrub Grotto": {"item": "Bomb Bag", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Bomb Bag", "price": 10}, "Market Shooting Gallery Reward": "Rupees (5)", "Market Bombchu Bowling First Prize": "Rupees (5)", "Market Bombchu Bowling Second Prize": "Piece of Heart", "Market Lost Dog": "Piece of Heart", "Market Treasure Chest Game Reward": "Recovery Heart", - "Market 10 Big Poes": "Bottle", - "ToT Light Arrows Cutscene": "Arrows (10)", - "HC Great Fairy Reward": "Slingshot", - "LLR Talons Chickens": "Piece of Heart", - "LLR Freestanding PoH": "Bombchus (20)", + "Market Guard House 10 Big Poes": "Bottle", + "Temple of Time Light Arrow Cutscene": "Arrows (10)", + "HC Great Fairy Fountain Reward": "Slingshot", + "LLR Talons House Chickens": "Piece of Heart", + "LLR Tower Freestanding PoH": "Bombchus (20)", "Kak Anju as Child": "Rupees (5)", "Kak Anju as Adult": "Rupees (5)", "Kak Impas House Freestanding PoH": "Piece of Heart", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Rupees (5)", "Kak Redead Grotto Chest": "Arrows (5)", "Kak Shooting Gallery Reward": "Piece of Heart", - "Kak 10 Gold Skulltula Reward": "Recovery Heart", - "Kak 20 Gold Skulltula Reward": "Megaton Hammer", - "Kak 30 Gold Skulltula Reward": "Progressive Scale", - "Kak 40 Gold Skulltula Reward": "Bombs (10)", - "Kak 50 Gold Skulltula Reward": "Rupees (5)", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Recovery Heart", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Megaton Hammer", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Progressive Scale", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Bombs (10)", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Rupees (5)", "Graveyard Shield Grave Chest": "Piece of Heart", "Graveyard Heart Piece Grave Chest": "Farores Wind", "Graveyard Royal Familys Tomb Chest": "Rupees (5)", "Graveyard Freestanding PoH": "Kokiri Sword", "Graveyard Dampe Gravedigging Tour": "Recovery Heart", - "Graveyard Dampe Race Hookshot Chest": "Magic Meter", - "Graveyard Dampe Race Freestanding PoH": "Rupees (5)", + "Graveyard Dampes Grave Hookshot Chest": "Magic Meter", + "Graveyard Dampes Grave Freestanding PoH": "Rupees (5)", "DMT Freestanding PoH": "Hylian Shield", "DMT Chest": "Piece of Heart", "DMT Storms Grotto Chest": "Piece of Heart", - "DMT Great Fairy Reward": "Deku Stick Capacity", + "DMT Great Fairy Fountain Reward": "Deku Stick Capacity", "DMT Biggoron": "Stone of Agony", "GC Darunias Joy": "Slingshot", "GC Pot Freestanding PoH": "Recovery Heart", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Recovery Heart", "DMC Wall Freestanding PoH": "Recovery Heart", "DMC Upper Grotto Chest": "Rupees (20)", - "DMC Great Fairy Reward": "Bombs (5)", + "DMC Great Fairy Fountain Reward": "Bombs (5)", "ZR Open Grotto Chest": "Bombs (20)", "ZR Frogs in the Rain": "Recovery Heart", "ZR Frogs Ocarina Game": "Biggoron Sword", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Rupees (50)", "ZD Chest": "Piece of Heart", "ZD King Zora Thawed": "Bombs (5)", - "ZF Great Fairy Reward": "Bomb Bag", + "ZF Great Fairy Fountain Reward": "Bomb Bag", "ZF Iceberg Freestanding PoH": "Arrows (30)", "ZF Bottom Freestanding PoH": "Piece of Heart", "LH Underwater Item": "Piece of Heart", - "LH Child Fishing": "Piece of Heart", - "LH Adult Fishing": "Bombchus (5)", + "LH Fishing Hole Child Reward": "Piece of Heart", + "LH Fishing Hole Adult Reward": "Bombchus (5)", "LH Lab Dive": "Rupees (5)", "LH Freestanding PoH": "Deku Seeds (30)", "LH Sun": "Piece of Heart", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Piece of Heart (Treasure Chest Game)", "GF HBA 1500 Points": "Dins Fire", "Wasteland Chest": "Progressive Strength Upgrade", - "Colossus Great Fairy Reward": "Piece of Heart", + "Colossus Great Fairy Fountain Reward": "Piece of Heart", "Colossus Freestanding PoH": "Bombs (20)", - "OGC Great Fairy Reward": "Deku Nut Capacity", + "OGC Great Fairy Fountain Reward": "Deku Nut Capacity", "Deku Tree Map Chest": "Arrows (30)", "Deku Tree Slingshot Room Side Chest": "Bombs (5)", "Deku Tree Slingshot Chest": "Light Arrows", diff --git a/tests/plando/plando-goals-multiworld-crisscross-entrance-locks.json b/tests/plando/plando-goals-multiworld-crisscross-entrance-locks.json index 180a53b192..56d98dd727 100644 --- a/tests/plando/plando-goals-multiworld-crisscross-entrance-locks.json +++ b/tests/plando/plando-goals-multiworld-crisscross-entrance-locks.json @@ -259,10 +259,10 @@ "Sheik at Colossus": {"item": "Zeldas Lullaby", "player": 1}, "Sheik in Kakariko": {"item": "Sarias Song", "player": 1}, "Sheik at Temple": {"item": "Serenade of Water", "player": 1}, - "KF Midos Top Left Chest": {"item": "Heart Container", "player": 2}, - "KF Midos Top Right Chest": {"item": "Progressive Strength Upgrade", "player": 2}, - "KF Midos Bottom Left Chest": {"item": "Rupees (20)", "player": 1}, - "KF Midos Bottom Right Chest": {"item": "Slingshot", "player": 1}, + "KF Midos House Top Left Chest": {"item": "Heart Container", "player": 2}, + "KF Midos House Top Right Chest": {"item": "Progressive Strength Upgrade", "player": 2}, + "KF Midos House Bottom Left Chest": {"item": "Rupees (20)", "player": 1}, + "KF Midos House Bottom Right Chest": {"item": "Slingshot", "player": 1}, "KF Kokiri Sword Chest": {"item": "Piece of Heart", "player": 2}, "KF Storms Grotto Chest": {"item": "Rupees (5)", "player": 1}, "LW Ocarina Memory Game": {"item": "Deku Nuts (5)", "player": 2}, @@ -272,23 +272,23 @@ "Deku Theater Mask of Truth": {"item": "Deku Nuts (10)", "player": 1}, "LW Skull Kid": {"item": "Rupees (5)", "player": 2}, "LW Deku Scrub Near Bridge": {"item": "Piece of Heart", "player": 2, "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Piece of Heart", "player": 1, "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Piece of Heart", "player": 1, "price": 40}, "SFM Wolfos Grotto Chest": {"item": "Piece of Heart", "player": 1}, "HF Near Market Grotto Chest": {"item": "Piece of Heart", "player": 1}, "HF Tektite Grotto Freestanding PoH": {"item": "Bombs (10)", "player": 1}, "HF Southeast Grotto Chest": {"item": "Hylian Shield", "player": 1}, "HF Open Grotto Chest": {"item": "Slingshot", "player": 2}, - "HF Deku Scrub Grotto": {"item": "Recovery Heart", "player": 1, "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Recovery Heart", "player": 1, "price": 10}, "Market Shooting Gallery Reward": {"item": "Heart Container", "player": 2}, "Market Bombchu Bowling First Prize": {"item": "Piece of Heart", "player": 2}, "Market Bombchu Bowling Second Prize": {"item": "Rupees (5)", "player": 1}, "Market Lost Dog": {"item": "Rupees (5)", "player": 2}, "Market Treasure Chest Game Reward": {"item": "Rupees (5)", "player": 2}, - "Market 10 Big Poes": {"item": "Progressive Strength Upgrade", "player": 1}, - "ToT Light Arrows Cutscene": {"item": "Rupees (5)", "player": 1}, - "HC Great Fairy Reward": {"item": "Arrows (30)", "player": 2}, - "LLR Talons Chickens": {"item": "Hover Boots", "player": 2}, - "LLR Freestanding PoH": {"item": "Ice Arrows", "player": 1}, + "Market Guard House 10 Big Poes": {"item": "Progressive Strength Upgrade", "player": 1}, + "Temple of Time Light Arrow Cutscene": {"item": "Rupees (5)", "player": 1}, + "HC Great Fairy Fountain Reward": {"item": "Arrows (30)", "player": 2}, + "LLR Talons House Chickens": {"item": "Hover Boots", "player": 2}, + "LLR Tower Freestanding PoH": {"item": "Ice Arrows", "player": 1}, "Kak Anju as Child": {"item": "Deku Stick (1)", "player": 2}, "Kak Anju as Adult": {"item": "Rupees (50)", "player": 1}, "Kak Impas House Freestanding PoH": {"item": "Deku Shield", "player": 2}, @@ -297,18 +297,18 @@ "Kak Open Grotto Chest": {"item": "Deku Shield", "player": 1}, "Kak Redead Grotto Chest": {"item": "Rupees (5)", "player": 2}, "Kak Shooting Gallery Reward": {"item": "Piece of Heart", "player": 2}, - "Kak 10 Gold Skulltula Reward": {"item": "Rupees (20)", "player": 1}, - "Kak 20 Gold Skulltula Reward": {"item": "Megaton Hammer", "player": 2}, - "Kak 30 Gold Skulltula Reward": {"item": "Bombs (5)", "player": 2}, - "Kak 40 Gold Skulltula Reward": {"item": "Arrows (5)", "player": 1}, - "Kak 50 Gold Skulltula Reward": {"item": "Piece of Heart", "player": 2}, + "Kak House of Skulltula 10 Gold Skulltula Reward": {"item": "Rupees (20)", "player": 1}, + "Kak House of Skulltula 20 Gold Skulltula Reward": {"item": "Megaton Hammer", "player": 2}, + "Kak House of Skulltula 30 Gold Skulltula Reward": {"item": "Bombs (5)", "player": 2}, + "Kak House of Skulltula 40 Gold Skulltula Reward": {"item": "Arrows (5)", "player": 1}, + "Kak House of Skulltula 50 Gold Skulltula Reward": {"item": "Piece of Heart", "player": 2}, "Graveyard Shield Grave Chest": {"item": "Deku Stick Capacity", "player": 2}, "Graveyard Heart Piece Grave Chest": {"item": "Deku Seeds (30)", "player": 2}, "Graveyard Royal Familys Tomb Chest": {"item": "Recovery Heart", "player": 1}, "Graveyard Freestanding PoH": {"item": "Arrows (5)", "player": 2}, "Graveyard Dampe Gravedigging Tour": {"item": "Double Defense", "player": 2}, - "Graveyard Dampe Race Hookshot Chest": {"item": "Piece of Heart", "player": 1}, - "Graveyard Dampe Race Freestanding PoH": {"item": "Arrows (30)", "player": 2}, + "Graveyard Dampes Grave Hookshot Chest": {"item": "Piece of Heart", "player": 1}, + "Graveyard Dampes Grave Freestanding PoH": {"item": "Arrows (30)", "player": 2}, "DMT Freestanding PoH": {"item": "Recovery Heart", "player": 2}, "DMT Chest": {"item": "Arrows (5)", "player": 1}, "DMT Storms Grotto Chest": {"item": "Farores Wind", "player": 1}, @@ -322,7 +322,7 @@ "DMC Volcano Freestanding PoH": {"item": "Bow", "player": 1}, "DMC Wall Freestanding PoH": {"item": "Goron Tunic", "player": 2}, "DMC Upper Grotto Chest": {"item": "Deku Shield", "player": 2}, - "DMC Great Fairy Reward": {"item": "Rupees (50)", "player": 1}, + "DMC Great Fairy Fountain Reward": {"item": "Rupees (50)", "player": 1}, "ZR Open Grotto Chest": {"item": "Stone of Agony", "player": 1}, "ZR Frogs in the Rain": {"item": "Arrows (5)", "player": 2}, "ZR Frogs Ocarina Game": {"item": "Rupees (200)", "player": 2}, @@ -331,11 +331,11 @@ "ZD Diving Minigame": {"item": "Piece of Heart", "player": 2}, "ZD Chest": {"item": "Arrows (10)", "player": 1}, "ZD King Zora Thawed": {"item": "Rupees (20)", "player": 1}, - "ZF Great Fairy Reward": {"item": "Rupees (20)", "player": 1}, + "ZF Great Fairy Fountain Reward": {"item": "Rupees (20)", "player": 1}, "ZF Iceberg Freestanding PoH": {"item": "Recovery Heart", "player": 1}, "ZF Bottom Freestanding PoH": {"item": "Rupees (5)", "player": 1}, "LH Underwater Item": {"item": "Hylian Shield", "player": 1}, - "LH Adult Fishing": {"item": "Progressive Hookshot", "player": 2}, + "LH Fishing Hole Adult Reward": {"item": "Progressive Hookshot", "player": 2}, "LH Lab Dive": {"item": "Rupees (50)", "player": 2}, "LH Freestanding PoH": {"item": "Bombchus (10)", "player": 1}, "LH Sun": {"item": "Recovery Heart", "player": 2}, @@ -346,9 +346,9 @@ "GF HBA 1000 Points": {"item": "Arrows (5)", "player": 2}, "GF HBA 1500 Points": {"item": "Rupees (200)", "player": 1}, "Wasteland Chest": {"item": "Progressive Strength Upgrade", "player": 2}, - "Colossus Great Fairy Reward": {"item": "Boomerang", "player": 1}, + "Colossus Great Fairy Fountain Reward": {"item": "Boomerang", "player": 1}, "Colossus Freestanding PoH": {"item": "Progressive Wallet", "player": 1}, - "OGC Great Fairy Reward": {"item": "Piece of Heart", "player": 1}, + "OGC Great Fairy Fountain Reward": {"item": "Piece of Heart", "player": 1}, "Deku Tree Map Chest": {"item": "Recovery Heart", "player": 1}, "Deku Tree Slingshot Room Side Chest": {"item": "Piece of Heart", "player": 2}, "Deku Tree Slingshot Chest": {"item": "Deku Stick Capacity", "player": 2}, @@ -524,10 +524,10 @@ "Sheik at Colossus": {"item": "Song of Time", "player": 2}, "Sheik in Kakariko": {"item": "Suns Song", "player": 2}, "Sheik at Temple": {"item": "Zeldas Lullaby", "player": 2}, - "KF Midos Top Left Chest": {"item": "Deku Seeds (30)", "player": 2}, - "KF Midos Top Right Chest": {"item": "Rupees (20)", "player": 1}, - "KF Midos Bottom Left Chest": {"item": "Rupees (200)", "player": 2}, - "KF Midos Bottom Right Chest": {"item": "Piece of Heart", "player": 1}, + "KF Midos House Top Left Chest": {"item": "Deku Seeds (30)", "player": 2}, + "KF Midos House Top Right Chest": {"item": "Rupees (20)", "player": 1}, + "KF Midos House Bottom Left Chest": {"item": "Rupees (200)", "player": 2}, + "KF Midos House Bottom Right Chest": {"item": "Piece of Heart", "player": 1}, "KF Kokiri Sword Chest": {"item": "Slingshot", "player": 2}, "KF Storms Grotto Chest": {"item": "Recovery Heart", "player": 1}, "LW Ocarina Memory Game": {"item": "Iron Boots", "player": 2}, @@ -537,22 +537,22 @@ "Deku Theater Mask of Truth": {"item": "Arrows (5)", "player": 2}, "LW Skull Kid": {"item": "Biggoron Sword", "player": 2}, "LW Deku Scrub Near Bridge": {"item": "Heart Container", "player": 1, "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Ice Arrows", "player": 2, "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Ice Arrows", "player": 2, "price": 40}, "SFM Wolfos Grotto Chest": {"item": "Bombs (5)", "player": 2}, "HF Near Market Grotto Chest": {"item": "Bombchus (20)", "player": 1}, "HF Tektite Grotto Freestanding PoH": {"item": "Deku Nut Capacity", "player": 1}, "HF Open Grotto Chest": {"item": "Deku Stick Capacity", "player": 1}, - "HF Deku Scrub Grotto": {"item": "Bombs (5)", "player": 2, "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Bombs (5)", "player": 2, "price": 10}, "Market Shooting Gallery Reward": {"item": "Lens of Truth", "player": 1}, "Market Bombchu Bowling First Prize": {"item": "Rupees (5)", "player": 1}, "Market Bombchu Bowling Second Prize": {"item": "Bombs (20)", "player": 2}, "Market Lost Dog": {"item": "Piece of Heart", "player": 2}, "Market Treasure Chest Game Reward": {"item": "Rupees (5)", "player": 2}, - "Market 10 Big Poes": {"item": "Piece of Heart", "player": 2}, - "ToT Light Arrows Cutscene": {"item": "Arrows (30)", "player": 1}, - "HC Great Fairy Reward": {"item": "Recovery Heart", "player": 2}, - "LLR Talons Chickens": {"item": "Rupees (5)", "player": 1}, - "LLR Freestanding PoH": {"item": "Iron Boots", "player": 1}, + "Market Guard House 10 Big Poes": {"item": "Piece of Heart", "player": 2}, + "Temple of Time Light Arrow Cutscene": {"item": "Arrows (30)", "player": 1}, + "HC Great Fairy Fountain Reward": {"item": "Recovery Heart", "player": 2}, + "LLR Talons House Chickens": {"item": "Rupees (5)", "player": 1}, + "LLR Tower Freestanding PoH": {"item": "Iron Boots", "player": 1}, "Kak Anju as Child": {"item": "Rupees (50)", "player": 1}, "Kak Anju as Adult": {"item": "Bombs (10)", "player": 1}, "Kak Impas House Freestanding PoH": {"item": "Arrows (10)", "player": 2}, @@ -561,22 +561,22 @@ "Kak Open Grotto Chest": {"item": "Arrows (30)", "player": 2}, "Kak Redead Grotto Chest": {"item": "Rupees (5)", "player": 1}, "Kak Shooting Gallery Reward": {"item": "Rupees (5)", "player": 1}, - "Kak 10 Gold Skulltula Reward": {"item": "Deku Nuts (5)", "player": 2}, - "Kak 20 Gold Skulltula Reward": {"item": "Heart Container", "player": 1}, - "Kak 30 Gold Skulltula Reward": {"item": "Rupee (1)", "player": 1}, - "Kak 40 Gold Skulltula Reward": {"item": "Heart Container", "player": 2}, - "Kak 50 Gold Skulltula Reward": {"item": "Piece of Heart", "player": 1}, + "Kak House of Skulltula 10 Gold Skulltula Reward": {"item": "Deku Nuts (5)", "player": 2}, + "Kak House of Skulltula 20 Gold Skulltula Reward": {"item": "Heart Container", "player": 1}, + "Kak House of Skulltula 30 Gold Skulltula Reward": {"item": "Rupee (1)", "player": 1}, + "Kak House of Skulltula 40 Gold Skulltula Reward": {"item": "Heart Container", "player": 2}, + "Kak House of Skulltula 50 Gold Skulltula Reward": {"item": "Piece of Heart", "player": 1}, "Graveyard Shield Grave Chest": {"item": "Slingshot", "player": 1}, "Graveyard Heart Piece Grave Chest": {"item": "Arrows (30)", "player": 1}, "Graveyard Royal Familys Tomb Chest": {"item": "Progressive Wallet", "player": 2}, "Graveyard Freestanding PoH": {"item": "Piece of Heart", "player": 1}, "Graveyard Dampe Gravedigging Tour": {"item": "Rupees (5)", "player": 1}, - "Graveyard Dampe Race Hookshot Chest": {"item": "Recovery Heart", "player": 2}, - "Graveyard Dampe Race Freestanding PoH": {"item": "Deku Stick (1)", "player": 2}, + "Graveyard Dampes Grave Hookshot Chest": {"item": "Recovery Heart", "player": 2}, + "Graveyard Dampes Grave Freestanding PoH": {"item": "Deku Stick (1)", "player": 2}, "DMT Freestanding PoH": {"item": "Rupees (20)", "player": 1}, "DMT Chest": {"item": "Piece of Heart", "player": 2}, "DMT Storms Grotto Chest": {"item": "Bombs (10)", "player": 2}, - "DMT Great Fairy Reward": {"item": "Rupees (50)", "player": 2}, + "DMT Great Fairy Fountain Reward": {"item": "Rupees (50)", "player": 2}, "DMT Biggoron": {"item": "Bombchus (10)", "player": 2}, "GC Darunias Joy": {"item": "Arrows (10)", "player": 2}, "GC Pot Freestanding PoH": {"item": "Rupees (5)", "player": 2}, @@ -588,7 +588,7 @@ "DMC Volcano Freestanding PoH": {"item": "Rupees (5)", "player": 2}, "DMC Wall Freestanding PoH": {"item": "Rupees (20)", "player": 2}, "DMC Upper Grotto Chest": {"item": "Fire Arrows", "player": 2}, - "DMC Great Fairy Reward": {"item": "Arrows (5)", "player": 1}, + "DMC Great Fairy Fountain Reward": {"item": "Arrows (5)", "player": 1}, "ZR Open Grotto Chest": {"item": "Piece of Heart", "player": 1}, "ZR Frogs in the Rain": {"item": "Rupees (5)", "player": 1}, "ZR Frogs Ocarina Game": {"item": "Arrows (30)", "player": 2}, @@ -597,11 +597,11 @@ "ZD Diving Minigame": {"item": "Mirror Shield", "player": 2}, "ZD Chest": {"item": "Deku Shield", "player": 1}, "ZD King Zora Thawed": {"item": "Heart Container", "player": 1}, - "ZF Great Fairy Reward": {"item": "Arrows (5)", "player": 1}, + "ZF Great Fairy Fountain Reward": {"item": "Arrows (5)", "player": 1}, "ZF Iceberg Freestanding PoH": {"item": "Deku Seeds (30)", "player": 1}, "ZF Bottom Freestanding PoH": {"item": "Deku Seeds (30)", "player": 2}, "LH Underwater Item": {"item": "Piece of Heart", "player": 1}, - "LH Child Fishing": {"item": "Rupees (50)", "player": 2}, + "LH Fishing Hole Child Reward": {"item": "Rupees (50)", "player": 2}, "LH Lab Dive": {"item": "Arrows (10)", "player": 2}, "LH Freestanding PoH": {"item": "Piece of Heart", "player": 2}, "LH Sun": {"item": "Rupees (5)", "player": 1}, @@ -612,9 +612,9 @@ "GF HBA 1000 Points": {"item": "Deku Nuts (10)", "player": 2}, "GF HBA 1500 Points": {"item": "Dins Fire", "player": 1}, "Wasteland Chest": {"item": "Progressive Hookshot", "player": 1}, - "Colossus Great Fairy Reward": {"item": "Rupees (50)", "player": 2}, + "Colossus Great Fairy Fountain Reward": {"item": "Rupees (50)", "player": 2}, "Colossus Freestanding PoH": {"item": "Rupees (20)", "player": 1}, - "OGC Great Fairy Reward": {"item": "Heart Container", "player": 1}, + "OGC Great Fairy Fountain Reward": {"item": "Heart Container", "player": 1}, "Deku Tree Map Chest": {"item": "Deku Nut Capacity", "player": 1}, "Deku Tree Slingshot Room Side Chest": {"item": "Rupees (5)", "player": 1}, "Deku Tree Slingshot Chest": {"item": "Bow", "player": 2}, diff --git a/tests/plando/plando-goals-priority-bridge.json b/tests/plando/plando-goals-priority-bridge.json index 2e553ba401..fb5de95329 100644 --- a/tests/plando/plando-goals-priority-bridge.json +++ b/tests/plando/plando-goals-priority-bridge.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Eponas Song", "Sheik in Kakariko": "Nocturne of Shadow", "Sheik at Temple": "Sarias Song", - "KF Midos Top Left Chest": "Rupees (5)", - "KF Midos Top Right Chest": "Heart Container", - "KF Midos Bottom Left Chest": "Heart Container", - "KF Midos Bottom Right Chest": "Recovery Heart", + "KF Midos House Top Left Chest": "Rupees (5)", + "KF Midos House Top Right Chest": "Heart Container", + "KF Midos House Bottom Left Chest": "Heart Container", + "KF Midos House Bottom Right Chest": "Recovery Heart", "KF Kokiri Sword Chest": "Recovery Heart", "KF Storms Grotto Chest": "Arrows (30)", "LW Ocarina Memory Game": "Rupees (50)", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Rupees (5)", "LW Skull Kid": "Bombs (20)", "LW Deku Scrub Near Bridge": {"item": "Recovery Heart", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Piece of Heart", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Piece of Heart", "price": 40}, "SFM Wolfos Grotto Chest": "Piece of Heart", "HF Near Market Grotto Chest": "Rupees (50)", "HF Tektite Grotto Freestanding PoH": "Bombchus (20)", "HF Southeast Grotto Chest": "Magic Meter", "HF Open Grotto Chest": "Rupees (200)", - "HF Deku Scrub Grotto": {"item": "Recovery Heart", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Recovery Heart", "price": 10}, "Market Shooting Gallery Reward": "Heart Container", "Market Bombchu Bowling First Prize": "Bomb Bag", "Market Bombchu Bowling Second Prize": "Deku Nuts (5)", "Market Lost Dog": "Bombs (5)", "Market Treasure Chest Game Reward": "Rupees (20)", - "Market 10 Big Poes": "Rupees (5)", - "ToT Light Arrows Cutscene": "Rupees (5)", - "HC Great Fairy Reward": "Rupees (5)", - "LLR Talons Chickens": "Lens of Truth", - "LLR Freestanding PoH": "Recovery Heart", + "Market Guard House 10 Big Poes": "Rupees (5)", + "Temple of Time Light Arrow Cutscene": "Rupees (5)", + "HC Great Fairy Fountain Reward": "Rupees (5)", + "LLR Talons House Chickens": "Lens of Truth", + "LLR Tower Freestanding PoH": "Recovery Heart", "Kak Anju as Child": "Rupees (5)", "Kak Anju as Adult": "Rupees (200)", "Kak Impas House Freestanding PoH": "Progressive Strength Upgrade", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Rupees (20)", "Kak Redead Grotto Chest": "Rupees (5)", "Kak Shooting Gallery Reward": "Piece of Heart", - "Kak 10 Gold Skulltula Reward": "Deku Stick (1)", - "Kak 20 Gold Skulltula Reward": "Bombchus (5)", - "Kak 30 Gold Skulltula Reward": "Rupees (50)", - "Kak 40 Gold Skulltula Reward": "Nayrus Love", - "Kak 50 Gold Skulltula Reward": "Zora Tunic", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Deku Stick (1)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Bombchus (5)", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Rupees (50)", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Nayrus Love", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Zora Tunic", "Graveyard Shield Grave Chest": "Rupees (200)", "Graveyard Heart Piece Grave Chest": "Hylian Shield", "Graveyard Royal Familys Tomb Chest": "Deku Nuts (5)", "Graveyard Freestanding PoH": "Eyeball Frog", "Graveyard Dampe Gravedigging Tour": "Recovery Heart", - "Graveyard Dampe Race Hookshot Chest": "Dins Fire", - "Graveyard Dampe Race Freestanding PoH": "Piece of Heart", + "Graveyard Dampes Grave Hookshot Chest": "Dins Fire", + "Graveyard Dampes Grave Freestanding PoH": "Piece of Heart", "DMT Freestanding PoH": "Rupees (5)", "DMT Chest": "Hover Boots", "DMT Storms Grotto Chest": "Rutos Letter", - "DMT Great Fairy Reward": "Deku Nuts (5)", + "DMT Great Fairy Fountain Reward": "Deku Nuts (5)", "DMT Biggoron": "Piece of Heart", "GC Darunias Joy": "Rupees (50)", "GC Pot Freestanding PoH": "Progressive Hookshot", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Progressive Strength Upgrade", "DMC Wall Freestanding PoH": "Deku Nuts (10)", "DMC Upper Grotto Chest": "Bombs (10)", - "DMC Great Fairy Reward": "Arrows (30)", + "DMC Great Fairy Fountain Reward": "Arrows (30)", "ZR Open Grotto Chest": "Piece of Heart", "ZR Frogs in the Rain": "Piece of Heart", "ZR Frogs Ocarina Game": "Arrows (10)", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Arrows (10)", "ZD Chest": "Kokiri Sword", "ZD King Zora Thawed": "Deku Shield", - "ZF Great Fairy Reward": "Arrows (5)", + "ZF Great Fairy Fountain Reward": "Arrows (5)", "ZF Iceberg Freestanding PoH": "Bow", "ZF Bottom Freestanding PoH": "Bombs (5)", "LH Underwater Item": "Rupees (20)", - "LH Child Fishing": "Ice Arrows", - "LH Adult Fishing": "Arrows (10)", + "LH Fishing Hole Child Reward": "Ice Arrows", + "LH Fishing Hole Adult Reward": "Arrows (10)", "LH Lab Dive": "Piece of Heart", "LH Freestanding PoH": "Arrows (5)", "LH Sun": "Recovery Heart", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Bombs (20)", "GF HBA 1500 Points": "Slingshot", "Wasteland Chest": "Deku Nut Capacity", - "Colossus Great Fairy Reward": "Rupees (5)", + "Colossus Great Fairy Fountain Reward": "Rupees (5)", "Colossus Freestanding PoH": "Deku Stick (1)", - "OGC Great Fairy Reward": "Recovery Heart", + "OGC Great Fairy Fountain Reward": "Recovery Heart", "Deku Tree Map Chest": "Piece of Heart (Treasure Chest Game)", "Deku Tree Slingshot Room Side Chest": "Bottle with Poe", "Deku Tree Slingshot Chest": "Slingshot", diff --git a/tests/plando/plando-goals-priority-custom.json b/tests/plando/plando-goals-priority-custom.json index 2e731d32ee..473799d0a4 100644 --- a/tests/plando/plando-goals-priority-custom.json +++ b/tests/plando/plando-goals-priority-custom.json @@ -329,10 +329,10 @@ "Sheik at Colossus": "Bolero of Fire", "Sheik in Kakariko": "Song of Storms", "Sheik at Temple": "Nocturne of Shadow", - "KF Midos Top Left Chest": "Piece of Heart", - "KF Midos Top Right Chest": "Bow", - "KF Midos Bottom Left Chest": "Rupees (20)", - "KF Midos Bottom Right Chest": "Progressive Hookshot", + "KF Midos House Top Left Chest": "Piece of Heart", + "KF Midos House Top Right Chest": "Bow", + "KF Midos House Bottom Left Chest": "Rupees (20)", + "KF Midos House Bottom Right Chest": "Progressive Hookshot", "KF Kokiri Sword Chest": "Arrows (10)", "KF Storms Grotto Chest": "Piece of Heart", "LW Ocarina Memory Game": "Piece of Heart", @@ -342,23 +342,23 @@ "Deku Theater Mask of Truth": "Rupees (5)", "LW Skull Kid": "Bombs (10)", "LW Deku Scrub Near Bridge": {"item": "Bomb Bag", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Piece of Heart", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Piece of Heart", "price": 40}, "SFM Wolfos Grotto Chest": "Rupees (200)", "HF Near Market Grotto Chest": "Biggoron Sword", "HF Tektite Grotto Freestanding PoH": "Rupees (50)", "HF Southeast Grotto Chest": "Rupees (5)", "HF Open Grotto Chest": "Heart Container", - "HF Deku Scrub Grotto": {"item": "Rupees (20)", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Rupees (20)", "price": 10}, "Market Shooting Gallery Reward": "Nayrus Love", "Market Bombchu Bowling First Prize": "Progressive Wallet", "Market Bombchu Bowling Second Prize": "Rupees (200)", "Market Lost Dog": "Rupees (200)", "Market Treasure Chest Game Reward": "Rupees (5)", - "Market 10 Big Poes": "Arrows (30)", - "ToT Light Arrows Cutscene": "Piece of Heart", - "HC Great Fairy Reward": "Rupees (5)", - "LLR Talons Chickens": "Rupees (5)", - "LLR Freestanding PoH": "Bombs (5)", + "Market Guard House 10 Big Poes": "Arrows (30)", + "Temple of Time Light Arrow Cutscene": "Piece of Heart", + "HC Great Fairy Fountain Reward": "Rupees (5)", + "LLR Talons House Chickens": "Rupees (5)", + "LLR Tower Freestanding PoH": "Bombs (5)", "Kak Anju as Child": "Heart Container", "Kak Anju as Adult": "Progressive Scale", "Kak Impas House Freestanding PoH": "Mirror Shield", @@ -367,22 +367,22 @@ "Kak Open Grotto Chest": "Rupees (5)", "Kak Redead Grotto Chest": "Goron Tunic", "Kak Shooting Gallery Reward": "Recovery Heart", - "Kak 10 Gold Skulltula Reward": "Piece of Heart", - "Kak 20 Gold Skulltula Reward": "Rupees (50)", - "Kak 30 Gold Skulltula Reward": "Piece of Heart", - "Kak 40 Gold Skulltula Reward": "Bombchus (5)", - "Kak 50 Gold Skulltula Reward": "Rupees (200)", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Rupees (50)", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Bombchus (5)", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Rupees (200)", "Graveyard Shield Grave Chest": "Piece of Heart", "Graveyard Heart Piece Grave Chest": "Rupees (5)", "Graveyard Royal Familys Tomb Chest": "Deku Stick Capacity", "Graveyard Freestanding PoH": "Recovery Heart", "Graveyard Dampe Gravedigging Tour": "Rupees (5)", - "Graveyard Dampe Race Hookshot Chest": "Arrows (5)", - "Graveyard Dampe Race Freestanding PoH": "Bow", + "Graveyard Dampes Grave Hookshot Chest": "Arrows (5)", + "Graveyard Dampes Grave Freestanding PoH": "Bow", "DMT Freestanding PoH": "Rupees (5)", "DMT Chest": "Slingshot", "DMT Storms Grotto Chest": "Arrows (10)", - "DMT Great Fairy Reward": "Fire Arrows", + "DMT Great Fairy Fountain Reward": "Fire Arrows", "DMT Biggoron": "Arrows (30)", "GC Darunias Joy": "Slingshot", "GC Pot Freestanding PoH": "Piece of Heart", @@ -394,7 +394,7 @@ "DMC Volcano Freestanding PoH": "Rupees (20)", "DMC Wall Freestanding PoH": "Progressive Strength Upgrade", "DMC Upper Grotto Chest": "Farores Wind", - "DMC Great Fairy Reward": "Bombs (10)", + "DMC Great Fairy Fountain Reward": "Bombs (10)", "ZR Open Grotto Chest": "Bombs (20)", "ZR Frogs in the Rain": "Deku Shield", "ZR Frogs Ocarina Game": "Piece of Heart", @@ -403,12 +403,12 @@ "ZD Diving Minigame": "Slingshot", "ZD Chest": "Deku Seeds (30)", "ZD King Zora Thawed": "Bombs (5)", - "ZF Great Fairy Reward": "Progressive Strength Upgrade", + "ZF Great Fairy Fountain Reward": "Progressive Strength Upgrade", "ZF Iceberg Freestanding PoH": "Rupees (5)", "ZF Bottom Freestanding PoH": "Arrows (5)", "LH Underwater Item": "Deku Stick (1)", - "LH Child Fishing": "Ice Arrows", - "LH Adult Fishing": "Deku Stick (1)", + "LH Fishing Hole Child Reward": "Ice Arrows", + "LH Fishing Hole Adult Reward": "Deku Stick (1)", "LH Lab Dive": "Deku Nut Capacity", "LH Freestanding PoH": "Recovery Heart", "LH Sun": "Rupees (5)", @@ -419,9 +419,9 @@ "GF HBA 1000 Points": "Recovery Heart", "GF HBA 1500 Points": "Iron Boots", "Wasteland Chest": "Bombchus (10)", - "Colossus Great Fairy Reward": "Bottle with Fish", + "Colossus Great Fairy Fountain Reward": "Bottle with Fish", "Colossus Freestanding PoH": "Double Defense", - "OGC Great Fairy Reward": "Rupees (5)", + "OGC Great Fairy Fountain Reward": "Rupees (5)", "Deku Tree Map Chest": "Piece of Heart", "Deku Tree Slingshot Room Side Chest": "Arrows (5)", "Deku Tree Slingshot Chest": "Arrows (30)", diff --git a/tests/plando/plando-goals-priority-gbk.json b/tests/plando/plando-goals-priority-gbk.json index 2dd5cb6e17..9c626eb739 100644 --- a/tests/plando/plando-goals-priority-gbk.json +++ b/tests/plando/plando-goals-priority-gbk.json @@ -286,10 +286,10 @@ "Sheik at Colossus": "Eponas Song", "Sheik in Kakariko": "Minuet of Forest", "Sheik at Temple": "Bolero of Fire", - "KF Midos Top Left Chest": "Rupees (50)", - "KF Midos Top Right Chest": "Recovery Heart", - "KF Midos Bottom Left Chest": "Piece of Heart", - "KF Midos Bottom Right Chest": "Rupees (5)", + "KF Midos House Top Left Chest": "Rupees (50)", + "KF Midos House Top Right Chest": "Recovery Heart", + "KF Midos House Bottom Left Chest": "Piece of Heart", + "KF Midos House Bottom Right Chest": "Rupees (5)", "KF Kokiri Sword Chest": "Recovery Heart", "KF Storms Grotto Chest": "Hylian Shield", "LW Ocarina Memory Game": "Rupees (50)", @@ -299,23 +299,23 @@ "Deku Theater Mask of Truth": "Rupees (20)", "LW Skull Kid": "Rupees (200)", "LW Deku Scrub Near Bridge": {"item": "Bombs (5)", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Piece of Heart", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Piece of Heart", "price": 40}, "SFM Wolfos Grotto Chest": "Progressive Wallet", "HF Near Market Grotto Chest": "Rupees (50)", "HF Tektite Grotto Freestanding PoH": "Progressive Hookshot", "HF Southeast Grotto Chest": "Recovery Heart", "HF Open Grotto Chest": "Nayrus Love", - "HF Deku Scrub Grotto": {"item": "Bottle", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Bottle", "price": 10}, "Market Shooting Gallery Reward": "Rupees (5)", "Market Bombchu Bowling First Prize": "Recovery Heart", "Market Bombchu Bowling Second Prize": "Rupees (20)", "Market Lost Dog": "Piece of Heart", "Market Treasure Chest Game Reward": "Bomb Bag", - "Market 10 Big Poes": "Piece of Heart", - "ToT Light Arrows Cutscene": "Piece of Heart", - "HC Great Fairy Reward": "Rupees (5)", - "LLR Talons Chickens": "Bombs (20)", - "LLR Freestanding PoH": "Rupees (5)", + "Market Guard House 10 Big Poes": "Piece of Heart", + "Temple of Time Light Arrow Cutscene": "Piece of Heart", + "HC Great Fairy Fountain Reward": "Rupees (5)", + "LLR Talons House Chickens": "Bombs (20)", + "LLR Tower Freestanding PoH": "Rupees (5)", "Kak Anju as Child": "Rupees (5)", "Kak Anju as Adult": "Mirror Shield", "Kak Impas House Freestanding PoH": "Piece of Heart", @@ -324,22 +324,22 @@ "Kak Open Grotto Chest": "Bottle with Blue Fire", "Kak Redead Grotto Chest": "Piece of Heart", "Kak Shooting Gallery Reward": "Deku Stick Capacity", - "Kak 10 Gold Skulltula Reward": "Magic Meter", - "Kak 20 Gold Skulltula Reward": "Arrows (10)", - "Kak 30 Gold Skulltula Reward": "Rupee (1)", - "Kak 40 Gold Skulltula Reward": "Arrows (30)", - "Kak 50 Gold Skulltula Reward": "Rupees (50)", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Magic Meter", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Arrows (10)", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Rupee (1)", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Arrows (30)", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Rupees (50)", "Graveyard Shield Grave Chest": "Rupees (200)", "Graveyard Heart Piece Grave Chest": "Farores Wind", "Graveyard Royal Familys Tomb Chest": "Piece of Heart", "Graveyard Freestanding PoH": "Bomb Bag", "Graveyard Dampe Gravedigging Tour": "Rutos Letter", - "Graveyard Dampe Race Hookshot Chest": "Piece of Heart", - "Graveyard Dampe Race Freestanding PoH": "Piece of Heart", + "Graveyard Dampes Grave Hookshot Chest": "Piece of Heart", + "Graveyard Dampes Grave Freestanding PoH": "Piece of Heart", "DMT Freestanding PoH": "Bombs (5)", "DMT Chest": "Arrows (10)", "DMT Storms Grotto Chest": "Heart Container", - "DMT Great Fairy Reward": "Deku Seeds (30)", + "DMT Great Fairy Fountain Reward": "Deku Seeds (30)", "DMT Biggoron": "Bombs (10)", "GC Darunias Joy": "Deku Nuts (5)", "GC Pot Freestanding PoH": "Double Defense", @@ -351,7 +351,7 @@ "DMC Volcano Freestanding PoH": "Bombchus (20)", "DMC Wall Freestanding PoH": "Piece of Heart", "DMC Upper Grotto Chest": "Bombs (10)", - "DMC Great Fairy Reward": "Bow", + "DMC Great Fairy Fountain Reward": "Bow", "ZR Open Grotto Chest": "Deku Nuts (5)", "ZR Frogs in the Rain": "Bombs (5)", "ZR Frogs Ocarina Game": "Recovery Heart", @@ -360,12 +360,12 @@ "ZD Diving Minigame": "Kokiri Sword", "ZD Chest": "Arrows (10)", "ZD King Zora Thawed": "Bombs (10)", - "ZF Great Fairy Reward": "Rupees (20)", + "ZF Great Fairy Fountain Reward": "Rupees (20)", "ZF Iceberg Freestanding PoH": "Piece of Heart", "ZF Bottom Freestanding PoH": "Piece of Heart", "LH Underwater Item": "Progressive Strength Upgrade", - "LH Child Fishing": "Deku Shield", - "LH Adult Fishing": "Heart Container", + "LH Fishing Hole Child Reward": "Deku Shield", + "LH Fishing Hole Adult Reward": "Heart Container", "LH Lab Dive": "Bombs (20)", "LH Freestanding PoH": "Eyedrops", "LH Sun": "Piece of Heart", @@ -376,9 +376,9 @@ "GF HBA 1000 Points": "Rupees (5)", "GF HBA 1500 Points": "Iron Boots", "Wasteland Chest": "Progressive Scale", - "Colossus Great Fairy Reward": "Recovery Heart", + "Colossus Great Fairy Fountain Reward": "Recovery Heart", "Colossus Freestanding PoH": "Heart Container", - "OGC Great Fairy Reward": "Stone of Agony", + "OGC Great Fairy Fountain Reward": "Stone of Agony", "Deku Tree Map Chest": "Recovery Heart", "Deku Tree Slingshot Room Side Chest": "Heart Container", "Deku Tree Slingshot Chest": "Slingshot", diff --git a/tests/plando/plando-goals-priority-mixed-trials.json b/tests/plando/plando-goals-priority-mixed-trials.json index 8c01b50c6f..cd0deb488e 100644 --- a/tests/plando/plando-goals-priority-mixed-trials.json +++ b/tests/plando/plando-goals-priority-mixed-trials.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Eponas Song", "Sheik in Kakariko": "Sarias Song", "Sheik at Temple": "Minuet of Forest", - "KF Midos Top Left Chest": "Piece of Heart", - "KF Midos Top Right Chest": "Heart Container", - "KF Midos Bottom Left Chest": "Rupee (1)", - "KF Midos Bottom Right Chest": "Rupees (5)", + "KF Midos House Top Left Chest": "Piece of Heart", + "KF Midos House Top Right Chest": "Heart Container", + "KF Midos House Bottom Left Chest": "Rupee (1)", + "KF Midos House Bottom Right Chest": "Rupees (5)", "KF Kokiri Sword Chest": "Bombchus (20)", "KF Storms Grotto Chest": "Fire Arrows", "LW Ocarina Memory Game": "Recovery Heart", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Deku Nuts (5)", "LW Skull Kid": "Rupees (50)", "LW Deku Scrub Near Bridge": {"item": "Piece of Heart", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Magic Meter", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Magic Meter", "price": 40}, "SFM Wolfos Grotto Chest": "Bombchus (10)", "HF Near Market Grotto Chest": "Piece of Heart", "HF Tektite Grotto Freestanding PoH": "Piece of Heart", "HF Southeast Grotto Chest": "Recovery Heart", "HF Open Grotto Chest": "Arrows (10)", - "HF Deku Scrub Grotto": {"item": "Eyedrops", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Eyedrops", "price": 10}, "Market Shooting Gallery Reward": "Progressive Wallet", "Market Bombchu Bowling First Prize": "Rupees (5)", "Market Bombchu Bowling Second Prize": "Arrows (10)", "Market Lost Dog": "Ice Arrows", "Market Treasure Chest Game Reward": "Piece of Heart", - "Market 10 Big Poes": "Rupees (200)", - "ToT Light Arrows Cutscene": "Bombs (20)", - "HC Great Fairy Reward": "Slingshot", - "LLR Talons Chickens": "Arrows (30)", - "LLR Freestanding PoH": "Rupees (5)", + "Market Guard House 10 Big Poes": "Rupees (200)", + "Temple of Time Light Arrow Cutscene": "Bombs (20)", + "HC Great Fairy Fountain Reward": "Slingshot", + "LLR Talons House Chickens": "Arrows (30)", + "LLR Tower Freestanding PoH": "Rupees (5)", "Kak Anju as Child": "Piece of Heart", "Kak Anju as Adult": "Deku Nut Capacity", "Kak Impas House Freestanding PoH": "Piece of Heart", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Deku Seeds (30)", "Kak Redead Grotto Chest": "Rupees (20)", "Kak Shooting Gallery Reward": "Piece of Heart", - "Kak 10 Gold Skulltula Reward": "Rupees (5)", - "Kak 20 Gold Skulltula Reward": "Recovery Heart", - "Kak 30 Gold Skulltula Reward": "Piece of Heart", - "Kak 40 Gold Skulltula Reward": "Piece of Heart", - "Kak 50 Gold Skulltula Reward": "Progressive Scale", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Rupees (5)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Recovery Heart", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Progressive Scale", "Graveyard Shield Grave Chest": "Deku Nuts (5)", "Graveyard Heart Piece Grave Chest": "Arrows (5)", "Graveyard Royal Familys Tomb Chest": "Bombs (20)", "Graveyard Freestanding PoH": "Piece of Heart", "Graveyard Dampe Gravedigging Tour": "Piece of Heart", - "Graveyard Dampe Race Hookshot Chest": "Piece of Heart", - "Graveyard Dampe Race Freestanding PoH": "Piece of Heart", + "Graveyard Dampes Grave Hookshot Chest": "Piece of Heart", + "Graveyard Dampes Grave Freestanding PoH": "Piece of Heart", "DMT Freestanding PoH": "Kokiri Sword", "DMT Chest": "Piece of Heart", "DMT Storms Grotto Chest": "Deku Nuts (5)", - "DMT Great Fairy Reward": "Rupees (5)", + "DMT Great Fairy Fountain Reward": "Rupees (5)", "DMT Biggoron": "Piece of Heart", "GC Darunias Joy": "Arrows (30)", "GC Pot Freestanding PoH": "Arrows (30)", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Recovery Heart", "DMC Wall Freestanding PoH": "Bomb Bag", "DMC Upper Grotto Chest": "Piece of Heart", - "DMC Great Fairy Reward": "Bombs (5)", + "DMC Great Fairy Fountain Reward": "Bombs (5)", "ZR Open Grotto Chest": "Recovery Heart", "ZR Frogs in the Rain": "Rupees (5)", "ZR Frogs Ocarina Game": "Bombs (10)", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Rupees (5)", "ZD Chest": "Deku Stick (1)", "ZD King Zora Thawed": "Boomerang", - "ZF Great Fairy Reward": "Recovery Heart", + "ZF Great Fairy Fountain Reward": "Recovery Heart", "ZF Iceberg Freestanding PoH": "Rupees (200)", "ZF Bottom Freestanding PoH": "Piece of Heart", "LH Underwater Item": "Magic Meter", - "LH Child Fishing": "Arrows (30)", - "LH Adult Fishing": "Progressive Hookshot", + "LH Fishing Hole Child Reward": "Arrows (30)", + "LH Fishing Hole Adult Reward": "Progressive Hookshot", "LH Lab Dive": "Rupees (200)", "LH Freestanding PoH": "Arrows (5)", "LH Sun": "Rupees (5)", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Recovery Heart", "GF HBA 1500 Points": "Bombs (5)", "Wasteland Chest": "Arrows (5)", - "Colossus Great Fairy Reward": "Bomb Bag", + "Colossus Great Fairy Fountain Reward": "Bomb Bag", "Colossus Freestanding PoH": "Rupees (5)", - "OGC Great Fairy Reward": "Bombs (5)", + "OGC Great Fairy Fountain Reward": "Bombs (5)", "Deku Tree Map Chest": "Rupees (50)", "Deku Tree Slingshot Room Side Chest": "Dins Fire", "Deku Tree Slingshot Chest": "Progressive Scale", diff --git a/tests/plando/plando-goals-priority-mixed.json b/tests/plando/plando-goals-priority-mixed.json index b82614367d..56e9cdb65d 100644 --- a/tests/plando/plando-goals-priority-mixed.json +++ b/tests/plando/plando-goals-priority-mixed.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Song of Time", "Sheik in Kakariko": "Serenade of Water", "Sheik at Temple": "Zeldas Lullaby", - "KF Midos Top Left Chest": "Deku Shield", - "KF Midos Top Right Chest": "Piece of Heart", - "KF Midos Bottom Left Chest": "Rupees (20)", - "KF Midos Bottom Right Chest": "Piece of Heart", + "KF Midos House Top Left Chest": "Deku Shield", + "KF Midos House Top Right Chest": "Piece of Heart", + "KF Midos House Bottom Left Chest": "Rupees (20)", + "KF Midos House Bottom Right Chest": "Piece of Heart", "KF Kokiri Sword Chest": "Bomb Bag", "KF Storms Grotto Chest": "Arrows (10)", "LW Ocarina Memory Game": "Bottle with Bugs", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Rupees (20)", "LW Skull Kid": "Light Arrows", "LW Deku Scrub Near Bridge": {"item": "Arrows (30)", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Rupee (1)", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Rupee (1)", "price": 40}, "SFM Wolfos Grotto Chest": "Rupees (50)", "HF Near Market Grotto Chest": "Rupees (5)", "HF Tektite Grotto Freestanding PoH": "Rupees (200)", "HF Southeast Grotto Chest": "Piece of Heart", "HF Open Grotto Chest": "Ice Arrows", - "HF Deku Scrub Grotto": {"item": "Deku Stick (1)", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Deku Stick (1)", "price": 10}, "Market Shooting Gallery Reward": "Piece of Heart", "Market Bombchu Bowling First Prize": "Piece of Heart", "Market Bombchu Bowling Second Prize": "Mirror Shield", "Market Lost Dog": "Bombs (5)", "Market Treasure Chest Game Reward": "Piece of Heart", - "Market 10 Big Poes": "Deku Seeds (30)", - "ToT Light Arrows Cutscene": "Rupees (5)", - "HC Great Fairy Reward": "Bombchus (20)", - "LLR Talons Chickens": "Deku Nuts (5)", - "LLR Freestanding PoH": "Heart Container", + "Market Guard House 10 Big Poes": "Deku Seeds (30)", + "Temple of Time Light Arrow Cutscene": "Rupees (5)", + "HC Great Fairy Fountain Reward": "Bombchus (20)", + "LLR Talons House Chickens": "Deku Nuts (5)", + "LLR Tower Freestanding PoH": "Heart Container", "Kak Anju as Child": "Bottle with Green Potion", "Kak Anju as Adult": "Rupees (200)", "Kak Impas House Freestanding PoH": "Deku Seeds (30)", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Deku Seeds (30)", "Kak Redead Grotto Chest": "Piece of Heart", "Kak Shooting Gallery Reward": "Piece of Heart", - "Kak 10 Gold Skulltula Reward": "Rupees (5)", - "Kak 20 Gold Skulltula Reward": "Piece of Heart", - "Kak 30 Gold Skulltula Reward": "Double Defense", - "Kak 40 Gold Skulltula Reward": "Bomb Bag", - "Kak 50 Gold Skulltula Reward": "Slingshot", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Rupees (5)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Double Defense", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Bomb Bag", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Slingshot", "Graveyard Shield Grave Chest": "Rupees (20)", "Graveyard Heart Piece Grave Chest": "Bomb Bag", "Graveyard Royal Familys Tomb Chest": "Rupees (200)", "Graveyard Freestanding PoH": "Bow", "Graveyard Dampe Gravedigging Tour": "Boomerang", - "Graveyard Dampe Race Hookshot Chest": "Piece of Heart", - "Graveyard Dampe Race Freestanding PoH": "Arrows (10)", + "Graveyard Dampes Grave Hookshot Chest": "Piece of Heart", + "Graveyard Dampes Grave Freestanding PoH": "Arrows (10)", "DMT Freestanding PoH": "Bottle with Green Potion", "DMT Chest": "Rupees (5)", "DMT Storms Grotto Chest": "Bombchus (10)", - "DMT Great Fairy Reward": "Rupees (5)", + "DMT Great Fairy Fountain Reward": "Rupees (5)", "DMT Biggoron": "Piece of Heart", "GC Darunias Joy": "Recovery Heart", "GC Pot Freestanding PoH": "Arrows (10)", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Rupees (20)", "DMC Wall Freestanding PoH": "Piece of Heart", "DMC Upper Grotto Chest": "Rupees (5)", - "DMC Great Fairy Reward": "Recovery Heart", + "DMC Great Fairy Fountain Reward": "Recovery Heart", "ZR Open Grotto Chest": "Recovery Heart", "ZR Frogs in the Rain": "Piece of Heart (Treasure Chest Game)", "ZR Frogs Ocarina Game": "Piece of Heart", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Arrows (5)", "ZD Chest": "Slingshot", "ZD King Zora Thawed": "Deku Stick Capacity", - "ZF Great Fairy Reward": "Bombs (20)", + "ZF Great Fairy Fountain Reward": "Bombs (20)", "ZF Iceberg Freestanding PoH": "Deku Nut Capacity", "ZF Bottom Freestanding PoH": "Rupees (5)", "LH Underwater Item": "Progressive Strength Upgrade", - "LH Child Fishing": "Arrows (10)", - "LH Adult Fishing": "Arrows (30)", + "LH Fishing Hole Child Reward": "Arrows (10)", + "LH Fishing Hole Adult Reward": "Arrows (30)", "LH Lab Dive": "Piece of Heart", "LH Freestanding PoH": "Rupees (5)", "LH Sun": "Farores Wind", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Heart Container", "GF HBA 1500 Points": "Recovery Heart", "Wasteland Chest": "Rupees (200)", - "Colossus Great Fairy Reward": "Rupees (50)", + "Colossus Great Fairy Fountain Reward": "Rupees (50)", "Colossus Freestanding PoH": "Piece of Heart", - "OGC Great Fairy Reward": "Deku Stick Capacity", + "OGC Great Fairy Fountain Reward": "Deku Stick Capacity", "Deku Tree Map Chest": "Progressive Hookshot", "Deku Tree Slingshot Room Side Chest": "Deku Nuts (5)", "Deku Tree Slingshot Chest": "Arrows (30)", diff --git a/tests/plando/plando-goals-priority-triforce-hunt.json b/tests/plando/plando-goals-priority-triforce-hunt.json index 4aa699e796..f9f70fab54 100644 --- a/tests/plando/plando-goals-priority-triforce-hunt.json +++ b/tests/plando/plando-goals-priority-triforce-hunt.json @@ -286,10 +286,10 @@ "Sheik at Colossus": "Serenade of Water", "Sheik in Kakariko": "Song of Time", "Sheik at Temple": "Eponas Song", - "KF Midos Top Left Chest": "Progressive Strength Upgrade", - "KF Midos Top Right Chest": "Piece of Heart", - "KF Midos Bottom Left Chest": "Goron Tunic", - "KF Midos Bottom Right Chest": "Deku Nut Capacity", + "KF Midos House Top Left Chest": "Progressive Strength Upgrade", + "KF Midos House Top Right Chest": "Piece of Heart", + "KF Midos House Bottom Left Chest": "Goron Tunic", + "KF Midos House Bottom Right Chest": "Deku Nut Capacity", "KF Kokiri Sword Chest": "Piece of Heart", "KF Storms Grotto Chest": "Rupees (5)", "LW Ocarina Memory Game": "Deku Nuts (5)", @@ -299,23 +299,23 @@ "Deku Theater Mask of Truth": "Arrows (30)", "LW Skull Kid": "Bombchus (10)", "LW Deku Scrub Near Bridge": {"item": "Bottle", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Piece of Heart", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Piece of Heart", "price": 40}, "SFM Wolfos Grotto Chest": "Bombs (5)", "HF Near Market Grotto Chest": "Piece of Heart", "HF Tektite Grotto Freestanding PoH": "Recovery Heart", "HF Southeast Grotto Chest": "Slingshot", "HF Open Grotto Chest": "Piece of Heart", - "HF Deku Scrub Grotto": {"item": "Triforce Piece", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Triforce Piece", "price": 10}, "Market Shooting Gallery Reward": "Progressive Hookshot", "Market Bombchu Bowling First Prize": "Triforce Piece", "Market Bombchu Bowling Second Prize": "Arrows (5)", "Market Lost Dog": "Heart Container", "Market Treasure Chest Game Reward": "Bombs (5)", - "Market 10 Big Poes": "Arrows (10)", - "ToT Light Arrows Cutscene": "Arrows (5)", - "HC Great Fairy Reward": "Rupees (5)", - "LLR Talons Chickens": "Rupees (200)", - "LLR Freestanding PoH": "Rupees (5)", + "Market Guard House 10 Big Poes": "Arrows (10)", + "Temple of Time Light Arrow Cutscene": "Arrows (5)", + "HC Great Fairy Fountain Reward": "Rupees (5)", + "LLR Talons House Chickens": "Rupees (200)", + "LLR Tower Freestanding PoH": "Rupees (5)", "Kak Anju as Child": "Triforce Piece", "Kak Anju as Adult": "Triforce Piece", "Kak Impas House Freestanding PoH": "Bombchus (10)", @@ -324,22 +324,22 @@ "Kak Open Grotto Chest": "Piece of Heart", "Kak Redead Grotto Chest": "Recovery Heart", "Kak Shooting Gallery Reward": "Deku Nut Capacity", - "Kak 10 Gold Skulltula Reward": "Arrows (30)", - "Kak 20 Gold Skulltula Reward": "Rupees (50)", - "Kak 30 Gold Skulltula Reward": "Triforce Piece", - "Kak 40 Gold Skulltula Reward": "Piece of Heart", - "Kak 50 Gold Skulltula Reward": "Bombchus (20)", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Arrows (30)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Rupees (50)", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Triforce Piece", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Bombchus (20)", "Graveyard Shield Grave Chest": "Rupees (200)", "Graveyard Heart Piece Grave Chest": "Triforce Piece", "Graveyard Royal Familys Tomb Chest": "Triforce Piece", "Graveyard Freestanding PoH": "Claim Check", "Graveyard Dampe Gravedigging Tour": "Arrows (30)", - "Graveyard Dampe Race Hookshot Chest": "Recovery Heart", - "Graveyard Dampe Race Freestanding PoH": "Bottle with Bugs", + "Graveyard Dampes Grave Hookshot Chest": "Recovery Heart", + "Graveyard Dampes Grave Freestanding PoH": "Bottle with Bugs", "DMT Freestanding PoH": "Rupees (50)", "DMT Chest": "Hover Boots", "DMT Storms Grotto Chest": "Heart Container", - "DMT Great Fairy Reward": "Iron Boots", + "DMT Great Fairy Fountain Reward": "Iron Boots", "DMT Biggoron": "Rupees (5)", "GC Darunias Joy": "Piece of Heart", "GC Pot Freestanding PoH": "Rupees (5)", @@ -351,7 +351,7 @@ "DMC Volcano Freestanding PoH": "Triforce Piece", "DMC Wall Freestanding PoH": "Light Arrows", "DMC Upper Grotto Chest": "Triforce Piece", - "DMC Great Fairy Reward": "Piece of Heart", + "DMC Great Fairy Fountain Reward": "Piece of Heart", "ZR Open Grotto Chest": "Piece of Heart", "ZR Frogs in the Rain": "Rupees (5)", "ZR Frogs Ocarina Game": "Piece of Heart", @@ -360,12 +360,12 @@ "ZD Diving Minigame": "Progressive Hookshot", "ZD Chest": "Rupees (50)", "ZD King Zora Thawed": "Triforce Piece", - "ZF Great Fairy Reward": "Triforce Piece", + "ZF Great Fairy Fountain Reward": "Triforce Piece", "ZF Iceberg Freestanding PoH": "Piece of Heart", "ZF Bottom Freestanding PoH": "Nayrus Love", "LH Underwater Item": "Piece of Heart", - "LH Child Fishing": "Triforce Piece", - "LH Adult Fishing": "Piece of Heart", + "LH Fishing Hole Child Reward": "Triforce Piece", + "LH Fishing Hole Adult Reward": "Piece of Heart", "LH Lab Dive": "Zora Tunic", "LH Freestanding PoH": "Rutos Letter", "LH Sun": "Double Defense", @@ -376,9 +376,9 @@ "GF HBA 1000 Points": "Arrows (10)", "GF HBA 1500 Points": "Slingshot", "Wasteland Chest": "Deku Seeds (30)", - "Colossus Great Fairy Reward": "Arrows (10)", + "Colossus Great Fairy Fountain Reward": "Arrows (10)", "Colossus Freestanding PoH": "Piece of Heart", - "OGC Great Fairy Reward": "Recovery Heart", + "OGC Great Fairy Fountain Reward": "Recovery Heart", "Deku Tree Map Chest": "Piece of Heart", "Deku Tree Slingshot Room Side Chest": "Rupees (5)", "Deku Tree Slingshot Chest": "Piece of Heart (Treasure Chest Game)", diff --git a/tests/plando/plando-goals-starting-items-fallback.json b/tests/plando/plando-goals-starting-items-fallback.json index 615b405132..7392ac53f2 100644 --- a/tests/plando/plando-goals-starting-items-fallback.json +++ b/tests/plando/plando-goals-starting-items-fallback.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Requiem of Spirit", "Sheik in Kakariko": "Suns Song", "Sheik at Temple": "Bolero of Fire", - "KF Midos Top Left Chest": "Piece of Heart", - "KF Midos Top Right Chest": "Piece of Heart", - "KF Midos Bottom Left Chest": "Deku Stick Capacity", - "KF Midos Bottom Right Chest": "Bombchus (10)", + "KF Midos House Top Left Chest": "Piece of Heart", + "KF Midos House Top Right Chest": "Piece of Heart", + "KF Midos House Bottom Left Chest": "Deku Stick Capacity", + "KF Midos House Bottom Right Chest": "Bombchus (10)", "KF Kokiri Sword Chest": "Recovery Heart", "KF Storms Grotto Chest": "Megaton Hammer", "LW Ocarina Memory Game": "Bombs (10)", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Recovery Heart", "LW Skull Kid": "Bombs (10)", "LW Deku Scrub Near Bridge": {"item": "Heart Container", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Deku Nuts (10)", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Deku Nuts (10)", "price": 40}, "SFM Wolfos Grotto Chest": "Piece of Heart", "HF Near Market Grotto Chest": "Arrows (10)", "HF Tektite Grotto Freestanding PoH": "Deku Nuts (5)", "HF Southeast Grotto Chest": "Mirror Shield", "HF Open Grotto Chest": "Bombs (5)", - "HF Deku Scrub Grotto": {"item": "Bombs (5)", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Bombs (5)", "price": 10}, "Market Shooting Gallery Reward": "Piece of Heart", "Market Bombchu Bowling First Prize": "Rupee (1)", "Market Bombchu Bowling Second Prize": "Goron Tunic", "Market Lost Dog": "Bombs (5)", "Market Treasure Chest Game Reward": "Bombchus (10)", - "Market 10 Big Poes": "Rupees (50)", - "ToT Light Arrows Cutscene": "Slingshot", - "HC Great Fairy Reward": "Recovery Heart", - "LLR Talons Chickens": "Rupees (5)", - "LLR Freestanding PoH": "Piece of Heart", + "Market Guard House 10 Big Poes": "Rupees (50)", + "Temple of Time Light Arrow Cutscene": "Slingshot", + "HC Great Fairy Fountain Reward": "Recovery Heart", + "LLR Talons House Chickens": "Rupees (5)", + "LLR Tower Freestanding PoH": "Piece of Heart", "Kak Anju as Child": "Bombchus (20)", "Kak Anju as Adult": "Recovery Heart", "Kak Impas House Freestanding PoH": "Recovery Heart", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Arrows (10)", "Kak Redead Grotto Chest": "Rupees (200)", "Kak Shooting Gallery Reward": "Dins Fire", - "Kak 10 Gold Skulltula Reward": "Arrows (5)", - "Kak 20 Gold Skulltula Reward": "Deku Seeds (30)", - "Kak 30 Gold Skulltula Reward": "Piece of Heart", - "Kak 40 Gold Skulltula Reward": "Progressive Strength Upgrade", - "Kak 50 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Arrows (5)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Deku Seeds (30)", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Progressive Strength Upgrade", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Piece of Heart", "Graveyard Shield Grave Chest": "Rupees (5)", "Graveyard Heart Piece Grave Chest": "Light Arrows", "Graveyard Royal Familys Tomb Chest": "Recovery Heart", "Graveyard Freestanding PoH": "Progressive Wallet", "Graveyard Dampe Gravedigging Tour": "Arrows (5)", - "Graveyard Dampe Race Hookshot Chest": "Rupees (5)", - "Graveyard Dampe Race Freestanding PoH": "Iron Boots", + "Graveyard Dampes Grave Hookshot Chest": "Rupees (5)", + "Graveyard Dampes Grave Freestanding PoH": "Iron Boots", "DMT Freestanding PoH": "Rupees (5)", "DMT Chest": "Progressive Scale", "DMT Storms Grotto Chest": "Bombchus (10)", - "DMT Great Fairy Reward": "Rupees (5)", + "DMT Great Fairy Fountain Reward": "Rupees (5)", "DMT Biggoron": "Arrows (10)", "GC Darunias Joy": "Piece of Heart", "GC Pot Freestanding PoH": "Piece of Heart", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Piece of Heart", "DMC Wall Freestanding PoH": "Boomerang", "DMC Upper Grotto Chest": "Deku Stick (1)", - "DMC Great Fairy Reward": "Zora Tunic", + "DMC Great Fairy Fountain Reward": "Zora Tunic", "ZR Open Grotto Chest": "Deku Shield", "ZR Frogs in the Rain": "Magic Meter", "ZR Frogs Ocarina Game": "Fire Arrows", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Heart Container", "ZD Chest": "Piece of Heart", "ZD King Zora Thawed": "Lens of Truth", - "ZF Great Fairy Reward": "Biggoron Sword", + "ZF Great Fairy Fountain Reward": "Biggoron Sword", "ZF Iceberg Freestanding PoH": "Bottle with Bugs", "ZF Bottom Freestanding PoH": "Rupees (20)", "LH Underwater Item": "Rupees (5)", - "LH Child Fishing": "Piece of Heart", - "LH Adult Fishing": "Rupees (20)", + "LH Fishing Hole Child Reward": "Piece of Heart", + "LH Fishing Hole Adult Reward": "Rupees (20)", "LH Lab Dive": "Rupees (20)", "LH Freestanding PoH": "Deku Stick Capacity", "LH Sun": "Progressive Strength Upgrade", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Bottle", "GF HBA 1500 Points": "Deku Nuts (5)", "Wasteland Chest": "Bombs (5)", - "Colossus Great Fairy Reward": "Piece of Heart", + "Colossus Great Fairy Fountain Reward": "Piece of Heart", "Colossus Freestanding PoH": "Rupees (200)", - "OGC Great Fairy Reward": "Recovery Heart", + "OGC Great Fairy Fountain Reward": "Recovery Heart", "Deku Tree Map Chest": "Deku Nuts (5)", "Deku Tree Slingshot Room Side Chest": "Arrows (30)", "Deku Tree Slingshot Chest": "Heart Container", diff --git a/tests/plando/plando-goals-starting-items-trials.json b/tests/plando/plando-goals-starting-items-trials.json index d048f023c2..1e97ac6e2f 100644 --- a/tests/plando/plando-goals-starting-items-trials.json +++ b/tests/plando/plando-goals-starting-items-trials.json @@ -287,10 +287,10 @@ "Sheik at Colossus": "Bolero of Fire", "Sheik in Kakariko": "Eponas Song", "Sheik at Temple": "Requiem of Spirit", - "KF Midos Top Left Chest": "Double Defense", - "KF Midos Top Right Chest": "Bottle with Green Potion", - "KF Midos Bottom Left Chest": "Rupees (5)", - "KF Midos Bottom Right Chest": "Rupees (20)", + "KF Midos House Top Left Chest": "Double Defense", + "KF Midos House Top Right Chest": "Bottle with Green Potion", + "KF Midos House Bottom Left Chest": "Rupees (5)", + "KF Midos House Bottom Right Chest": "Rupees (20)", "KF Kokiri Sword Chest": "Zora Tunic", "KF Storms Grotto Chest": "Rupees (50)", "LW Ocarina Memory Game": "Rupees (5)", @@ -300,23 +300,23 @@ "Deku Theater Mask of Truth": "Rupees (200)", "LW Skull Kid": "Rupees (5)", "LW Deku Scrub Near Bridge": {"item": "Bombs (10)", "price": 40}, - "LW Deku Scrub Grotto Front": {"item": "Rupees (5)", "price": 40}, + "LW Scrubs Grotto Deku Scrub Front": {"item": "Rupees (5)", "price": 40}, "SFM Wolfos Grotto Chest": "Recovery Heart", "HF Near Market Grotto Chest": "Lens of Truth", "HF Tektite Grotto Freestanding PoH": "Recovery Heart", "HF Southeast Grotto Chest": "Bow", "HF Open Grotto Chest": "Arrows (30)", - "HF Deku Scrub Grotto": {"item": "Megaton Hammer", "price": 10}, + "HF Inside Fence Grotto Deku Scrub": {"item": "Megaton Hammer", "price": 10}, "Market Shooting Gallery Reward": "Heart Container", "Market Bombchu Bowling First Prize": "Deku Shield", "Market Bombchu Bowling Second Prize": "Dins Fire", "Market Lost Dog": "Piece of Heart", "Market Treasure Chest Game Reward": "Bombs (20)", - "Market 10 Big Poes": "Rupees (20)", - "ToT Light Arrows Cutscene": "Rupees (5)", - "HC Great Fairy Reward": "Rupees (5)", - "LLR Talons Chickens": "Slingshot", - "LLR Freestanding PoH": "Bow", + "Market Guard House 10 Big Poes": "Rupees (20)", + "Temple of Time Light Arrow Cutscene": "Rupees (5)", + "HC Great Fairy Fountain Reward": "Rupees (5)", + "LLR Talons House Chickens": "Slingshot", + "LLR Tower Freestanding PoH": "Bow", "Kak Anju as Child": "Deku Shield", "Kak Anju as Adult": "Piece of Heart", "Kak Impas House Freestanding PoH": "Piece of Heart", @@ -325,22 +325,22 @@ "Kak Open Grotto Chest": "Bombchus (10)", "Kak Redead Grotto Chest": "Progressive Strength Upgrade", "Kak Shooting Gallery Reward": "Recovery Heart", - "Kak 10 Gold Skulltula Reward": "Rupees (20)", - "Kak 20 Gold Skulltula Reward": "Piece of Heart", - "Kak 30 Gold Skulltula Reward": "Rupees (5)", - "Kak 40 Gold Skulltula Reward": "Rupees (5)", - "Kak 50 Gold Skulltula Reward": "Deku Stick (1)", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Rupees (20)", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Piece of Heart", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Rupees (5)", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Rupees (5)", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Deku Stick (1)", "Graveyard Shield Grave Chest": "Rupee (1)", "Graveyard Heart Piece Grave Chest": "Arrows (10)", "Graveyard Royal Familys Tomb Chest": "Deku Nuts (5)", "Graveyard Freestanding PoH": "Bombs (5)", "Graveyard Dampe Gravedigging Tour": "Piece of Heart", - "Graveyard Dampe Race Hookshot Chest": "Rupees (5)", - "Graveyard Dampe Race Freestanding PoH": "Piece of Heart", + "Graveyard Dampes Grave Hookshot Chest": "Rupees (5)", + "Graveyard Dampes Grave Freestanding PoH": "Piece of Heart", "DMT Freestanding PoH": "Bombchus (5)", "DMT Chest": "Ice Arrows", "DMT Storms Grotto Chest": "Magic Meter", - "DMT Great Fairy Reward": "Bomb Bag", + "DMT Great Fairy Fountain Reward": "Bomb Bag", "DMT Biggoron": "Hylian Shield", "GC Darunias Joy": "Bottle with Bugs", "GC Pot Freestanding PoH": "Recovery Heart", @@ -352,7 +352,7 @@ "DMC Volcano Freestanding PoH": "Piece of Heart", "DMC Wall Freestanding PoH": "Magic Meter", "DMC Upper Grotto Chest": "Heart Container", - "DMC Great Fairy Reward": "Piece of Heart", + "DMC Great Fairy Fountain Reward": "Piece of Heart", "ZR Open Grotto Chest": "Piece of Heart", "ZR Frogs in the Rain": "Rupees (200)", "ZR Frogs Ocarina Game": "Arrows (10)", @@ -361,12 +361,12 @@ "ZD Diving Minigame": "Iron Boots", "ZD Chest": "Rupees (5)", "ZD King Zora Thawed": "Progressive Strength Upgrade", - "ZF Great Fairy Reward": "Prescription", + "ZF Great Fairy Fountain Reward": "Prescription", "ZF Iceberg Freestanding PoH": "Heart Container", "ZF Bottom Freestanding PoH": "Arrows (10)", "LH Underwater Item": "Goron Tunic", - "LH Child Fishing": "Piece of Heart", - "LH Adult Fishing": "Piece of Heart", + "LH Fishing Hole Child Reward": "Piece of Heart", + "LH Fishing Hole Adult Reward": "Piece of Heart", "LH Lab Dive": "Recovery Heart", "LH Freestanding PoH": "Bomb Bag", "LH Sun": "Hover Boots", @@ -377,9 +377,9 @@ "GF HBA 1000 Points": "Piece of Heart", "GF HBA 1500 Points": "Rupees (5)", "Wasteland Chest": "Hylian Shield", - "Colossus Great Fairy Reward": "Piece of Heart", + "Colossus Great Fairy Fountain Reward": "Piece of Heart", "Colossus Freestanding PoH": "Piece of Heart", - "OGC Great Fairy Reward": "Bomb Bag", + "OGC Great Fairy Fountain Reward": "Bomb Bag", "Deku Tree Map Chest": "Heart Container", "Deku Tree Slingshot Room Side Chest": "Bow", "Deku Tree Slingshot Chest": "Rupees (200)", diff --git a/tests/plando/plando-item-list-explicit.json b/tests/plando/plando-item-list-explicit.json index 5400f3a7a9..73d0053e2a 100644 --- a/tests/plando/plando-item-list-explicit.json +++ b/tests/plando/plando-item-list-explicit.json @@ -1,8 +1,8 @@ { "locations": { - "KF Midos Top Left Chest": {"item": ["Bow", "Light Arrows", "Magic Meter"]}, - "KF Midos Top Right Chest": {"item": ["Bow", "Light Arrows", "Magic Meter"]}, - "KF Midos Bottom Left Chest": {"item": ["Bow", "Light Arrows", "Magic Meter"]}, - "KF Midos Bottom Right Chest": {"item": ["Bow", "Light Arrows", "Magic Meter"]} + "KF Midos House Top Left Chest": {"item": ["Bow", "Light Arrows", "Magic Meter"]}, + "KF Midos House Top Right Chest": {"item": ["Bow", "Light Arrows", "Magic Meter"]}, + "KF Midos House Bottom Left Chest": {"item": ["Bow", "Light Arrows", "Magic Meter"]}, + "KF Midos House Bottom Right Chest": {"item": ["Bow", "Light Arrows", "Magic Meter"]} } } \ No newline at end of file diff --git a/tests/plando/plando-item-list-implicit.json b/tests/plando/plando-item-list-implicit.json index 01c3cdbe4c..5f8d595540 100644 --- a/tests/plando/plando-item-list-implicit.json +++ b/tests/plando/plando-item-list-implicit.json @@ -1,8 +1,8 @@ { "locations": { - "KF Midos Top Left Chest": ["Bow", "Light Arrows", "Magic Meter"], - "KF Midos Top Right Chest": ["Bow", "Light Arrows", "Magic Meter"], - "KF Midos Bottom Left Chest": ["Bow", "Light Arrows", "Magic Meter"], - "KF Midos Bottom Right Chest": ["Bow", "Light Arrows", "Magic Meter"] + "KF Midos House Top Left Chest": ["Bow", "Light Arrows", "Magic Meter"], + "KF Midos House Top Right Chest": ["Bow", "Light Arrows", "Magic Meter"], + "KF Midos House Bottom Left Chest": ["Bow", "Light Arrows", "Magic Meter"], + "KF Midos House Bottom Right Chest": ["Bow", "Light Arrows", "Magic Meter"] } } \ No newline at end of file diff --git a/tests/plando/plando-list-case-sensitivity.json b/tests/plando/plando-list-case-sensitivity.json index 815471c170..5bbd28b3da 100644 --- a/tests/plando/plando-list-case-sensitivity.json +++ b/tests/plando/plando-list-case-sensitivity.json @@ -18,12 +18,12 @@ "gf hba 1500 points": ["Bow", "Magic Meter", "Light Arrows"], "wasteland chest": ["Bow", "Magic Meter", "Light Arrows"], "colossus freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], - "colossus great fairy reward": ["Bow", "Magic Meter", "Light Arrows"], - "tot light arrows cutscene": ["Bow", "Magic Meter", "Light Arrows"], + "colossus great fairy fountain reward": ["Bow", "Magic Meter", "Light Arrows"], + "temple of time light arrow cutscene": ["Bow", "Magic Meter", "Light Arrows"], "hc malon egg": ["Bow", "Magic Meter", "Light Arrows"], - "hc great fairy reward": ["Bow", "Magic Meter", "Light Arrows"], - "ogc great fairy reward": ["Bow", "Magic Meter", "Light Arrows"], - "market 10 big poes": ["Bow", "Magic Meter", "Light Arrows"], + "hc great fairy fountain reward": ["Bow", "Magic Meter", "Light Arrows"], + "ogc great fairy fountain reward": ["Bow", "Magic Meter", "Light Arrows"], + "market guard house 10 big poes": ["Bow", "Magic Meter", "Light Arrows"], "market shooting gallery reward": ["Bow", "Magic Meter", "Light Arrows"], "market bombchu bowling first prize": ["Bow", "Magic Meter", "Light Arrows"], "market bombchu bowling second prize": ["Bow", "Magic Meter", "Light Arrows"], @@ -32,11 +32,11 @@ "kak anju as adult": ["Bow", "Magic Meter", "Light Arrows"], "kak anju as child": ["Bow", "Magic Meter", "Light Arrows"], "kak man on roof": ["Bow", "Magic Meter", "Light Arrows"], - "kak 10 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], - "kak 20 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], - "kak 30 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], - "kak 40 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], - "kak 50 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], + "kak house of skulltula 10 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], + "kak house of skulltula 20 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], + "kak house of skulltula 30 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], + "kak house of skulltula 40 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], + "kak house of skulltula 50 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], "kak Impas house freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "kak windmill freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "kak shooting gallery reward": ["Bow", "Magic Meter", "Light Arrows"], @@ -45,8 +45,8 @@ "graveyard shield grave chest": ["Bow", "Magic Meter", "Light Arrows"], "graveyard heart piece grave chest": ["Bow", "Magic Meter", "Light Arrows"], "graveyard royal familys tomb chest": ["Bow", "Magic Meter", "Light Arrows"], - "Graveyard Dampe Race Hookshot Chest": ["Bow", "Magic Meter", "Light Arrows"], - "graveyard dampe race freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], + "graveyard dampes grave hookshot chest": ["Bow", "Magic Meter", "Light Arrows"], + "graveyard dampes grave freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "dmt chest": ["Bow", "Magic Meter", "Light Arrows"], "dmt freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "dmt biggoron": ["Bow", "Magic Meter", "Light Arrows"], @@ -59,8 +59,8 @@ "gc darunias joy": ["Bow", "Magic Meter", "Light Arrows"], "dmc wall freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "dmc volcano freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], - "dmc great fairy reward": ["Bow", "Magic Meter", "Light Arrows"], - "dmt great fairy reward": ["Bow", "Magic Meter", "Light Arrows"], + "dmc great fairy fountain reward": ["Bow", "Magic Meter", "Light Arrows"], + "dmt great fairy fountain reward": ["Bow", "Magic Meter", "Light Arrows"], "zr frogs ocarina game": ["Bow", "Magic Meter", "Light Arrows"], "zr frogs in the rain": ["Bow", "Magic Meter", "Light Arrows"], "zr near open grotto freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], @@ -70,19 +70,19 @@ "zd king zora thawed": ["Bow", "Magic Meter", "Light Arrows"], "zf iceberg freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "zf bottom freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], - "zf great fairy reward": ["Bow", "Magic Meter", "Light Arrows"], - "llr talons chickens": ["Bow", "Magic Meter", "Light Arrows"], - "llr freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], + "zf great fairy fountain reward": ["Bow", "Magic Meter", "Light Arrows"], + "llr talons house chickens": ["Bow", "Magic Meter", "Light Arrows"], + "llr tower freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "ganons tower boss key chest": ["Bow", "Magic Meter", "Light Arrows"], "kf storms grotto chest": ["Bow", "Magic Meter", "Light Arrows"], "lw near shortcuts grotto chest": ["Bow", "Magic Meter", "Light Arrows"], "deku theater skull mask": ["Bow", "Magic Meter", "Light Arrows"], "deku theater mask of truth": ["Bow", "Magic Meter", "Light Arrows"], - "lw deku scrub grotto front": ["Bow", "Magic Meter", "Light Arrows"], + "lw scrubs grotto deku scrub front": ["Bow", "Magic Meter", "Light Arrows"], "sfm wolfos grotto chest": ["Bow", "Magic Meter", "Light Arrows"], "hf southeast grotto chest": ["Bow", "Magic Meter", "Light Arrows"], "hf open grotto chest": ["Bow", "Magic Meter", "Light Arrows"], - "hf deku scrub grotto": ["Bow", "Magic Meter", "Light Arrows"], + "hf inside fence grotto deku scrub": ["Bow", "Magic Meter", "Light Arrows"], "hf near market grotto chest": ["Bow", "Magic Meter", "Light Arrows"], "hf tektite grotto freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "kak redead grotto chest": ["Bow", "Magic Meter", "Light Arrows"], diff --git a/tests/plando/plando-list.json b/tests/plando/plando-list.json index 17ac7c2dbc..6cea6e0efc 100644 --- a/tests/plando/plando-list.json +++ b/tests/plando/plando-list.json @@ -18,12 +18,12 @@ "GF HBA 1500 Points": ["Bow", "Magic Meter", "Light Arrows"], "Wasteland Chest": ["Bow", "Magic Meter", "Light Arrows"], "Colossus Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], - "Colossus Great Fairy Reward": ["Bow", "Magic Meter", "Light Arrows"], - "ToT Light Arrows Cutscene": ["Bow", "Magic Meter", "Light Arrows"], + "Colossus Great Fairy Fountain Reward": ["Bow", "Magic Meter", "Light Arrows"], + "Temple of Time Light Arrow Cutscene": ["Bow", "Magic Meter", "Light Arrows"], "HC Malon Egg": ["Bow", "Magic Meter", "Light Arrows"], - "HC Great Fairy Reward": ["Bow", "Magic Meter", "Light Arrows"], - "OGC Great Fairy Reward": ["Bow", "Magic Meter", "Light Arrows"], - "Market 10 Big Poes": ["Bow", "Magic Meter", "Light Arrows"], + "HC Great Fairy Fountain Reward": ["Bow", "Magic Meter", "Light Arrows"], + "OGC Great Fairy Fountain Reward": ["Bow", "Magic Meter", "Light Arrows"], + "Market Guard House 10 Big Poes": ["Bow", "Magic Meter", "Light Arrows"], "Market Shooting Gallery Reward": ["Bow", "Magic Meter", "Light Arrows"], "Market Bombchu Bowling First Prize": ["Bow", "Magic Meter", "Light Arrows"], "Market Bombchu Bowling Second Prize": ["Bow", "Magic Meter", "Light Arrows"], @@ -32,11 +32,11 @@ "Kak Anju as Adult": ["Bow", "Magic Meter", "Light Arrows"], "Kak Anju as Child": ["Bow", "Magic Meter", "Light Arrows"], "Kak Man on Roof": ["Bow", "Magic Meter", "Light Arrows"], - "Kak 10 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], - "Kak 20 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], - "Kak 30 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], - "Kak 40 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], - "Kak 50 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], + "Kak House of Skulltula 10 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], + "Kak House of Skulltula 20 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], + "Kak House of Skulltula 30 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], + "Kak House of Skulltula 40 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], + "Kak House of Skulltula 50 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], "Kak Impas House Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "Kak Windmill Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "Kak Shooting Gallery Reward": ["Bow", "Magic Meter", "Light Arrows"], @@ -45,8 +45,8 @@ "Graveyard Shield Grave Chest": ["Bow", "Magic Meter", "Light Arrows"], "Graveyard Heart Piece Grave Chest": ["Bow", "Magic Meter", "Light Arrows"], "Graveyard Royal Familys Tomb Chest": ["Bow", "Magic Meter", "Light Arrows"], - "Graveyard Dampe Race Hookshot Chest": ["Bow", "Magic Meter", "Light Arrows"], - "Graveyard Dampe Race Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], + "Graveyard Dampes Grave Hookshot Chest": ["Bow", "Magic Meter", "Light Arrows"], + "Graveyard Dampes Grave Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "DMT Chest": ["Bow", "Magic Meter", "Light Arrows"], "DMT Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "DMT Biggoron": ["Bow", "Magic Meter", "Light Arrows"], @@ -59,8 +59,8 @@ "GC Darunias Joy": ["Bow", "Magic Meter", "Light Arrows"], "DMC Wall Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "DMC Volcano Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], - "DMC Great Fairy Reward": ["Bow", "Magic Meter", "Light Arrows"], - "DMT Great Fairy Reward": ["Bow", "Magic Meter", "Light Arrows"], + "DMC Great Fairy Fountain Reward": ["Bow", "Magic Meter", "Light Arrows"], + "DMT Great Fairy Fountain Reward": ["Bow", "Magic Meter", "Light Arrows"], "ZR Frogs Ocarina Game": ["Bow", "Magic Meter", "Light Arrows"], "ZR Frogs in the Rain": ["Bow", "Magic Meter", "Light Arrows"], "ZR Near Open Grotto Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], @@ -70,19 +70,19 @@ "ZD King Zora Thawed": ["Bow", "Magic Meter", "Light Arrows"], "ZF Iceberg Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "ZF Bottom Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], - "ZF Great Fairy Reward": ["Bow", "Magic Meter", "Light Arrows"], - "LLR Talons Chickens": ["Bow", "Magic Meter", "Light Arrows"], - "LLR Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], + "ZF Great Fairy Fountain Reward": ["Bow", "Magic Meter", "Light Arrows"], + "LLR Talons House Chickens": ["Bow", "Magic Meter", "Light Arrows"], + "LLR Tower Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "Ganons Tower Boss Key Chest": ["Bow", "Magic Meter", "Light Arrows"], "KF Storms Grotto Chest": ["Bow", "Magic Meter", "Light Arrows"], "LW Near Shortcuts Grotto Chest": ["Bow", "Magic Meter", "Light Arrows"], "Deku Theater Skull Mask": ["Bow", "Magic Meter", "Light Arrows"], "Deku Theater Mask of Truth": ["Bow", "Magic Meter", "Light Arrows"], - "LW Deku Scrub Grotto Front": ["Bow", "Magic Meter", "Light Arrows"], + "LW Scrubs Grotto Deku Scrub Front": ["Bow", "Magic Meter", "Light Arrows"], "SFM Wolfos Grotto Chest": ["Bow", "Magic Meter", "Light Arrows"], "HF Southeast Grotto Chest": ["Bow", "Magic Meter", "Light Arrows"], "HF Open Grotto Chest": ["Bow", "Magic Meter", "Light Arrows"], - "HF Deku Scrub Grotto": ["Bow", "Magic Meter", "Light Arrows"], + "HF Inside Fence Grotto Deku Scrub": ["Bow", "Magic Meter", "Light Arrows"], "HF Near Market Grotto Chest": ["Bow", "Magic Meter", "Light Arrows"], "HF Tektite Grotto Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "Kak Redead Grotto Chest": ["Bow", "Magic Meter", "Light Arrows"], diff --git a/tests/plando/plando-mirrored-ice-traps.json b/tests/plando/plando-mirrored-ice-traps.json index c9b217718c..8ea45a6fdb 100644 --- a/tests/plando/plando-mirrored-ice-traps.json +++ b/tests/plando/plando-mirrored-ice-traps.json @@ -6,31 +6,31 @@ }, "locations": { "World 1": { - "KF Midos Top Left Chest": { "item": "Ice Trap", "player": 4, "model": "Rupees (200)"}, - "KF Midos Top Right Chest": { "item": "Ice Trap", "player": 3, "model": "Rupees (200)"}, - "KF Midos Bottom Left Chest": { "item": "Rupees (200)", "player": 2}, - "KF Midos Bottom Right Chest": { "item": "Ice Trap", "player": 3, "model": "Rupees (200)"}, + "KF Midos House Top Left Chest": { "item": "Ice Trap", "player": 4, "model": "Rupees (200)"}, + "KF Midos House Top Right Chest": { "item": "Ice Trap", "player": 3, "model": "Rupees (200)"}, + "KF Midos House Bottom Left Chest": { "item": "Rupees (200)", "player": 2}, + "KF Midos House Bottom Right Chest": { "item": "Ice Trap", "player": 3, "model": "Rupees (200)"}, "KF Storms Grotto Chest": { "item": "Deku Shield", "player": 1} }, "World 3": { - "KF Midos Top Left Chest": { "item": "Ice Trap", "player": 2, "model": "Rupees (200)"}, - "KF Midos Top Right Chest": { "item": "Ice Trap", "player": 1, "model": "Rupees (200)"}, - "KF Midos Bottom Left Chest": { "item": "Rupees (200)", "player": 4}, - "KF Midos Bottom Right Chest": { "item": "Ice Trap", "player": 1, "model": "Rupees (200)"}, + "KF Midos House Top Left Chest": { "item": "Ice Trap", "player": 2, "model": "Rupees (200)"}, + "KF Midos House Top Right Chest": { "item": "Ice Trap", "player": 1, "model": "Rupees (200)"}, + "KF Midos House Bottom Left Chest": { "item": "Rupees (200)", "player": 4}, + "KF Midos House Bottom Right Chest": { "item": "Ice Trap", "player": 1, "model": "Rupees (200)"}, "KF Storms Grotto Chest": { "item": "Deku Shield", "player": 3} }, "World 2": { - "KF Midos Top Left Chest": { "item": "Piece of Heart", "player": 2}, - "KF Midos Top Right Chest": { "item": "Ice Trap", "player": 3, "model": "Deku Nuts (10)"}, - "KF Midos Bottom Left Chest": { "item": "Ice Trap", "player": 3, "model": "Rupees (200)"}, - "KF Midos Bottom Right Chest": { "item": "Ice Trap", "player": 3, "model": "Rupees (200)"}, + "KF Midos House Top Left Chest": { "item": "Piece of Heart", "player": 2}, + "KF Midos House Top Right Chest": { "item": "Ice Trap", "player": 3, "model": "Deku Nuts (10)"}, + "KF Midos House Bottom Left Chest": { "item": "Ice Trap", "player": 3, "model": "Rupees (200)"}, + "KF Midos House Bottom Right Chest": { "item": "Ice Trap", "player": 3, "model": "Rupees (200)"}, "KF Storms Grotto Chest": { "item": "Rutos Letter", "player": 1} }, "World 4": { - "KF Midos Top Left Chest": { "item": "Piece of Heart", "player": 4}, - "KF Midos Top Right Chest": { "item": "Ice Trap", "player": 1, "model": "Deku Nuts (10)"}, - "KF Midos Bottom Left Chest": { "item": "Ice Trap", "player": 1, "model": "Rupees (200)"}, - "KF Midos Bottom Right Chest": { "item": "Ice Trap", "player": 1, "model": "Rupees (200)"}, + "KF Midos House Top Left Chest": { "item": "Piece of Heart", "player": 4}, + "KF Midos House Top Right Chest": { "item": "Ice Trap", "player": 1, "model": "Deku Nuts (10)"}, + "KF Midos House Bottom Left Chest": { "item": "Ice Trap", "player": 1, "model": "Rupees (200)"}, + "KF Midos House Bottom Right Chest": { "item": "Ice Trap", "player": 1, "model": "Rupees (200)"}, "KF Storms Grotto Chest": { "item": "Rutos Letter", "player": 3} } } diff --git a/tests/plando/plando-num-adult-trade-item-bad.json b/tests/plando/plando-num-adult-trade-item-bad.json index ac85d40ba0..33bfeb03b2 100644 --- a/tests/plando/plando-num-adult-trade-item-bad.json +++ b/tests/plando/plando-num-adult-trade-item-bad.json @@ -1,6 +1,6 @@ { "locations": { - "KF Midos Top Left Chest": "Pocket Egg", - "KF Midos Top Right Chest": "Pocket Egg" + "KF Midos House Top Left Chest": "Pocket Egg", + "KF Midos House Top Right Chest": "Pocket Egg" } } \ No newline at end of file diff --git a/tests/plando/plando-num-adult-trade-item-good.json b/tests/plando/plando-num-adult-trade-item-good.json index 544808df57..37640ffb1e 100644 --- a/tests/plando/plando-num-adult-trade-item-good.json +++ b/tests/plando/plando-num-adult-trade-item-good.json @@ -1,5 +1,5 @@ { "locations": { - "KF Midos Top Left Chest": "Pocket Egg" + "KF Midos House Top Left Chest": "Pocket Egg" } } \ No newline at end of file diff --git a/tests/plando/plando-num-bottles-fountain-closed-bad.json b/tests/plando/plando-num-bottles-fountain-closed-bad.json index 6ea75d6bdf..d35b01923a 100644 --- a/tests/plando/plando-num-bottles-fountain-closed-bad.json +++ b/tests/plando/plando-num-bottles-fountain-closed-bad.json @@ -3,9 +3,9 @@ "zora_fountain": "closed" }, "locations": { - "KF Midos Top Left Chest": "Bottle with Milk", - "KF Midos Top Right Chest": "Bottle with Milk", - "KF Midos Bottom Left Chest": "Bottle with Milk", - "KF Midos Bottom Right Chest": "Bottle with Milk" + "KF Midos House Top Left Chest": "Bottle with Milk", + "KF Midos House Top Right Chest": "Bottle with Milk", + "KF Midos House Bottom Left Chest": "Bottle with Milk", + "KF Midos House Bottom Right Chest": "Bottle with Milk" } } \ No newline at end of file diff --git a/tests/plando/plando-num-bottles-fountain-closed-good.json b/tests/plando/plando-num-bottles-fountain-closed-good.json index 3f9acc00ca..e6c4557c65 100644 --- a/tests/plando/plando-num-bottles-fountain-closed-good.json +++ b/tests/plando/plando-num-bottles-fountain-closed-good.json @@ -3,8 +3,8 @@ "zora_fountain": "closed" }, "locations": { - "KF Midos Top Left Chest": "Bottle with Milk", - "KF Midos Top Right Chest": "Bottle with Milk", - "KF Midos Bottom Left Chest": "Bottle with Milk" + "KF Midos House Top Left Chest": "Bottle with Milk", + "KF Midos House Top Right Chest": "Bottle with Milk", + "KF Midos House Bottom Left Chest": "Bottle with Milk" } } \ No newline at end of file diff --git a/tests/plando/plando-num-bottles-fountain-open-bad.json b/tests/plando/plando-num-bottles-fountain-open-bad.json index 7b9f352412..4d03dfb3f2 100644 --- a/tests/plando/plando-num-bottles-fountain-open-bad.json +++ b/tests/plando/plando-num-bottles-fountain-open-bad.json @@ -3,10 +3,10 @@ "zora_fountain": "open" }, "locations": { - "KF Midos Top Left Chest": "Bottle with Milk", - "KF Midos Top Right Chest": "Bottle with Milk", - "KF Midos Bottom Left Chest": "Bottle with Milk", - "KF Midos Bottom Right Chest": "Bottle with Milk", + "KF Midos House Top Left Chest": "Bottle with Milk", + "KF Midos House Top Right Chest": "Bottle with Milk", + "KF Midos House Bottom Left Chest": "Bottle with Milk", + "KF Midos House Bottom Right Chest": "Bottle with Milk", "LW Ocarina Memory Game": "Bottle with Milk" } } \ No newline at end of file diff --git a/tests/plando/plando-num-bottles-fountain-open-good.json b/tests/plando/plando-num-bottles-fountain-open-good.json index 13e0e7d1c7..83b389fedd 100644 --- a/tests/plando/plando-num-bottles-fountain-open-good.json +++ b/tests/plando/plando-num-bottles-fountain-open-good.json @@ -3,9 +3,9 @@ "zora_fountain": "open" }, "locations": { - "KF Midos Top Left Chest": "Bottle with Milk", - "KF Midos Top Right Chest": "Bottle with Milk", - "KF Midos Bottom Left Chest": "Bottle with Milk", - "KF Midos Bottom Right Chest": "Bottle with Milk" + "KF Midos House Top Left Chest": "Bottle with Milk", + "KF Midos House Top Right Chest": "Bottle with Milk", + "KF Midos House Bottom Left Chest": "Bottle with Milk", + "KF Midos House Bottom Right Chest": "Bottle with Milk" } } \ No newline at end of file diff --git a/tests/plando/plando-num-weird-egg-item-bad.json b/tests/plando/plando-num-weird-egg-item-bad.json index b33a6a854d..8e20d1db89 100644 --- a/tests/plando/plando-num-weird-egg-item-bad.json +++ b/tests/plando/plando-num-weird-egg-item-bad.json @@ -3,6 +3,6 @@ "shuffle_child_trade": [] }, "locations": { - "KF Midos Top Left Chest": "Weird Egg" + "KF Midos House Top Left Chest": "Weird Egg" } } diff --git a/tests/plando/plando-num-weird-egg-item-good.json b/tests/plando/plando-num-weird-egg-item-good.json index 3d00ec8439..7cadecee9a 100644 --- a/tests/plando/plando-num-weird-egg-item-good.json +++ b/tests/plando/plando-num-weird-egg-item-good.json @@ -3,6 +3,6 @@ "shuffle_child_trade": ["Weird Egg"] }, "locations": { - "KF Midos Top Left Chest": "Weird Egg" + "KF Midos House Top Left Chest": "Weird Egg" } } diff --git a/tests/plando/plando-placed-and-added-ice-traps.json b/tests/plando/plando-placed-and-added-ice-traps.json index ac2e2ae61b..2b6ef58aca 100644 --- a/tests/plando/plando-placed-and-added-ice-traps.json +++ b/tests/plando/plando-placed-and-added-ice-traps.json @@ -60,12 +60,12 @@ "GF HBA 1500 Points": "Ice Trap", "Wasteland Chest": "Ice Trap", "Colossus Freestanding PoH": "Ice Trap", - "Colossus Great Fairy Reward": "Ice Trap", - "ToT Light Arrows Cutscene": "Ice Trap", + "Colossus Great Fairy Fountain Reward": "Ice Trap", + "Temple of Time Light Arrow Cutscene": "Ice Trap", "HC Malon Egg": "Ice Trap", - "HC Great Fairy Reward": "Ice Trap", - "OGC Great Fairy Reward": "Ice Trap", - "Market 10 Big Poes": "Ice Trap", + "HC Great Fairy Fountain Reward": "Ice Trap", + "OGC Great Fairy Fountain Reward": "Ice Trap", + "Market Guard House 10 Big Poes": "Ice Trap", "Market Shooting Gallery Reward": "Ice Trap", "Market Bombchu Bowling First Prize": "Ice Trap", "Market Bombchu Bowling Second Prize": "Ice Trap", @@ -74,11 +74,11 @@ "Kak Anju as Adult": "Ice Trap", "Kak Anju as Child": "Ice Trap", "Kak Man on Roof": "Ice Trap", - "Kak 10 Gold Skulltula Reward": "Ice Trap", - "Kak 20 Gold Skulltula Reward": "Ice Trap", - "Kak 30 Gold Skulltula Reward": "Ice Trap", - "Kak 40 Gold Skulltula Reward": "Ice Trap", - "Kak 50 Gold Skulltula Reward": "Ice Trap", + "Kak House of Skulltula 10 Gold Skulltula Reward": "Ice Trap", + "Kak House of Skulltula 20 Gold Skulltula Reward": "Ice Trap", + "Kak House of Skulltula 30 Gold Skulltula Reward": "Ice Trap", + "Kak House of Skulltula 40 Gold Skulltula Reward": "Ice Trap", + "Kak House of Skulltula 50 Gold Skulltula Reward": "Ice Trap", "Kak Impas House Freestanding PoH": "Ice Trap", "Kak Windmill Freestanding PoH": "Ice Trap", "Kak Shooting Gallery Reward": "Ice Trap", @@ -87,8 +87,8 @@ "Graveyard Shield Grave Chest": "Ice Trap", "Graveyard Heart Piece Grave Chest": "Ice Trap", "Graveyard Royal Familys Tomb Chest": "Ice Trap", - "Graveyard Dampe Race Hookshot Chest": "Ice Trap", - "Graveyard Dampe Race Freestanding PoH": "Ice Trap", + "Graveyard Dampes Grave Hookshot Chest": "Ice Trap", + "Graveyard Dampes Grave Freestanding PoH":"Ice Trap", "DMT Chest": "Ice Trap", "DMT Freestanding PoH": "Ice Trap", "DMT Biggoron": "Ice Trap", @@ -101,8 +101,8 @@ "GC Darunias Joy": "Ice Trap", "DMC Wall Freestanding PoH": "Ice Trap", "DMC Volcano Freestanding PoH": "Ice Trap", - "DMC Great Fairy Reward": "Ice Trap", - "DMT Great Fairy Reward": "Ice Trap", + "DMC Great Fairy Fountain Reward": "Ice Trap", + "DMT Great Fairy Fountain Reward": "Ice Trap", "ZR Frogs Ocarina Game": "Ice Trap", "ZR Frogs in the Rain": "Ice Trap", "ZR Near Open Grotto Freestanding PoH": "Ice Trap", @@ -112,19 +112,19 @@ "ZD King Zora Thawed": "Ice Trap", "ZF Iceberg Freestanding PoH": "Ice Trap", "ZF Bottom Freestanding PoH": "Ice Trap", - "ZF Great Fairy Reward": "Ice Trap", - "LLR Talons Chickens": "Ice Trap", - "LLR Freestanding PoH": "Ice Trap", + "ZF Great Fairy Fountain Reward": "Ice Trap", + "LLR Talons House Chickens": "Ice Trap", + "LLR Tower Freestanding PoH": "Ice Trap", "Ganons Tower Boss Key Chest": "Ice Trap", "KF Storms Grotto Chest": "Ice Trap", "LW Near Shortcuts Grotto Chest": "Ice Trap", "Deku Theater Skull Mask": "Ice Trap", "Deku Theater Mask of Truth": "Ice Trap", - "LW Deku Scrub Grotto Front": "Ice Trap", + "LW Scrubs Grotto Deku Scrub Front": "Ice Trap", "SFM Wolfos Grotto Chest": "Ice Trap", "HF Southeast Grotto Chest": "Ice Trap", "HF Open Grotto Chest": "Ice Trap", - "HF Deku Scrub Grotto": "Ice Trap", + "HF Inside Fence Grotto Deku Scrub": "Ice Trap", "HF Near Market Grotto Chest": "Ice Trap", "HF Tektite Grotto Freestanding PoH": "Ice Trap", "Kak Redead Grotto Chest": "Ice Trap", diff --git a/tests/plando/plando-weird-egg-in-list.json b/tests/plando/plando-weird-egg-in-list.json index 10ef9b1c3a..9721ef6aa1 100644 --- a/tests/plando/plando-weird-egg-in-list.json +++ b/tests/plando/plando-weird-egg-in-list.json @@ -18,12 +18,12 @@ "GF HBA 1500 Points": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Wasteland Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Colossus Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Colossus Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "ToT Light Arrows Cutscene": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Colossus Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Temple of Time Light Arrow Cutscene": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "HC Malon Egg": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "HC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "OGC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Market Guard House 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], @@ -32,11 +32,11 @@ "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Kak 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Kak 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Kak 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Kak 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Kak House of Skulltula 10 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Kak House of Skulltula 20 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Kak House of Skulltula 30 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Kak House of Skulltula 40 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Kak House of Skulltula 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], @@ -45,8 +45,8 @@ "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Graveyard Heart Piece Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Graveyard Royal Familys Tomb Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Graveyard Dampe Race Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Graveyard Dampe Race Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Graveyard Dampes Grave Hookshot Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Graveyard Dampes Grave Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "DMT Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "DMT Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "DMT Biggoron": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], @@ -59,8 +59,8 @@ "GC Darunias Joy": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "DMC Wall Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "DMC Volcano Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "DMC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "DMT Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "DMC Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "DMT Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "ZR Frogs Ocarina Game": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "ZR Frogs in the Rain": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "ZR Near Open Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], @@ -70,19 +70,19 @@ "ZD King Zora Thawed": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "ZF Iceberg Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "ZF Bottom Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "ZF Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "LLR Talons Chickens": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "LLR Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "ZF Great Fairy Fountain Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "LLR Talons House Chickens": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "LLR Tower Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Ganons Tower Boss Key Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "KF Storms Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "LW Near Shortcuts Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Deku Theater Skull Mask": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Deku Theater Mask of Truth": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "LW Deku Scrub Grotto Front": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "LW Scrubs Grotto Deku Scrub Front": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "SFM Wolfos Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "HF Southeast Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "HF Open Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "HF Deku Scrub Grotto": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "HF Inside Fence Grotto Deku Scrub": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "HF Near Market Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "HF Tektite Grotto Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Redead Grotto Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], diff --git a/tests/plando/skip-zelda.json b/tests/plando/skip-zelda.json index d20006ffad..a69f4e9dbc 100644 --- a/tests/plando/skip-zelda.json +++ b/tests/plando/skip-zelda.json @@ -4,8 +4,8 @@ "tokensanity": "overworld", "hint_dist": "tournament", "disabled_locations": [ - "HC Great Fairy Reward", - "HC GS Storms Grotto", + "HC Great Fairy Fountain Reward", + "HC Storms Grotto GS", "HC GS Tree" ], "starting_inventory": [ diff --git a/tests/triforce-multiworld.sav b/tests/triforce-multiworld.sav index 57b820cdd6..52495100b1 100644 --- a/tests/triforce-multiworld.sav +++ b/tests/triforce-multiworld.sav @@ -41,7 +41,7 @@ "enhance_map_compass": false, "mq_dungeons_mode": "vanilla", "disabled_locations": [ -"Market 10 Big Poes", +"Market Guard House 10 Big Poes", "ZR Frogs Ocarina Game", "GF HBA 1500 Points", "Deku Theater Mask of Truth",