Merged in DR v1.2.0.14 (2nd)

This commit is contained in:
codemann8
2023-04-07 12:04:12 -05:00
parent c2b3d8ce6c
commit 793f3b30b0
28 changed files with 633 additions and 618 deletions

View File

@@ -49,16 +49,15 @@ class TestEntrances(TestInverted):
["Tower of Hera", True, ["Moon Pearl", "Hammer", "Hookshot", "Progressive Glove", "Ocarina"]],
["Tower of Hera", True, ["Moon Pearl", "Hammer", "Beat Agahnim 1", "Ocarina", "Hookshot"]],
# Agahnim's Tower (Inverted)
["Ganons Tower", False, []],
["Ganons Tower", False, [], ["Ocarina", "Lamp"]],
["Ganons Tower", False, [], ["Ocarina", "Progressive Glove"]],
["Ganons Tower", False, [], ["Moon Pearl", "Lamp"]],
["Ganons Tower", False, [], ["Moon Pearl", "Progressive Glove"]],
["Ganons Tower", True, ["Lamp", "Progressive Glove"]],
["Ganons Tower", True, ["Ocarina", "Beat Agahnim 1", "Moon Pearl"]],
["Ganons Tower", True, ["Ocarina", "Progressive Glove", "Progressive Glove", "Moon Pearl"]],
["Ganons Tower", True, ["Ocarina", "Progressive Glove", "Hammer", "Moon Pearl"]],
["Agahnims Tower", False, []],
["Agahnims Tower", False, [], ["Ocarina", "Lamp"]],
["Agahnims Tower", False, [], ["Ocarina", "Progressive Glove"]],
["Agahnims Tower", False, [], ["Moon Pearl", "Lamp"]],
["Agahnims Tower", False, [], ["Moon Pearl", "Progressive Glove"]],
["Agahnims Tower", True, ["Lamp", "Progressive Glove"]],
["Agahnims Tower", True, ["Ocarina", "Beat Agahnim 1", "Moon Pearl"]],
["Agahnims Tower", True, ["Ocarina", "Progressive Glove", "Progressive Glove", "Moon Pearl"]],
["Agahnims Tower", True, ["Ocarina", "Progressive Glove", "Hammer", "Moon Pearl"]],
["Palace of Darkness", False, []],
["Palace of Darkness", False, [], ["Hammer", "Flippers", "Magic Mirror", "Ocarina"]],
@@ -105,16 +104,15 @@ class TestEntrances(TestInverted):
["Turtle Rock", True, ["Quake", "Progressive Sword", "Progressive Glove", "Hammer", "Moon Pearl", "Ocarina"]],
["Turtle Rock", True, ["Quake", "Progressive Sword", "Beat Agahnim 1", "Moon Pearl", "Ocarina"]],
# Ganon's Tower (Inverted)
["Agahnims Tower", False, []],
["Agahnims Tower", False, [], ["Crystal 1"]],
["Agahnims Tower", False, [], ["Crystal 2"]],
["Agahnims Tower", False, [], ["Crystal 3"]],
["Agahnims Tower", False, [], ["Crystal 4"]],
["Agahnims Tower", False, [], ["Crystal 5"]],
["Agahnims Tower", False, [], ["Crystal 6"]],
["Agahnims Tower", False, [], ["Crystal 7"]],
["Agahnims Tower", True, ["Beat Agahnim 1", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Agahnims Tower", True, ["Moon Pearl", "Progressive Glove", "Progressive Glove", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Agahnims Tower", True, ["Moon Pearl", "Hammer", "Progressive Glove", "Progressive Glove", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Ganons Tower", False, []],
["Ganons Tower", False, [], ["Crystal 1"]],
["Ganons Tower", False, [], ["Crystal 2"]],
["Ganons Tower", False, [], ["Crystal 3"]],
["Ganons Tower", False, [], ["Crystal 4"]],
["Ganons Tower", False, [], ["Crystal 5"]],
["Ganons Tower", False, [], ["Crystal 6"]],
["Ganons Tower", False, [], ["Crystal 7"]],
["Ganons Tower", True, ["Beat Agahnim 1", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Ganons Tower", True, ["Moon Pearl", "Progressive Glove", "Progressive Glove", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Ganons Tower", True, ["Moon Pearl", "Hammer", "Progressive Glove", "Progressive Glove", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
])