From d8c28b733aa059ee4198e163a7c3583ba487a673 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Sun, 18 Aug 2019 15:22:13 -0400 Subject: [PATCH] Change to Bosses.py for inverted enemizer compatibility --- Bosses.py | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/Bosses.py b/Bosses.py index 8cdaee5a..30cd56da 100644 --- a/Bosses.py +++ b/Bosses.py @@ -141,21 +141,39 @@ def place_bosses(world, player): if world.boss_shuffle == 'none': return # Most to least restrictive order - boss_locations = [ - ['Ganons Tower', 'top'], - ['Tower of Hera', None], - ['Skull Woods', None], - ['Ganons Tower', 'middle'], - ['Eastern Palace', None], - ['Desert Palace', None], - ['Palace of Darkness', None], - ['Swamp Palace', None], - ['Thieves Town', None], - ['Ice Palace', None], - ['Misery Mire', None], - ['Turtle Rock', None], - ['Ganons Tower', 'bottom'], - ] + if world.mode != 'inverted': + boss_locations = [ + ['Ganons Tower', 'top'], + ['Tower of Hera', None], + ['Skull Woods', None], + ['Ganons Tower', 'middle'], + ['Eastern Palace', None], + ['Desert Palace', None], + ['Palace of Darkness', None], + ['Swamp Palace', None], + ['Thieves Town', None], + ['Ice Palace', None], + ['Misery Mire', None], + ['Turtle Rock', None], + ['Ganons Tower', 'bottom'], + ] + else: + boss_locations = [ + ['Inverted Ganons Tower', 'top'], + ['Tower of Hera', None], + ['Skull Woods', None], + ['Inverted Ganons Tower', 'middle'], + ['Eastern Palace', None], + ['Desert Palace', None], + ['Palace of Darkness', None], + ['Swamp Palace', None], + ['Thieves Town', None], + ['Ice Palace', None], + ['Misery Mire', None], + ['Turtle Rock', None], + ['Inverted Ganons Tower', 'bottom'], + ] + all_bosses = sorted(boss_table.keys()) #s orted to be deterministic on older pythons placeable_bosses = [boss for boss in all_bosses if boss not in ['Agahnim', 'Agahnim2', 'Ganon']]