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

Spoiler additions for doors

Browse Source
This commit is contained in:
aerinon
2019-08-26 21:59:02 -06:00
parent 02f4ad956d
commit 1e495de31c
3 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
BaseClasses.py
View File

@@ -1027,6 +1027,7 @@ class Spoiler(object):
def __init__(self, world):
self.world = world
self.entrances = OrderedDict()
self.doors = OrderedDict()
self.medallions = {}
self.playthrough = {}
self.locations = {}
@@ -1041,6 +1042,12 @@ class Spoiler(object):
else:
self.entrances[(entrance, direction, player)] = OrderedDict([('player', player), ('entrance', entrance), ('exit', exit), ('direction', direction)])
def set_door(self, entrance, exit, direction, player):
if self.world.players == 1:
self.doors[(entrance, direction, player)] = OrderedDict([('entrance', entrance), ('exit', exit), ('direction', direction)])
else:
self.doors[(entrance, direction, player)] = OrderedDict([('player', player), ('entrance', entrance), ('exit', exit), ('direction', direction)])
def parse_data(self):
self.medallions = OrderedDict()
if self.world.players == 1:
@@ -1135,6 +1142,7 @@ class Spoiler(object):
self.parse_data()
out = OrderedDict()
out['Entrances'] = list(self.entrances.values())
out['Doors'] = list(self.doors.values())
out.update(self.locations)
out['Special'] = self.medallions
if self.shops:
@@ -1164,9 +1172,12 @@ class Spoiler(object):
outfile.write('Menu speed: %s\n' % self.world.fastmenu)
outfile.write('Keysanity enabled: %s\n' % ('Yes' if self.metadata['keysanity'] else 'No'))
outfile.write('Players: %d' % self.world.players)
if self.doors:
outfile.write('\n\nDoors:\n\n')
outfile.write('\n'.join(['%s%s %s %s' % ('Player {0}: '.format(entry['player']) if self.world.players > 1 else '', entry['entrance'], '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', entry['exit']) for entry in self.doors.values()]))
if self.entrances:
outfile.write('\n\nEntrances:\n\n')
outfile.write('\n'.join(['%s%s %s %s' % ('Player {0}: '.format(entry['player']) if self.world.players >1 else '', entry['entrance'], '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', entry['exit']) for entry in self.entrances.values()]))
outfile.write('\n'.join(['%s%s %s %s' % ('Player {0}: '.format(entry['player']) if self.world.players > 1 else '', entry['entrance'], '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', entry['exit']) for entry in self.entrances.values()]))
outfile.write('\n\nMedallions\n')
if self.world.players == 1:
outfile.write('\nMisery Mire Medallion: %s' % (self.medallions['Misery Mire']))

20
DoorShuffle.py
View File

@@ -15,11 +15,11 @@ def link_doors(world, player):
# These connection are here because they are currently unable to be shuffled
for entrance, ext in spiral_staircases:
connect_two_way(world, entrance, ext, player)
connect_two_way(world, entrance, ext, player, True)
for entrance, ext in straight_staircases:
connect_two_way(world, entrance, ext, player)
connect_two_way(world, entrance, ext, player, True)
for entrance, ext in open_edges:
connect_two_way(world, entrance, ext, player)
connect_two_way(world, entrance, ext, player, True)
for exitName, regionName in falldown_pits:
connect_simple_door(world, exitName, regionName, player)
for exitName, regionName in dungeon_warps:
@@ -27,9 +27,9 @@ def link_doors(world, player):
if world.doorShuffle == 'vanilla':
for entrance, ext in default_door_connections:
connect_two_way(world, entrance, ext, player)
connect_two_way(world, entrance, ext, player, True)
for ent, ext in default_one_way_connections:
connect_one_way(world, ent, ext, player)
connect_one_way(world, ent, ext, True)
normal_dungeon_pool(world, player)
elif world.doorShuffle == 'basic':
normal_dungeon_pool(world, player)
@@ -91,7 +91,7 @@ def connect_simple_door(world, exit_name, region_name, player):
d.dest = region
def connect_two_way(world, entrancename, exitname, player):
def connect_two_way(world, entrancename, exitname, player, skipSpoiler=False):
entrance = world.get_entrance(entrancename, player)
ext = world.get_entrance(exitname, player)
@@ -112,10 +112,11 @@ def connect_two_way(world, entrancename, exitname, player):
x.dest = y
if y is not None:
y.dest = x
# world.spoiler.set_entrance(entrance.name, exit.name, 'both') # todo: spoiler stuff
if not skipSpoiler and x is not None and y is not None:
world.spoiler.set_door(x.name, y.name, 'both', player)
def connect_one_way(world, entrancename, exitname, player):
def connect_one_way(world, entrancename, exitname, player, skipSpoiler=False):
entrance = world.get_entrance(entrancename, player)
ext = world.get_entrance(exitname, player)
@@ -134,7 +135,8 @@ def connect_one_way(world, entrancename, exitname, player):
x.dest = y
if y is not None:
y.dest = x
# spoiler info goes here?
if not skipSpoiler and x is not None and y is not None:
world.spoiler.set_door(x.name, y.name, 'entrance', player)
def within_dungeon(world, player):

13
Regions.py
View File

@@ -413,12 +413,13 @@ def mark_light_world_regions(world):
current = queue.popleft()
current.is_dark_world = True
for exit in current.exits:
if exit.connected_region.type == RegionType.LightWorld:
# Don't venture into the light world
continue
if exit.connected_region not in seen:
seen.add(exit.connected_region)
queue.append(exit.connected_region)
if exit.connected_region is not None:
if exit.connected_region.type == RegionType.LightWorld:
# Don't venture into the light world
continue
if exit.connected_region not in seen:
seen.add(exit.connected_region)
queue.append(exit.connected_region)
# (room_id, shopkeeper, replaceable)
shop_table = {