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

Timer display mode 

-Adds support for the timer display mode
-Fixes the name for Link's House for insanity mode shuffle
This commit is contained in:
AmazingAmpharos 2017-11-11 18:06:05 -06:00 committed by GitHub
parent a64fb33f4b
commit 17b18eb630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ItemList.py
View File

@ -93,7 +93,7 @@ insaneswordless = ['Rupees (20)'] * 3 + ['Silver Arrows']
def generate_itempool(world): def generate_itempool(world):
if (world.difficulty not in ['easy', 'normal', 'hard', 'expert', 'insane'] or world.goal not in ['ganon', 'pedestal', 'dungeons', 'triforcehunt', 'crystals'] if (world.difficulty not in ['easy', 'normal', 'hard', 'expert', 'insane'] or world.goal not in ['ganon', 'pedestal', 'dungeons', 'triforcehunt', 'crystals']
or world.mode not in ['open', 'standard', 'swordless'] or world.timer not in ['none', 'timed', 'timed-ohko', 'timed-countdown'] or world.progressive not in ['on', 'off', 'random']): or world.mode not in ['open', 'standard', 'swordless'] or world.timer not in ['none', 'display', 'timed', 'timed-ohko', 'timed-countdown'] or world.progressive not in ['on', 'off', 'random']):
raise NotImplementedError('Not supported yet') raise NotImplementedError('Not supported yet')
world.push_item('Ganon', ItemFactory('Triforce'), False) world.push_item('Ganon', ItemFactory('Triforce'), False)
@ -118,13 +118,16 @@ def generate_itempool(world):
# insanity shuffle doesn't have fake LW/DW logic so for now guaranteed Mirror and Moon Pearl at the start # insanity shuffle doesn't have fake LW/DW logic so for now guaranteed Mirror and Moon Pearl at the start
if world.shuffle == 'insanity': if world.shuffle == 'insanity':
world.push_item('Links House', ItemFactory('Magic Mirror'), False) world.push_item('Link\'s House', ItemFactory('Magic Mirror'), False)
world.get_location('Links House').event = True world.get_location('Link\'s House').event = True
world.push_item('Sanctuary', ItemFactory('Moon Pearl'), False) world.push_item('Sanctuary', ItemFactory('Moon Pearl'), False)
world.get_location('Sanctuary').event = True world.get_location('Sanctuary').event = True
else: else:
world.itempool.extend(ItemFactory(['Magic Mirror', 'Moon Pearl'])) world.itempool.extend(ItemFactory(['Magic Mirror', 'Moon Pearl']))
if world.timer == 'display':
world.clock_mode = 'stopwatch'
if world.difficulty == 'normal': if world.difficulty == 'normal':
world.itempool.extend(ItemFactory(normalbaseitems)) world.itempool.extend(ItemFactory(normalbaseitems))
extraitems = 70 extraitems = 70