diff --git a/test/inverted_owg/TestDarkWorld.py b/test/inverted_owg/TestDarkWorld.py index 89dff120..a585b80a 100644 --- a/test/inverted_owg/TestDarkWorld.py +++ b/test/inverted_owg/TestDarkWorld.py @@ -37,11 +37,11 @@ class TestDarkWorld(TestInvertedOWG): ["Blacksmith", False, []], ["Blacksmith", True, ['Magic Mirror', 'Pegasus Boots']], - ["Blacksmith", True, ['Progressive Glove', 'Progressive Glove', 'Pegasus Boots', 'Moon Pearl']], + ["Blacksmith", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl']], ["Purple Chest", False, []], ["Purple Chest", True, ['Magic Mirror', 'Pegasus Boots']], - ["Purple Chest", True, ['Progressive Glove', 'Progressive Glove', 'Pegasus Boots', 'Moon Pearl']], + ["Purple Chest", True, ['Progressive Glove', 'Progressive Glove', 'Moon Pearl']], ]) def testEastDarkWorld(self): diff --git a/test/inverted_owg/TestDeathMountain.py b/test/inverted_owg/TestDeathMountain.py index 093331c2..a0787968 100644 --- a/test/inverted_owg/TestDeathMountain.py +++ b/test/inverted_owg/TestDeathMountain.py @@ -73,14 +73,19 @@ class TestDeathMountain(TestInvertedOWG): ["Spike Cave", False, [], ['Progressive Glove']], ["Spike Cave", False, [], ['Hammer']], ["Spike Cave", False, [], ['Cape', 'Cane of Byrna']], - # ER doesn't put in an extra potion - #["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Pegasus Boots', 'Cape']], - ["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Pegasus Boots', 'Cape', 'Moon Pearl']], - ["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Pegasus Boots', 'Cane of Byrna']], - ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Pegasus Boots', 'Cape']], - ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Pegasus Boots', 'Cane of Byrna']], - ["Spike Cave", True, ['Magic Upgrade (1/4)', 'Hammer', 'Progressive Glove', 'Pegasus Boots', 'Cape']], - ["Spike Cave", True, ['Magic Upgrade (1/4)', 'Hammer', 'Progressive Glove', 'Pegasus Boots', 'Cane of Byrna']], + ["Spike Cave", False, [], ['Cane of Byrna', 'AnyBottle', 'Magic Upgrade (1/2)']], + ["Spike Cave", False, [], ['AnyBottle', 'Magic Upgrade (1/2)', 'Pegasus Boots', 'Boss Heart Container', 'Piece of Heart', 'Sanctuary Heart Container']], + ["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Lamp', 'Cape']], + # Change from base ER - this fork places a blue potion in dark world + ["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Lamp', 'Cane of Byrna']], + ["Spike Cave", True, ['Bottle', 'Hammer', 'Progressive Glove', 'Flute', 'Moon Pearl', 'Cane of Byrna']], + ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Lamp', 'Cape']], + ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Flute', 'Moon Pearl', 'Cape']], + ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Lamp', 'Cane of Byrna']], + ["Spike Cave", True, ['Magic Upgrade (1/2)', 'Hammer', 'Progressive Glove', 'Flute', 'Moon Pearl', 'Cane of Byrna']], + ["Spike Cave", True, ['Pegasus Boots', 'Hammer', 'Progressive Glove', 'Cane of Byrna']], + ["Spike Cave", True, ['Boss Heart Container', 'Hammer', 'Progressive Glove', 'Lamp', 'Cane of Byrna']], + ["Spike Cave", True, ['Boss Heart Container', 'Hammer', 'Progressive Glove', 'Flute', 'Moon Pearl', 'Cane of Byrna']], ]) def testEastDarkWorldDeathMountain(self): diff --git a/test/inverted_owg/TestDungeons.py b/test/inverted_owg/TestDungeons.py index 3cc7bb37..33a50450 100644 --- a/test/inverted_owg/TestDungeons.py +++ b/test/inverted_owg/TestDungeons.py @@ -37,7 +37,7 @@ class TestDungeons(TestInvertedOWG): ["Desert Palace - Boss", False, [], ['Big Key (Desert Palace)']], ["Desert Palace - Boss", False, [], ['Lamp', 'Fire Rod']], ["Desert Palace - Boss", True, ['Progressive Sword', 'Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Moon Pearl', 'Pegasus Boots', 'Lamp']], - ["Desert Palace - Boss", True, ['Progressive Sword', 'Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Moon Pearl', 'Pegasus Boots', 'Fire Rod']], + ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Moon Pearl', 'Pegasus Boots', 'Fire Rod']], ["Tower of Hera - Basement Cage", False, []], ["Tower of Hera - Basement Cage", False, [], ['Moon Pearl']], @@ -53,8 +53,6 @@ class TestDungeons(TestInvertedOWG): ["Palace of Darkness - Shooter Room", True, ['Pegasus Boots']], ["Palace of Darkness - Shooter Room", True, ['Hammer']], ["Palace of Darkness - Shooter Room", True, ['Flippers']], - ["Palace of Darkness - Shooter Room", True, ['Pegasus Boots', 'Progressive Glove']], - ["Palace of Darkness - Shooter Room", True, ['Pegasus Boots', 'Magic Mirror']], ["Swamp Palace - Entrance", False, []], ["Swamp Palace - Entrance", False, [], ['Magic Mirror']], @@ -109,7 +107,7 @@ class TestDungeons(TestInvertedOWG): ["Ganons Tower - Hope Room - Left", False, [], ['Crystal 5']], ["Ganons Tower - Hope Room - Left", False, [], ['Crystal 6']], ["Ganons Tower - Hope Room - Left", False, [], ['Crystal 7']], - ["Ganons Tower - Hope Room - Left", True, ['Beat Agahnim 1', 'Hookshot', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7']], - ["Ganons Tower - Hope Room - Left", True, ['Pegasus Boots', 'Magic Mirror', 'Hookshot', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7']], - ["Ganons Tower - Hope Room - Left", True, ['Pegasus Boots', 'Moon Pearl', 'Hookshot', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7']], + ["Ganons Tower - Hope Room - Left", True, ['Beat Agahnim 1', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7']], + ["Ganons Tower - Hope Room - Left", True, ['Pegasus Boots', 'Magic Mirror', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7']], + ["Ganons Tower - Hope Room - Left", True, ['Pegasus Boots', 'Moon Pearl', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7']], ]) \ No newline at end of file diff --git a/test/inverted_owg/TestLightWorld.py b/test/inverted_owg/TestLightWorld.py index ad833017..aa4ffe02 100644 --- a/test/inverted_owg/TestLightWorld.py +++ b/test/inverted_owg/TestLightWorld.py @@ -23,7 +23,8 @@ class TestLightWorld(TestInvertedOWG): ["King's Tomb", False, []], ["King's Tomb", False, [], ['Pegasus Boots']], ["King's Tomb", False, [], ['Moon Pearl']], - ["King's Tomb", True, ['Pegasus Boots', 'Magic Mirror', 'Moon Pearl']], + ["King's Tomb", True, [], ['Magic Mirror']], + ["King's Tomb", True, ['Pegasus Boots', 'Moon Pearl']], ["Floodgate Chest", False, []], ["Floodgate Chest", False, [], ['Moon Pearl', 'Magic Mirror']],