From bd5c494d600d1da79a7b98ee6d38dd6a341d915c Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sun, 3 Oct 2021 11:39:03 -0700 Subject: [PATCH] Bomb-only mode fixes - starting max capacity should be 0 - replace bombs from shops with small hearts --- ItemList.py | 2 ++ Rom.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ItemList.py b/ItemList.py index 7c179a25..4dae9f08 100644 --- a/ItemList.py +++ b/ItemList.py @@ -321,6 +321,8 @@ def generate_itempool(world, player): item = slot['item'] if shop.region.name == 'Capacity Upgrade' and world.difficulty[player] != 'normal': pool.append('Rupees (20)') + elif world.swords[player] == "bombs" and item in ['Single Bomb', 'Bombs (3)', 'Bombs (10)', 'Bomb Upgrade (+5)', 'Bomb Upgrade (+10)']: + pool.append('Small Heart') else: pool.append(item) diff --git a/Rom.py b/Rom.py index 8035f0ba..4b155579 100644 --- a/Rom.py +++ b/Rom.py @@ -1349,7 +1349,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): equip[0x36C] = 0x18 equip[0x36D] = 0x18 equip[0x379] = 0x68 - if world.bombbag[player]: + if world.bombbag[player] or world.swords[player] == 'bombs': starting_max_bombs = 0 else: starting_max_bombs = 10