monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove pinball key if keyshuffle

This commit is contained in:
Fabian Dill 2020-06-10 06:17:10 +02:00
parent 90b24e3d59
commit 326262203f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dungeons.py
View File

@ -47,7 +47,7 @@ def fill_dungeons(world):
all_state_base = world.get_all_state() all_state_base = world.get_all_state()
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
if not world.retro[player] and world.logic == "noglitches": if not world.retro[player] and world.logic == "noglitches" and not world.keyshuffle[player]:
pinball_room = world.get_location('Skull Woods - Pinball Room', player) pinball_room = world.get_location('Skull Woods - Pinball Room', player)
world.push_item(pinball_room, ItemFactory('Small Key (Skull Woods)', player), False) world.push_item(pinball_room, ItemFactory('Small Key (Skull Woods)', player), False)
pinball_room.event = True pinball_room.event = True
@ -124,14 +124,12 @@ def fill_dungeons_restrictive(world, shuffled_locations):
all_state_base = world.get_all_state() all_state_base = world.get_all_state()
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
pinball_room = world.get_location('Skull Woods - Pinball Room', player) if not world.retro[player] and world.logic == "noglitches" and not world.keyshuffle[player]:
if world.retro[player]: pinball_room = world.get_location('Skull Woods - Pinball Room', player)
world.push_item(pinball_room, ItemFactory('Small Key (Universal)', player), False)
else:
world.push_item(pinball_room, ItemFactory('Small Key (Skull Woods)', player), False) world.push_item(pinball_room, ItemFactory('Small Key (Skull Woods)', player), False)
pinball_room.event = True pinball_room.event = True
pinball_room.locked = True pinball_room.locked = True
shuffled_locations.remove(pinball_room) shuffled_locations.remove(pinball_room)
# with shuffled dungeon items they are distributed as part of the normal item pool # with shuffled dungeon items they are distributed as part of the normal item pool
for item in world.get_items(): for item in world.get_items():