From f83b6d03daecfc4b46bc40e3c67334eed6e64fae Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 8 Jan 2025 11:54:29 -0700 Subject: [PATCH] fix: remove some restrictions from gui's custom item pool --- ItemList.py | 30 ------------------------------ RELEASENOTES.md | 1 + 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/ItemList.py b/ItemList.py index 3a74d106..56b394b1 100644 --- a/ItemList.py +++ b/ItemList.py @@ -1121,32 +1121,11 @@ def make_custom_item_pool(world, player, progressive, shuffle, difficulty, timer assert loc not in placed_items placed_items[loc] = item - # Correct for insanely oversized item counts and take initial steps to handle undersized pools. - # Bow to Silver Arrows Upgrade, including Generic Keys & Rupoors - for x in [*range(0, 66 + 1), 68, 69]: - key = CONST.CUSTOMITEMS[x] - if customitemarray[key] > total_items_to_place: - customitemarray[key] = total_items_to_place - - # Triforce - if customitemarray["triforce"] > total_items_to_place: - customitemarray["triforce"] = total_items_to_place - # Triforce Pieces if goal in ['triforcehunt', 'trinity', 'ganonhunt']: g, t = set_default_triforce(goal, customitemarray["triforcepiecesgoal"], customitemarray["triforcepieces"]) customitemarray["triforcepiecesgoal"], customitemarray["triforcepieces"] = g, t - itemtotal = 0 - # Bow to Silver Arrows Upgrade, including Generic Keys & Rupoors - for x in [*range(0, 66 + 1), 68, 69]: - key = CONST.CUSTOMITEMS[x] - itemtotal = itemtotal + customitemarray[key] - # Triforce - itemtotal = itemtotal + customitemarray["triforce"] - # Generic Keys - itemtotal = itemtotal + customitemarray["generickeys"] - customitems = [ "Bow", "Silver Arrows", "Blue Boomerang", "Red Boomerang", "Hookshot", "Mushroom", "Magic Powder", "Fire Rod", "Ice Rod", "Bombos", "Ether", "Quake", "Lamp", "Hammer", "Shovel", "Ocarina", "Bug Catching Net", "Book of Mudora", "Cane of Somaria", "Cane of Byrna", "Cape", "Pegasus Boots", "Power Glove", "Titans Mitts", "Progressive Glove", "Flippers", "Piece of Heart", "Boss Heart Container", "Sanctuary Heart Container", "Master Sword", "Tempered Sword", "Golden Sword", "Blue Shield", "Red Shield", "Mirror Shield", "Progressive Shield", "Blue Mail", "Red Mail", "Progressive Armor", "Magic Upgrade (1/2)", "Magic Upgrade (1/4)", "Bomb Upgrade (+5)", "Bomb Upgrade (+10)", "Arrow Upgrade (+5)", "Arrow Upgrade (+10)", "Single Arrow", "Arrows (10)", "Single Bomb", "Bombs (3)", "Rupee (1)", "Rupees (5)", "Rupees (20)", "Rupees (50)", "Rupees (100)", "Rupees (300)", "Rupoor", "Blue Clock", "Green Clock", "Red Clock", "Progressive Bow", "Bombs (10)", "Triforce Piece", "Triforce" ] @@ -1175,7 +1154,6 @@ def make_custom_item_pool(world, player, progressive, shuffle, difficulty, timer and (goal in ['triforcehunt', 'trinity', 'ganonhunt']) and (customitemarray["triforce"] == 0)): extrapieces = treasure_hunt_count - customitemarray["triforcepieces"] pool.extend(['Triforce Piece'] * extrapieces) - itemtotal = itemtotal + extrapieces if timer in ['display', 'timed', 'timed-countdown']: clock_mode = 'countdown' if timer == 'timed-countdown' else 'stopwatch' @@ -1186,7 +1164,6 @@ def make_custom_item_pool(world, player, progressive, shuffle, difficulty, timer if goal in ['pedestal', 'trinity']: place_item('Master Sword Pedestal', 'Triforce') - itemtotal = itemtotal + 1 if mode == 'standard': if world.keyshuffle[player] == 'universal': @@ -1203,13 +1180,6 @@ def make_custom_item_pool(world, player, progressive, shuffle, difficulty, timer pool.extend(['Magic Mirror'] * customitemarray["mirror"]) pool.extend(['Moon Pearl'] * customitemarray["pearl"]) - if world.keyshuffle[player] == 'universal': - itemtotal = itemtotal - 28 # Corrects for small keys not being in item pool in Retro Mode - if itemtotal < total_items_to_place: - nothings = total_items_to_place - itemtotal -# print("Placing " + str(nothings) + " Nothings") - pool.extend(['Nothing'] * nothings) - start_inventory = [x for x in world.precollected_items if x.player == player] if world.logic[player] in ['owglitches', 'hybridglitches', 'nologic'] and all(x.name != 'Pegasus Boots' for x in start_inventory): precollected_items.append('Pegasus Boots') diff --git a/RELEASENOTES.md b/RELEASENOTES.md index dfef7c0b..1d41d539 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -6,4 +6,5 @@ - Fixed an ER bug where Bonk Fairy could be used for a mandatory connector in standard mode (boots could allow escape to be skipped) - Fixed an issue with flute activation in rain mode. (thanks Codemann!) - Fixed an issue with multi-player HMG + - Fixed an issue limiting number of items specified in the item pool on the GUI - Minor documentation fixes (thanks Codemann!)