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

Release notes and minor cleanup

Browse Source
This commit is contained in:
aerinon
2023-04-05 15:55:30 -06:00
parent f13880eee9
commit 50f92e7aee
5 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/gui/widgets.py
View File

@@ -266,13 +266,24 @@ def widget_command(widget, command=""):
elif command == "keydropshuffle":
if widget.storageVar.get() > 0:
temp_widget = root.pages["randomizer"].pages["item"].widgets["pottery"]
text_output += f'\n {temp_widget.label.cget("text")}'
if temp_widget.storageVar.get() == 'none':
text_output += f'\n {temp_widget.label.cget("text")}'
temp_widget.storageVar.set('keys')
temp_widget = root.pages["randomizer"].pages["item"].widgets["dropshuffle"]
temp_widget.storageVar.set(1)
text_output += f'\n {temp_widget.checkbox.cget("text")}'
widget.storageVar.set(0)
messagebox.showinfo('', f'The following settings were changed:{text_output}')
if temp_widget.storageVar.get() == 0:
temp_widget.storageVar.set(1)
text_output += f'\n {temp_widget.checkbox.cget("text")}'
if text_output:
messagebox.showinfo('', f'The following settings were changed:{text_output}')
else:
temp_widget = root.pages["randomizer"].pages["item"].widgets["pottery"]
if temp_widget.storageVar.get() == 'keys':
text_output += f'\n {temp_widget.label.cget("text")}'
temp_widget.storageVar.set('none')
temp_widget = root.pages["randomizer"].pages["item"].widgets["dropshuffle"]
if temp_widget.storageVar.get() == 1:
temp_widget.storageVar.set(0)
text_output += f'\n {temp_widget.checkbox.cget("text")}'
if text_output:
messagebox.showinfo('', f'The following settings were changed:{text_output}')

10
source/overworld/EntranceShuffle2.py
View File

@@ -425,10 +425,11 @@ def do_links_house(entrances, exits, avail, cross_world):
if not avail.world.shufflelinks[avail.player]:
links_house = 'Big Bomb Shop' if avail.inverted else 'Links House'
else:
forbidden = list(Isolated_LH_Doors_Inv + Inverted_Dark_Sanctuary_Doors
forbidden = list((Isolated_LH_Doors_Inv + Inverted_Dark_Sanctuary_Doors)
if avail.inverted else Isolated_LH_Doors_Open)
shuffle_mode = avail.world.shuffle[avail.player]
# simple shuffle -
if avail.world.shuffle[avail.player] == 'simple':
if shuffle_mode == 'simple':
avail.links_on_mountain = True # taken care of by the logic below
if avail.inverted: # in inverted, links house cannot be on the mountain
forbidden.extend(['Spike Cave', 'Dark Death Mountain Fairy', 'Hookshot Fairy'])
@@ -441,10 +442,11 @@ def do_links_house(entrances, exits, avail, cross_world):
# can't have links house on eddm in restricted because Inverted Aga Tower isn't available
# todo: inverted full may have the same problem if both links house and a mandatory connector is chosen
# from the 3 inverted options
if avail.world.shuffle[avail.player] in ['restricted'] and avail.inverted:
if shuffle_mode in ['restricted'] and avail.inverted:
avail.links_on_mountain = True
forbidden.extend(['Spike Cave', 'Dark Death Mountain Fairy'])
if shuffle_mode in ['lite', 'lean']:
forbidden.extend(['Spike Cave', 'Mire Shed'])
# lobby shuffle means you ought to keep links house in the same world
sanc_spawn_can_be_dark = (not avail.inverted and avail.world.doorShuffle[avail.player] in ['partitioned', 'crossed']
and avail.world.intensity[avail.player] >= 3)