From 66ede5cda2948511404ad2f95fb64f6113349dd8 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 31 Oct 2023 15:35:45 -0600 Subject: [PATCH] Fix for sprite limit on Lanmo 2 Fix for enemies at GT Falling Tile Square --- RELEASENOTES.md | 3 +++ source/enemizer/Bossmizer.py | 4 ++-- source/enemizer/enemy_deny.yaml | 2 -- test/customizer/test.yaml | 13 ++++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index c875b8ab..26ea759c 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -141,6 +141,9 @@ These are now independent of retro mode and have three options: None, Random, an # Bug Fixes and Notes +* 1.3.0.6v + * Enemizer: Arrghus at Lanmo 2 no longer prevents pot pickups + * Various enemy bans * 1.3.0.5v * Hud/Map Counter: Collecting a keys for this dungeon of a bonk torch no longer increments the counter twice and immediately updates the hud. * Enemizer: Hera basement item counting twice fixed by banning wallmasters on the tile. diff --git a/source/enemizer/Bossmizer.py b/source/enemizer/Bossmizer.py index a028c871..39d190a4 100644 --- a/source/enemizer/Bossmizer.py +++ b/source/enemizer/Bossmizer.py @@ -135,8 +135,8 @@ def boss_adjust(world, player): del sprite_list[:data] add_func, sprite_type = boss_addition_table[boss.name] add_func(sprite_list, room_id) - if len(sprite_list) > 16: - del sprite_list[16:] + if len(sprite_list) > 15: + del sprite_list[15:] data_tables.room_headers[room_id].sprite_sheet = required_boss_sheets[sprite_type] diff --git a/source/enemizer/enemy_deny.yaml b/source/enemizer/enemy_deny.yaml index b0b1854b..c0162e9f 100644 --- a/source/enemizer/enemy_deny.yaml +++ b/source/enemizer/enemy_deny.yaml @@ -506,8 +506,6 @@ UwEnemyDrop: - [0x003b, 4, ["Wizzrobe"]] - [0x003b, 6, ["Wizzrobe"]] - [0x003c, 1, ["Wizzrobe"]] - - [0x003d, 9, ["Wizzrobe"]] - - [0x003d, 10, ["Wizzrobe"]] - [0x003d, 11, ["Wizzrobe"]] - [0x003d, 12, ["Wizzrobe"]] - [0x003d, 13, ["Wizzrobe"]] diff --git a/test/customizer/test.yaml b/test/customizer/test.yaml index 64529753..49cfb516 100644 --- a/test/customizer/test.yaml +++ b/test/customizer/test.yaml @@ -6,7 +6,7 @@ settings: # mode: standard # boss_shuffle: random -# dropshuffle: underworld + dropshuffle: underworld enemy_shuffle: shuffled door_shuffle: crossed intensity: 3 @@ -15,12 +15,15 @@ settings: doors: 1: lobbies: - Hyrule Castle South: Hyrule Castle Lobby S + Hyrule Castle South: GT Lobby S doors: - Hyrule Castle Lobby W: Desert Sandworm Corner E Edge -placements: + GT Lobby Left Down Stairs: GT Quad Pot Up Stairs +bosses: 1: - Desert Palace - Torch: Small Key (Escape) + Ganons Tower (middle): Arrghus +#placements: +# 1: +# Desert Palace - Torch: Small Key (Escape) # keyshuffle: wild