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

Minor formatting

Browse Source
This commit is contained in:
codemann8
2023-07-16 01:12:12 -05:00
parent 4f5d268401
commit 138bd2b41f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/overworld/EntranceShuffle2.py
View File

@@ -190,10 +190,10 @@ def do_vanilla_connections(avail_pool):
def do_main_shuffle(entrances, exits, avail, mode_def): def do_main_shuffle(entrances, exits, avail, mode_def):
# drops and holes
cross_world = mode_def['cross_world'] == 'on' if 'cross_world' in mode_def else False cross_world = mode_def['cross_world'] == 'on' if 'cross_world' in mode_def else False
keep_together = mode_def['keep_drops_together'] == 'on' if 'keep_drops_together' in mode_def else True
avail.coupled = mode_def['decoupled'] != 'on' if 'decoupled' in mode_def else True avail.coupled = mode_def['decoupled'] != 'on' if 'decoupled' in mode_def else True
# drops and holes
keep_together = mode_def['keep_drops_together'] == 'on' if 'keep_drops_together' in mode_def else True
do_holes_and_linked_drops(entrances, exits, avail, cross_world, keep_together) do_holes_and_linked_drops(entrances, exits, avail, cross_world, keep_together)
if not avail.coupled: if not avail.coupled:
@@ -298,6 +298,8 @@ def do_main_shuffle(entrances, exits, avail, mode_def):
def bonk_fairy_exception(x): # (Bonk Fairy not eligible in standard) def bonk_fairy_exception(x): # (Bonk Fairy not eligible in standard)
return not avail.is_standard() or x != 'Bonk Fairy (Light)' return not avail.is_standard() or x != 'Bonk Fairy (Light)'
# old man S&Q cave
if not cross_world: if not cross_world:
#TODO: Add Swapped ER support for this #TODO: Add Swapped ER support for this
# OM Cave entrance in lw/dw if cross_world off # OM Cave entrance in lw/dw if cross_world off