alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fixed issue with item pool placing items on Zelda Drop Off

Browse Source
This commit is contained in:
codemann8
2025-05-04 09:31:36 -05:00
parent 40bff27e6b
commit fc172dd593
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ItemList.py
View File

@@ -272,14 +272,6 @@ def generate_itempool(world, player):
item = None item = None
set_event_item(world, player, loc, item) set_event_item(world, player, loc, item)
zelda_pickup, zelda_dropoff = None, None
if world.mode[player] == 'standard':
if not world.shuffle_followers[player]:
zelda_pickup = 'Zelda Herself'
zelda_dropoff = 'Zelda Delivered'
set_event_item(world, player, 'Zelda Pickup', zelda_pickup)
set_event_item(world, player, 'Zelda Drop Off', zelda_dropoff)
# set up item pool # set up item pool
skip_pool_adjustments = False skip_pool_adjustments = False
if world.customizer and world.customizer.get_item_pool() and player in world.customizer.get_item_pool(): if world.customizer and world.customizer.get_item_pool() and player in world.customizer.get_item_pool():

6
Regions.py
View File

@@ -1249,7 +1249,7 @@ def adjust_locations(world, player):
location.prize = prize_on_boss location.prize = prize_on_boss
location.real = not prize_on_boss location.real = not prize_on_boss
# unreal events: # unreal events:
for l in ['Ganon', 'Zelda Pickup', 'Zelda Drop Off'] + list(location_events): for l in ['Ganon'] + list(location_events):
location = world.get_location_unsafe(l, player) location = world.get_location_unsafe(l, player)
if location: if location:
location.type = LocationType.Logical location.type = LocationType.Logical
@@ -1436,8 +1436,8 @@ location_events = {
'Revealing Light': 'Maiden Unmasked', 'Revealing Light': 'Maiden Unmasked',
'Ice Block Drop': 'Convenient Block', 'Ice Block Drop': 'Convenient Block',
'Skull Star Tile': 'Hidden Pits', 'Skull Star Tile': 'Hidden Pits',
'Zelda Pickup': None, 'Zelda Pickup': 'Zelda Herself',
'Zelda Drop Off': None 'Zelda Drop Off': 'Zelda Delivered'
} }