From 5d5aec0325bafebaa6509260f00a4bbeb3bd0100 Mon Sep 17 00:00:00 2001 From: KrisDavie Date: Mon, 12 Aug 2024 08:31:13 +0200 Subject: [PATCH] Fix SP smalls in HMG and remove bat screen wrap from logic --- ItemList.py | 13 +++++++++++-- OverworldGlitchRules.py | 1 - 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ItemList.py b/ItemList.py index 11b1b09b1..1df02b2aa 100644 --- a/ItemList.py +++ b/ItemList.py @@ -291,8 +291,6 @@ def generate_itempool(world, player): # In HMG force swamp smalls in pots to allow getting out of swamp palace placed_items['Swamp Palace - Trench 1 Pot Key'] = 'Small Key (Swamp Palace)' placed_items['Swamp Palace - Pot Row Pot Key'] = 'Small Key (Swamp Palace)' - pool.remove('Small Key (Swamp Palace)') - pool.remove('Small Key (Swamp Palace)') start_inventory = list(world.precollected_items) for item in precollected_items: @@ -369,6 +367,17 @@ def generate_itempool(world, player): or (item.bigkey and world.bigkeyshuffle[player]) or (item.map and world.mapshuffle[player]) or (item.compass and world.compassshuffle[player]))]) + + if world.logic[player] == 'hybridglitches' and world.pottery[player] not in ['none', 'cave']: + keys_to_remove = 2 + to_remove = [] + for wix, wi in enumerate(world.itempool): + if wi.name == 'Small Key (Swamp Palace)' and wi.player == player: + to_remove.append(wix) + if keys_to_remove == len(to_remove): + break + for wix in reversed(to_remove): + del world.itempool[wix] # logic has some branches where having 4 hearts is one possible requirement (of several alternatives) # rather than making all hearts/heart pieces progression items (which slows down generation considerably) diff --git a/OverworldGlitchRules.py b/OverworldGlitchRules.py index aab2ddda2..97883dc6b 100644 --- a/OverworldGlitchRules.py +++ b/OverworldGlitchRules.py @@ -128,7 +128,6 @@ ('TR Pegs Ledge Clip', 'Death Mountain TR Pegs Area', 'Death Mountain TR Pegs Ledge'), ('Mountain Pass Ledge Clip', 'Mountain Pass Area', 'Mountain Pass Ledge'), ('Mountain Pass Entry Clip', 'Kakariko Pond Area', 'Mountain Pass Entry'), - ('Bat Cave River Clip', 'Blacksmith Area', 'Blacksmith Ledge'), ('Desert Keep Clip', 'Maze Race Area', 'Desert Ledge Keep'), ('Desert Ledge Clip', 'Maze Race Area', 'Desert Ledge'), ('Maze Race Prize Clip', 'Maze Race Area', 'Maze Race Prize'),