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

5
test/owg/TestDungeons.py
View File

@@ -50,9 +50,8 @@ class TestDungeons(TestVanillaOWG):
["Palace of Darkness - Shooter Room", True, ['Moon Pearl', 'Pegasus Boots']],
["Palace of Darkness - Shooter Room", True, ['Moon Pearl', 'Beat Agahnim 1']],
["Palace of Darkness - Shooter Room", True, ['Moon Pearl', 'Hammer', 'Progressive Glove']],
#todo: Qirn jump in logic?
#["Palace of Darkness - Shooter Room", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
["Palace of Darkness - Shooter Room", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove', 'Flippers']],
["Palace of Darkness - Shooter Room", True, ['Moon Pearl', 'Progressive Glove', 'Progressive Glove']],
["Swamp Palace - Entrance", False, []],
["Swamp Palace - Entrance", False, [], ['Magic Mirror']],