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

Fix generation issues in HMG

Browse Source
This commit is contained in:
codemann8
2024-03-22 05:24:10 -05:00
parent 4dd334f66e
commit da749e4a11
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Main.py
View File

@@ -598,10 +598,10 @@ def copy_world(world):
update_world_regions(ret, player) update_world_regions(ret, player)
if world.logic[player] in ('owglitches', 'hybridglitches', 'nologic'): if world.logic[player] in ('owglitches', 'hybridglitches', 'nologic'):
create_owg_connections(ret, player) create_owg_connections(ret, player)
if world.logic[player] in ('nologic', 'hybridglitches'):
create_hybridmajor_connections(ret, player)
create_dynamic_exits(ret, player) create_dynamic_exits(ret, player)
create_dungeon_regions(ret, player) create_dungeon_regions(ret, player)
if world.logic[player] in ('nologic', 'hybridglitches'):
create_hybridmajor_connections(ret, player)
create_owedges(ret, player) create_owedges(ret, player)
create_shops(ret, player) create_shops(ret, player)
#create_doors(ret, player) #create_doors(ret, player)
@@ -795,10 +795,10 @@ def copy_world_premature(world, player):
update_world_regions(ret, player) update_world_regions(ret, player)
if world.logic[player] in ('owglitches', 'hybridglitches', 'nologic'): if world.logic[player] in ('owglitches', 'hybridglitches', 'nologic'):
create_owg_connections(ret, player) create_owg_connections(ret, player)
if world.logic[player] in ('nologic', 'hybridglitches'):
create_hybridmajor_connections(ret, player)
create_dynamic_exits(ret, player) create_dynamic_exits(ret, player)
create_dungeon_regions(ret, player) create_dungeon_regions(ret, player)
if world.logic[player] in ('nologic', 'hybridglitches'):
create_hybridmajor_connections(ret, player)
create_owedges(ret, player) create_owedges(ret, player)
create_shops(ret, player) create_shops(ret, player)
create_doors(ret, player) create_doors(ret, player)

2
Rules.py
View File

@@ -846,7 +846,7 @@ def global_rules(world, player):
add_key_logic_rules(world, player) add_key_logic_rules(world, player)
if world.logic[player] == 'hybridglitches': if world.logic[player] == 'hybridglitches' and not world.is_copied_world:
add_hmg_key_logic_rules(world, player) add_hmg_key_logic_rules(world, player)
# End of door rando rules. # End of door rando rules.

1
UnderworldGlitchRules.py
View File

@@ -66,6 +66,7 @@ def create_hybridmajor_connectors(world, player):
specrock_connectors, specrock_connectors,
]: ]:
new_connectors = [(connector[0], connector[1], world.get_entrance(connector[2], player).connected_region) for connector in connectors] new_connectors = [(connector[0], connector[1], world.get_entrance(connector[2], player).connected_region) for connector in connectors]
new_connectors = [c for c in new_connectors if c[2] is not None]
create_no_logic_connections(player, world, new_connectors) create_no_logic_connections(player, world, new_connectors)