Merge pull request #107 from Berserker66/regression_fix

Fix skull woods for Location / Item players.
This commit is contained in:
Fabian Dill 2020-06-10 21:26:13 +02:00 committed by GitHub
commit 5f78ae4b1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions

View File

@ -52,6 +52,11 @@ def fill_dungeons(world):
world.push_item(pinball_room, ItemFactory('Small Key (Skull Woods)', player), False)
pinball_room.event = True
pinball_room.locked = True
else:
if not world.retro[player]:
world.itempool += [ItemFactory('Small Key (Skull Woods)', player)]
else:
world.itempool += [ItemFactory('Small Key (Universal)', player)]
dungeons = [(list(dungeon.regions), dungeon.big_key, list(dungeon.small_keys), list(dungeon.dungeon_items)) for dungeon in world.dungeons]
@ -130,6 +135,11 @@ def fill_dungeons_restrictive(world, shuffled_locations):
pinball_room.event = True
pinball_room.locked = True
shuffled_locations.remove(pinball_room)
else:
if not world.retro[player]:
world.itempool += [ItemFactory('Small Key (Skull Woods)', player)]
else:
world.itempool += [ItemFactory('Small Key (Universal)', player)]
# with shuffled dungeon items they are distributed as part of the normal item pool
for item in world.get_items():