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

Implemented Bonk Drop Shuffle

Browse Source
This commit is contained in:
codemann8
2022-07-24 16:19:26 -05:00
parent 58afaa52e8
commit a97ee6c57a
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Fill.py
View File

@@ -471,7 +471,7 @@ def calc_trash_locations(world, player):
total_count, gt_count = 0, 0 total_count, gt_count = 0, 0
for loc in world.get_locations(): for loc in world.get_locations():
if (loc.player == player and loc.item is None if (loc.player == player and loc.item is None
and (loc.type not in {LocationType.Pot, LocationType.Drop, LocationType.Normal} or not loc.forced_item) and (loc.type not in {LocationType.Bonk, LocationType.Pot, LocationType.Drop, LocationType.Normal} or not loc.forced_item)
and (loc.type != LocationType.Shop or world.shopsanity[player]) and (loc.type != LocationType.Shop or world.shopsanity[player])
and loc.parent_region.dungeon): and loc.parent_region.dungeon):
total_count += 1 total_count += 1
@@ -482,18 +482,22 @@ def calc_trash_locations(world, player):
def ensure_good_pots(world, write_skips=False): def ensure_good_pots(world, write_skips=False):
for loc in world.get_locations(): for loc in world.get_locations():
# convert Arrows 5 and Nothing when necessary # # convert Arrows 5 when necessary
if (loc.item.name in {'Arrows (5)', 'Nothing'} # if (loc.item.name in {'Arrows (5)'}
# and loc.type not in [LocationType.Pot, LocationType.Bonk]):
# loc.item = ItemFactory(invalid_location_replacement[loc.item.name], loc.item.player)
# convert Nothing when necessary
if (loc.item.name in {'Nothing'}
and (loc.type != LocationType.Pot or loc.item.player != loc.player)): and (loc.type != LocationType.Pot or loc.item.player != loc.player)):
loc.item = ItemFactory(invalid_location_replacement[loc.item.name], loc.item.player) loc.item = ItemFactory(invalid_location_replacement[loc.item.name], loc.item.player)
# can be placed here by multiworld balancing or shop balancing # # can be placed here by multiworld balancing or shop balancing
# change it to something normal for the player it got swapped to # # change it to something normal for the player it got swapped to
elif (loc.item.name in {'Chicken', 'Big Magic'} # elif (loc.item.name in {'Chicken', 'Big Magic'}
and (loc.type != LocationType.Pot or loc.item.player != loc.player)): # and (loc.type != LocationType.Pot or loc.item.player != loc.player)):
if loc.type == LocationType.Pot: # if loc.type == LocationType.Pot:
loc.item.player = loc.player # loc.item.player = loc.player
else: # else:
loc.item = ItemFactory(invalid_location_replacement[loc.item.name], loc.player) # loc.item = ItemFactory(invalid_location_replacement[loc.item.name], loc.player)
# do the arrow retro check # do the arrow retro check
if world.retro[loc.item.player] and loc.item.name in {'Arrows (5)', 'Arrows (10)'}: if world.retro[loc.item.player] and loc.item.name in {'Arrows (5)', 'Arrows (10)'}:
loc.item = ItemFactory('Rupees (5)', loc.item.player) loc.item = ItemFactory('Rupees (5)', loc.item.player)