monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix spoiler issue from take anys

This commit is contained in:
Kevin Cathcart 2018-03-24 01:50:54 -04:00
parent cb70174508
commit 360287f0fb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BaseClasses.py
View File

@ -833,7 +833,7 @@ class Spoiler(object):
def __init__(self, world): def __init__(self, world):
self.world = world self.world = world
self.entrances = [] self.entrances = OrderedDict()
self.medallions = {} self.medallions = {}
self.playthrough = {} self.playthrough = {}
self.locations = {} self.locations = {}
@ -842,7 +842,7 @@ class Spoiler(object):
self.shops = [] self.shops = []
def set_entrance(self, entrance, exit, direction): def set_entrance(self, entrance, exit, direction):
self.entrances.append(OrderedDict([('entrance', entrance), ('exit', exit), ('direction', direction)])) self.entrances[(entrance, direction)] = OrderedDict([('entrance', entrance), ('exit', exit), ('direction', direction)])
def parse_data(self): def parse_data(self):
self.medallions = OrderedDict([('Misery Mire', self.world.required_medallions[0]), ('Turtle Rock', self.world.required_medallions[1])]) self.medallions = OrderedDict([('Misery Mire', self.world.required_medallions[0]), ('Turtle Rock', self.world.required_medallions[1])])
@ -910,7 +910,7 @@ class Spoiler(object):
def to_json(self): def to_json(self):
self.parse_data() self.parse_data()
out = OrderedDict() out = OrderedDict()
out['entrances'] = self.entrances out['entrances'] = self.entrances.values()
out.update(self.locations) out.update(self.locations)
out['medallions'] = self.medallions out['medallions'] = self.medallions
out['shops'] = self.shops out['shops'] = self.shops
@ -935,7 +935,7 @@ class Spoiler(object):
outfile.write('Keysanity enabled: %s' % ('Yes' if self.metadata['keysanity'] else 'No')) outfile.write('Keysanity enabled: %s' % ('Yes' if self.metadata['keysanity'] else 'No'))
if self.entrances: if self.entrances:
outfile.write('\n\nEntrances:\n\n') outfile.write('\n\nEntrances:\n\n')
outfile.write('\n'.join(['%s %s %s' % (entry['entrance'], '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', entry['exit']) for entry in self.entrances])) outfile.write('\n'.join(['%s %s %s' % (entry['entrance'], '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', entry['exit']) for entry in self.entrances.values()]))
outfile.write('\n\nMedallions') outfile.write('\n\nMedallions')
outfile.write('\n\nMisery Mire Medallion: %s' % self.medallions['Misery Mire']) outfile.write('\n\nMisery Mire Medallion: %s' % self.medallions['Misery Mire'])
outfile.write('\nTurtle Rock Medallion: %s' % self.medallions['Turtle Rock']) outfile.write('\nTurtle Rock Medallion: %s' % self.medallions['Turtle Rock'])