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

Merge branch 'OverworldShuffleDev' into OverworldShuffle

Browse Source
This commit is contained in:
codemann8
2023-07-07 04:15:25 -05:00
parent 3dbcab1357 5ca2522386
commit 27baf8d715
9 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OverworldShuffle.py
View File

@@ -7,7 +7,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType
from OverworldGlitchRules import create_owg_connections
from Utils import bidict
version_number = '0.3.1.1'
version_number = '0.3.1.2'
# branch indicator is intentionally different across branches
version_branch = ''
@@ -639,17 +639,17 @@ def shuffle_tiles(world, groups, result_list, do_grouped, player):
if world.customizer:
if not do_grouped:
custom_flips = world.customizer.get_owtileflips()
if custom_flips:
if custom_flips and player in custom_flips:
custom_flips = custom_flips[player]
nonflipped_groups = list()
forced_flips = list()
forced_nonflips = list()
player_key = player
if 'undefined_chance' in custom_flips[player_key]:
undefined_chance = custom_flips[player_key]['undefined_chance']
if 'force_flip' in custom_flips[player_key]:
forced_flips = custom_flips[player_key]['force_flip']
if 'force_no_flip' in custom_flips[player_key]:
forced_nonflips = custom_flips[player_key]['force_no_flip']
if 'undefined_chance' in custom_flips:
undefined_chance = custom_flips['undefined_chance']
if 'force_flip' in custom_flips:
forced_flips = custom_flips['force_flip']
if 'force_no_flip' in custom_flips:
forced_nonflips = custom_flips['force_no_flip']
for group in groups:
if any(owid in group[0] for owid in forced_nonflips):