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
2022-11-19 17:03:44 -06:00
parent 58c1a0f4d1 c886f529ee
commit e0a7fdc4f0
13 changed files with 75 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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.2.11.2'
version_number = '0.2.11.3'
# branch indicator is intentionally different across branches
version_branch = ''
@@ -613,7 +613,7 @@ def shuffle_tiles(world, groups, result_list, do_grouped, player):
parity[5] += 1
if 0x1b in group and world.mode[player] != 'standard':
parity[5] += 1
if 0x1b in group and world.shuffle_ganon:
if 0x1b in group and world.shuffle_ganon[player]:
parity[5] -= 1
group_parity[group[0]] = parity
@@ -1154,6 +1154,7 @@ mandatory_connections = [# Intra-tile OW Connections
('Lost Woods Bush (East)', 'Lost Woods West Area'), #pearl
('West Death Mountain Drop', 'West Death Mountain (Bottom)'),
('Spectacle Rock Drop', 'West Death Mountain (Top)'),
('Old Man Drop Off', 'Old Man Drop Off'),
('DM Hammer Bridge (West)', 'East Death Mountain (Top East)'), #hammer
('DM Hammer Bridge (East)', 'East Death Mountain (Top West)'), #hammer
('East Death Mountain Spiral Ledge Drop', 'Spiral Cave Ledge'),