morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qirnjump' into main

Browse Source 
# Conflicts:
#	test/inverted_owg/TestDungeons.py
This commit is contained in:
Fabian Dill
2020-12-19 22:40:08 +01:00
parent 238b9f35b4 db627be170
commit e5aaa5af52
4 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/inverted_owg/TestDungeons.py
View File

@@ -48,11 +48,8 @@ class TestDungeons(TestInvertedOWG):
["Castle Tower - Room 03", True, ['Pegasus Boots', 'Progressive Sword']],
["Castle Tower - Room 03", True, ['Pegasus Boots', 'Progressive Bow']],
#todo: Qirn Jump
#["Palace of Darkness - Shooter Room", True, []],
["Palace of Darkness - Shooter Room", True, ['Pegasus Boots']],
["Palace of Darkness - Shooter Room", True, ['Hammer']],
["Palace of Darkness - Shooter Room", True, ['Flippers']],
# Qirn Jump
["Palace of Darkness - Shooter Room", True, []],
["Swamp Palace - Entrance", False, []],
["Swamp Palace - Entrance", False, [], ['Magic Mirror']],
@@ -76,11 +73,9 @@ class TestDungeons(TestInvertedOWG):
["Ice Palace - Compass Chest", False, []],
["Ice Palace - Compass Chest", False, [], ['Fire Rod', 'Bombos', 'Progressive Sword']],
#todo: Qirn Jump
#["Ice Palace - Compass Chest", True, ['Fire Rod']],
#["Ice Palace - Compass Chest", True, ['Bombos', 'Progressive Sword']],
["Ice Palace - Compass Chest", True, ['Pegasus Boots', 'Fire Rod']],
["Ice Palace - Compass Chest", True, ['Pegasus Boots', 'Bombos', 'Progressive Sword']],
# Qirn Jump
["Ice Palace - Compass Chest", True, ['Fire Rod']],
["Ice Palace - Compass Chest", True, ['Bombos', 'Progressive Sword']],
["Misery Mire - Bridge Chest", False, []],
["Misery Mire - Bridge Chest", False, [], ['Ether']],