diff --git a/RELEASENOTES.md b/RELEASENOTES.md index dcd4c502..4ed6081a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -145,6 +145,7 @@ These are now independent of retro mode and have three options: None, Random, an * Flute can't be activated in rain state (except glitched modes) (Thanks codemann!) * Enemizer * Arrghus at Lanmo 2 no longer prevents pot pickups + * Trinexx at Lanmo 2 requires the Cape go backwards to face him * Lift-able Blocks require a sprite slot (should help reduce problems) * Fixed logic issues: * Self-locking key not allowed in Sanctuary in standard (typo fixed) diff --git a/Regions.py b/Regions.py index 9f986006..688764af 100644 --- a/Regions.py +++ b/Regions.py @@ -851,7 +851,7 @@ def create_dungeon_regions(world, player): create_dungeon_region(player, 'GT Cannonball Bridge', 'Ganon\'s Tower', None, ['GT Cannonball Bridge WN', 'GT Cannonball Bridge Up Stairs', 'GT Cannonball Bridge SE']), create_dungeon_region(player, 'GT Refill', 'Ganon\'s Tower', None, ['GT Refill NE']), create_dungeon_region(player, 'GT Gauntlet 1', 'Ganon\'s Tower', None, ['GT Gauntlet 1 Down Stairs', 'GT Gauntlet 1 WN']), - create_dungeon_region(player, 'GT Gauntlet 2', 'Ganon\'s Tower', None, ['GT Gauntlet 2 EN', 'GT Gauntlet 2 SW']), + create_dungeon_region(player, 'GT Gauntlet 2', 'Ganon\'s TowerA', None, ['GT Gauntlet 2 EN', 'GT Gauntlet 2 SW']), create_dungeon_region(player, 'GT Gauntlet 3', 'Ganon\'s Tower', None, ['GT Gauntlet 3 NW', 'GT Gauntlet 3 SW']), create_dungeon_region(player, 'GT Gauntlet 4', 'Ganon\'s Tower', None, ['GT Gauntlet 4 NW', 'GT Gauntlet 4 SW']), create_dungeon_region(player, 'GT Gauntlet 5', 'Ganon\'s Tower', None, ['GT Gauntlet 5 NW', 'GT Gauntlet 5 WS']), diff --git a/Rules.py b/Rules.py index 7cd1e7f1..e6ebed97 100644 --- a/Rules.py +++ b/Rules.py @@ -542,6 +542,10 @@ def global_rules(world, player): set_rule(world.get_entrance('GT Cannonball Bridge SE', player), lambda state: state.has_Boots(player)) set_rule(world.get_entrance('GT Lanmolas 2 ES', player), lambda state: world.get_region('GT Lanmolas 2', player).dungeon.bosses['middle'].can_defeat(state)) set_rule(world.get_entrance('GT Lanmolas 2 NW', player), lambda state: world.get_region('GT Lanmolas 2', player).dungeon.bosses['middle'].can_defeat(state)) + # Need cape to safely get past trinexx backwards in this room, makes magic usage tighter + # Could not guarantee safety with byrna, not sure why + if world.get_region('GT Lanmolas 2', player).dungeon.bosses['middle'].name == 'Trinexx': + add_rule(world.get_entrance('GT Quad Pot SW', player), lambda state: state.has('Cape', player)) set_rule(world.get_entrance('GT Torch Cross ES', player), lambda state: state.has_fire_source(player)) if is_trapped('GT Torch Cross WN'): set_rule(world.get_entrance('GT Torch Cross WN', player), lambda state: state.has_fire_source(player)) diff --git a/test/customizer/test.yaml b/test/customizer/test.yaml index 49cfb516..5c1136c0 100644 --- a/test/customizer/test.yaml +++ b/test/customizer/test.yaml @@ -1,13 +1,13 @@ meta: players: 1 - seed: 94 + seed: 91 settings: 1: # mode: standard -# boss_shuffle: random - dropshuffle: underworld - enemy_shuffle: shuffled + boss_shuffle: random +# dropshuffle: underworld +# enemy_shuffle: shuffled door_shuffle: crossed intensity: 3 @@ -18,12 +18,16 @@ doors: Hyrule Castle South: GT Lobby S doors: GT Lobby Left Down Stairs: GT Quad Pot Up Stairs + GT Lobby Right Down Stairs: GT Lobby Up Stairs + GT Beam Dash ES: Swamp Big Key Ledge WN + bosses: 1: - Ganons Tower (middle): Arrghus -#placements: -# 1: -# Desert Palace - Torch: Small Key (Escape) + Ganons Tower (middle): Trinexx +placements: + 1: + Swamp Palace - Big Key Chest: Progressive Glove + Lumberjack Tree: Piece of Heart # keyshuffle: wild