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 conflicts

Browse Source
This commit is contained in:
qadan
2020-01-15 19:37:39 -04:00
parent 277d3ed713 2d26d63cce
commit 348887ce92
20 changed files with 1097 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Rules.py
View File

@@ -918,7 +918,6 @@ def overworld_glitches_rules(world, player):
for spot in mini_moldorm_cave.locations:
add_rule(world.get_location(spot, player), superbunny_mirror_sword, 'or')
add_rule(world.get_location('Spiral Cave', player), superbunny_mirror_sword, 'or')
>>>>>>> c677a875f2a124bd0930467b2952e0587d24839b
add_conditional_lamps(world, player)