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

Marking OWEdge exits separately from Entrances

Browse Source
This commit is contained in:
codemann8
2021-06-06 10:41:41 -05:00
parent afcc9bbbe0
commit 5f53cf62bb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BaseClasses.py
View File

@@ -160,6 +160,7 @@ class World(object):
def initialize_owedges(self, edges): def initialize_owedges(self, edges):
for edge in edges: for edge in edges:
self._owedge_cache[(edge.name, edge.player)] = edge self._owedge_cache[(edge.name, edge.player)] = edge
self._entrance_cache[edge.name, edge.player].spot_type = 'OWEdge'
def initialize_doors(self, doors): def initialize_doors(self, doors):
for door in doors: for door in doors:
@@ -586,7 +587,7 @@ class CollectionState(object):
# try to resolve a name # try to resolve a name
if resolution_hint == 'Location': if resolution_hint == 'Location':
spot = self.world.get_location(spot, player) spot = self.world.get_location(spot, player)
elif resolution_hint == 'Entrance': elif resolution_hint in ['Entrance', 'OWEdge']:
spot = self.world.get_entrance(spot, player) spot = self.world.get_entrance(spot, player)
else: else:
# default to Region # default to Region

2
Main.py
View File

@@ -128,10 +128,10 @@ def main(args, seed=None, fish=None):
world.push_precollected(item) world.push_precollected(item)
create_regions(world, player) create_regions(world, player)
create_dungeon_regions(world, player)
create_owedges(world, player) create_owedges(world, player)
if world.logic[player] in ('owglitches', 'nologic'): if world.logic[player] in ('owglitches', 'nologic'):
create_owg_connections(world, player) create_owg_connections(world, player)
create_dungeon_regions(world, player)
create_shops(world, player) create_shops(world, player)
create_doors(world, player) create_doors(world, player)
create_rooms(world, player) create_rooms(world, player)