From 252f9ba1a701dacc4a1e79a84d2b458b7635d2c5 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 8 Mar 2023 20:41:16 -0600 Subject: [PATCH] Remove 5 Arrow items from bonk drop locations --- Fill.py | 2 +- ItemList.py | 2 ++ Items.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Fill.py b/Fill.py index 4507ddeb..d549e969 100644 --- a/Fill.py +++ b/Fill.py @@ -538,7 +538,7 @@ def ensure_good_pots(world, write_skips=False): and (loc.type != LocationType.Pot or loc.item.player != loc.player)): loc.item = ItemFactory(invalid_location_replacement[loc.item.name], loc.item.player) if (loc.item.name in {'Arrows (5)'} - and (loc.type not in [LocationType.Pot, LocationType.Bonk] or loc.item.player != loc.player)): + and (loc.type != LocationType.Pot or loc.item.player != loc.player)): loc.item = ItemFactory(invalid_location_replacement[loc.item.name], loc.item.player) # # can be placed here by multiworld balancing or shop balancing # # change it to something normal for the player it got swapped to diff --git a/ItemList.py b/ItemList.py index aebb6489..956b8153 100644 --- a/ItemList.py +++ b/ItemList.py @@ -1104,6 +1104,8 @@ def get_pool_core(world, player, progressive, shuffle, difficulty, treasure_hunt pool.remove('Fighter Sword') pool.extend(['Rupees (50)']) + #TODO: Remove test placements + #place_item('Purple Chest', 'Magic Mirror') if timer in ['timed', 'timed-countdown']: pool.extend(diff.timedother) clock_mode = 'stopwatch' if timer == 'timed' else 'countdown' diff --git a/Items.py b/Items.py index 6bde89ef..d0f6ba84 100644 --- a/Items.py +++ b/Items.py @@ -80,7 +80,7 @@ item_table = {'Bow': (True, False, None, 0x0B, 200, 'You have\nchosen the\narche 'Arrow Upgrade (+10)': (False, False, None, 0x54, 100, 'Increase arrow\nstorage, low\nlow price', 'and the quiver', 'quiver-enlarging kid', 'arrow boost for sale', 'witch and more skewers', 'upgrade boy sews more again', 'arrow capacity'), 'Arrow Upgrade (+5)': (False, False, None, 0x53, 100, 'Increase arrow\nstorage, low\nlow price', 'and the quiver', 'quiver-enlarging kid', 'arrow boost for sale', 'witch and more skewers', 'upgrade boy sews more again', 'arrow capacity'), 'Single Bomb': (False, False, None, 0x27, 5, 'I make things\ngo BOOM! But\njust once.', 'and the explosion', 'the bomb-holding kid', 'firecracker for sale', 'blend fungus into bomb', '\'splosion boy explodes again', 'a bomb'), - 'Arrows (5)': (False, False, None, 0xB5, 15, 'This will give\nyou five shots\nwith your bow!', 'and the arrow pack', 'stick-collecting kid', 'sewing kit for sale', 'fungus for arrows', 'archer boy sews again', 'five arrows'), + 'Arrows (5)': (False, False, None, 0x5A, 15, 'This will give\nyou five shots\nwith your bow!', 'and the arrow pack', 'stick-collecting kid', 'sewing kit for sale', 'fungus for arrows', 'archer boy sews again', 'five arrows'), 'Small Magic': (False, False, None, 0x45, 5, 'A bit of magic', 'and the bit of magic', 'bit-o-magic kid', 'magic bit for sale', 'fungus for magic', 'magic boy conjures again', 'a bit of magic'), 'Big Magic': (False, False, None, 0xB4, 40, 'A lot of magic', 'and lots of magic', 'lot-o-magic kid', 'magic refill for sale', 'fungus for magic', 'magic boy conjures again', 'a magic refill'), 'Chicken': (False, False, None, 0xB3, 5, 'Cucco of Legend', 'and the legendary cucco', 'chicken kid', 'fried chicken for sale', 'fungus for chicken', 'cucco boy clucks again', 'a cucco'),