From e834fd85a1132b6db62471399c3ebf67beaefabf Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 3 Dec 2020 16:25:51 -0700 Subject: [PATCH 1/4] Initial Shopsanity Retro work --- BaseClasses.py | 39 ++- CLI.py | 3 +- Fill.py | 17 + InvertedRegions.py | 2 +- ItemList.py | 180 ++++++++-- Items.py | 330 +++++++++--------- Main.py | 27 +- RELEASENOTES.md | 8 +- Regions.py | 86 ++++- Rom.py | 4 +- data/base2current.bps | Bin 131148 -> 131157 bytes resources/app/cli/args.json | 4 + resources/app/cli/lang/en.json | 1 + resources/app/gui/lang/en.json | 2 + resources/app/gui/randomize/item/widgets.json | 3 +- source/classes/constants.py | 1 + 16 files changed, 471 insertions(+), 236 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index c0248d11..cda3ff61 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -36,7 +36,7 @@ class World(object): self.algorithm = algorithm self.dungeons = [] self.regions = [] - self.shops = [] + self.shops = {} self.itempool = [] self.seed = None self.precollected_items = [] @@ -130,6 +130,7 @@ class World(object): set_player_attr('potshuffle', False) set_player_attr('pot_contents', None) + set_player_attr('shopsanity', False) set_player_attr('keydropshuffle', False) set_player_attr('mixed_travel', 'prevent') set_player_attr('standardize_palettes', 'standardize') @@ -610,7 +611,7 @@ class CollectionState(object): return self.prog_items[item, player] >= count def can_buy_unlimited(self, item, player): - for shop in self.world.shops: + for shop in self.world.shops[player]: if shop.region.player == player and shop.has_unlimited(item) and shop.region.can_reach(self): return True return False @@ -674,7 +675,7 @@ class CollectionState(object): def can_shoot_arrows(self, player): if self.world.retro[player]: #todo: Non-progressive silvers grant wooden arrows, but progressive bows do not. Always require shop arrows to be safe - return self.has('Bow', player) and self.can_buy_unlimited('Single Arrow', player) + return self.has('Bow', player) and (self.can_buy_unlimited('Single Arrow', player) or self.has('Single Arrow', player)) return self.has('Bow', player) def can_get_good_bee(self, player): @@ -1640,6 +1641,7 @@ class Location(object): self.access_rule = lambda state: True self.item_rule = lambda item: True self.player = player + self.skip = False def can_fill(self, state, item, check_access=True): return self.always_allow(state, item) or (self.parent_region.can_fill(item) and self.item_rule(item) and (not check_access or self.can_reach(state))) @@ -1677,7 +1679,9 @@ class Location(object): class Item(object): - def __init__(self, name='', advancement=False, priority=False, type=None, code=None, pedestal_hint=None, pedestal_credit=None, sickkid_credit=None, zora_credit=None, witch_credit=None, fluteboy_credit=None, hint_text=None, player=None): + def __init__(self, name='', advancement=False, priority=False, type=None, code=None, price=999, pedestal_hint=None, + pedestal_credit=None, sickkid_credit=None, zora_credit=None, witch_credit=None, fluteboy_credit=None, + hint_text=None, player=None): self.name = name self.advancement = advancement self.priority = priority @@ -1690,6 +1694,7 @@ class Item(object): self.fluteboy_credit_text = fluteboy_credit self.hint_text = hint_text self.code = code + self.price = price self.location = None self.world = None self.player = player @@ -1853,12 +1858,12 @@ class Spoiler(object): self.locations['Dark World'] = OrderedDict([(location.gen_name(), str(location.item) if location.item is not None else 'Nothing') for location in dw_locations]) listed_locations.update(dw_locations) - cave_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.Cave] + cave_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.type == RegionType.Cave and not loc.skip] self.locations['Caves'] = OrderedDict([(location.gen_name(), str(location.item) if location.item is not None else 'Nothing') for location in cave_locations]) listed_locations.update(cave_locations) for dungeon in self.world.dungeons: - dungeon_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.dungeon == dungeon] + dungeon_locations = [loc for loc in self.world.get_locations() if loc not in listed_locations and loc.parent_region and loc.parent_region.dungeon == dungeon and not loc.forced_item] self.locations[str(dungeon)] = OrderedDict([(location.gen_name(), str(location.item) if location.item is not None else 'Nothing') for location in dungeon_locations]) listed_locations.update(dungeon_locations) @@ -1868,17 +1873,19 @@ class Spoiler(object): listed_locations.update(other_locations) self.shops = [] - for shop in self.world.shops: - if not shop.custom: - continue - shopdata = {'location': str(shop.region), - 'type': 'Take Any' if shop.type == ShopType.TakeAny else 'Shop' - } - for index, item in enumerate(shop.inventory): - if item is None: + for player in range(1, self.world.players + 1): + for shop in self.world.shops[player]: + if not shop.custom: continue - shopdata['item_{}'.format(index)] = "{} - {}".format(item['item'], item['price']) if item['price'] else item['item'] - self.shops.append(shopdata) + shopdata = {'location': str(shop.region), + 'type': 'Take Any' if shop.type == ShopType.TakeAny else 'Shop' + } + for index, item in enumerate(shop.inventory): + if item is None: + continue + # todo: indicate player? might be fine + shopdata[f'item_{index}'] = f"{item['item']} — {item['price']}" if item['price'] else item['item'] + self.shops.append(shopdata) for player in range(1, self.world.players + 1): self.bosses[str(player)] = OrderedDict() diff --git a/CLI.py b/CLI.py index 35204b65..bcfc2181 100644 --- a/CLI.py +++ b/CLI.py @@ -93,7 +93,7 @@ def parse_cli(argv, no_defaults=False): 'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters', 'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage', 'shufflepots', 'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor', 'heartbeep', - 'remote_items', 'keydropshuffle', 'mixed_travel', 'standardize_palettes']: + 'remote_items', 'shopsanity', 'keydropshuffle', 'mixed_travel', 'standardize_palettes']: value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name) if player == 1: setattr(ret, name, {1: value}) @@ -133,6 +133,7 @@ def parse_settings(): "enemy_health": "default", "enemizercli": os.path.join(".", "EnemizerCLI", "EnemizerCLI.Core"), + "shopsanity": False, "keydropshuffle": False, "mapshuffle": False, "compassshuffle": False, diff --git a/Fill.py b/Fill.py index bc841a5b..a4fe672f 100644 --- a/Fill.py +++ b/Fill.py @@ -2,6 +2,7 @@ import random import logging from BaseClasses import CollectionState +from Regions import shop_to_location_table class FillError(RuntimeError): @@ -374,6 +375,22 @@ def flood_items(world): itempool.remove(item_to_place) break + +def sell_keys(world, player): + choices = [] + shop_map = {} + for shop in world.shops[player]: + if shop.region.name in shop_to_location_table: + choices.append(shop.region.name) + shop_map[shop.region.name] = shop + key_seller = random.choice(choices) + location = random.choice(shop_to_location_table[key_seller]) + universal_key = next(item for item in world.itempool if item.name == 'Small Key (Universal)' and item.player == player) + world.push_item(world.get_location(location, player), universal_key, collect=False) + shop_map[key_seller].add_inventory(0, 'Small Key (Universal)', 100) # will be fixed later in customize shops + world.itempool.remove(universal_key) + + def balance_multiworld_progression(world): state = CollectionState(world) checked_locations = [] diff --git a/InvertedRegions.py b/InvertedRegions.py index 71c26fc9..9e439093 100644 --- a/InvertedRegions.py +++ b/InvertedRegions.py @@ -2,7 +2,7 @@ import collections from BaseClasses import RegionType from Regions import create_lw_region, create_dw_region, create_cave_region, create_dungeon_region, create_menu_region - +# todo: shopsanity locations def create_inverted_regions(world, player): world.regions += [ diff --git a/ItemList.py b/ItemList.py index ae05e9ee..aa93602b 100644 --- a/ItemList.py +++ b/ItemList.py @@ -6,7 +6,8 @@ from BaseClasses import Region, RegionType, Shop, ShopType, Location from Bosses import place_bosses from Dungeons import get_dungeon_item_pool from EntranceShuffle import connect_entrance -from Fill import FillError, fill_restrictive, fast_fill +from Regions import shop_to_location_table, retro_shops +from Fill import FillError, fill_restrictive from Items import ItemFactory import source.classes.constants as CONST @@ -304,6 +305,13 @@ def generate_itempool(world, player): world.get_location(location, player).event = True world.get_location(location, player).locked = True + if world.shopsanity[player]: + for shop in world.shops[player]: + if shop.region.name in shop_to_location_table: + for index, slot in enumerate(shop.inventory): + if slot: + pool.append(slot['item']) + items = ItemFactory(pool, player) world.lamps_needed_for_dark_rooms = lamps_needed_for_dark_rooms @@ -371,6 +379,7 @@ take_any_locations = [ 'Palace of Darkness Hint', 'East Dark World Hint', 'Archery Game', 'Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Spike Cave', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint', 'Dark Desert Hint'] + def set_up_take_anys(world, player): if world.mode[player] == 'inverted' and 'Dark Sanctuary Hint' in take_any_locations: take_any_locations.remove('Dark Sanctuary Hint') @@ -385,38 +394,43 @@ def set_up_take_anys(world, player): entrance = world.get_region(reg, player).entrances[0] connect_entrance(world, entrance, old_man_take_any, player) entrance.target = 0x58 - old_man_take_any.shop = Shop(old_man_take_any, 0x0112, ShopType.TakeAny, 0xE2, True, True) - world.shops.append(old_man_take_any.shop) + old_man_take_any.shop = Shop(old_man_take_any, 0x0112, ShopType.TakeAny, 0xE2, True, not world.shopsanity[player]) + world.shops[player].append(old_man_take_any.shop) - swords = [item for item in world.itempool if item.type == 'Sword' and item.player == player] - if swords: - sword = random.choice(swords) - world.itempool.remove(sword) + sword = next((item for item in world.itempool if item.type == 'Sword' and item.player == player), None) + if sword: world.itempool.append(ItemFactory('Rupees (20)', player)) + if not world.shopsanity[player]: + world.itempool.remove(sword) old_man_take_any.shop.add_inventory(0, sword.name, 0, 0, create_location=True) else: - old_man_take_any.shop.add_inventory(0, 'Rupees (300)', 0, 0) + if world.shopsanity[player]: + world.itempool.append(ItemFactory('Rupees (300)', player)) + old_man_take_any.shop.add_inventory(0, 'Rupees (300)', 0, 0, create_location=world.shopsanity[player]) + take_any_type = ShopType.Shop if world.shopsanity[player] else ShopType.TakeAny for num in range(4): take_any = Region("Take-Any #{}".format(num+1), RegionType.Cave, 'a cave of choice', player) world.regions.append(take_any) world.dynamic_regions.append(take_any) - target, room_id = random.choice([(0x58, 0x0112), (0x60, 0x010F), (0x46, 0x011F)]) reg = regions.pop() entrance = world.get_region(reg, player).entrances[0] connect_entrance(world, entrance, take_any, player) entrance.target = target - take_any.shop = Shop(take_any, room_id, ShopType.TakeAny, 0xE3, True, True) - world.shops.append(take_any.shop) - take_any.shop.add_inventory(0, 'Blue Potion', 0, 0) - take_any.shop.add_inventory(1, 'Boss Heart Container', 0, 0) + take_any.shop = Shop(take_any, room_id, take_any_type, 0xE3, True, not world.shopsanity[player]) + world.shops[player].append(take_any.shop) + take_any.shop.add_inventory(0, 'Blue Potion', 0, 0, create_location=world.shopsanity[player]) + take_any.shop.add_inventory(1, 'Boss Heart Container', 0, 0, create_location=world.shopsanity[player]) + if world.shopsanity[player]: + world.itempool.append(ItemFactory('Blue Potion', player)) + world.itempool.append(ItemFactory('Boss Heart Container', player)) world.initialize_regions() def create_dynamic_shop_locations(world, player): - for shop in world.shops: + for shop in world.shops[player]: if shop.region.player == player: for i, item in enumerate(shop.inventory): if item is None: @@ -428,9 +442,10 @@ def create_dynamic_shop_locations(world, player): world.clear_location_cache() - world.push_item(loc, ItemFactory(item['item'], player), False) - loc.event = True - loc.locked = True + if not world.shopsanity[player]: + world.push_item(loc, ItemFactory(item['item'], player), False) + loc.event = True + loc.locked = True def fill_prizes(world, attempts=15): @@ -462,20 +477,125 @@ def fill_prizes(world, attempts=15): def set_up_shops(world, player): - # TODO: move hard+ mode changes for sheilds here, utilizing the new shops - if world.retro[player]: - rss = world.get_region('Red Shield Shop', player).shop - if not rss.locked: - rss.custom = True - rss.add_inventory(2, 'Single Arrow', 80) - for shop in random.sample([s for s in world.shops if not s.locked and s.region.player == player], 5): - shop.custom = True - shop.locked = True - shop.add_inventory(0, 'Single Arrow', 80) - shop.add_inventory(1, 'Small Key (Universal)', 100) - shop.add_inventory(2, 'Bombs (10)', 50) - rss.locked = True + if world.shopsanity[player]: + removals = [next(item for item in world.itempool if item.name == 'Arrows (10)' and item.player == player)] + red_pots = [item for item in world.itempool if item.name == 'Red Potion' and item.player == player][:5] + shields_n_hearts = [item for item in world.itempool if item.name in ['Blue Shield', 'Small Heart'] and item.player == player] + removals.extend(red_pots) + removals.extend(random.sample(shields_n_hearts, 5)) + for remove in removals: + world.itempool.remove(remove) + for i in range(6): + arrow_item = ItemFactory('Single Arrow', player) + arrow_item.advancement = True + world.itempool.append(arrow_item) + for i in range(5): + world.itempool.append(ItemFactory('Small Key (Universal)', player)) + # TODO: move hard+ mode changes for shields here, utilizing the new shops + else: + rss = world.get_region('Red Shield Shop', player).shop + if not rss.locked: + rss.custom = True + rss.add_inventory(2, 'Single Arrow', 80) + for shop in random.sample([s for s in world.shops if not s.locked and s.region.player == player], 5): + shop.custom = True + shop.locked = True + shop.add_inventory(0, 'Single Arrow', 80) + shop.add_inventory(1, 'Small Key (Universal)', 100) + shop.add_inventory(2, 'Bombs (10)', 50) + rss.locked = True + + +def customize_shops(world, player): + found_bomb_upgrade, found_arrow_upgrade = False, False + possible_replacements = [] + shops_to_customize = shop_to_location_table.copy() + if world.retro[player]: + shops_to_customize.update(retro_shops) + for shop_name, loc_list in shops_to_customize.items(): + shop = world.get_region(shop_name, player).shop + shop.custom = True + shop.clear_inventory() + for idx, loc in enumerate(loc_list): + location = world.get_location(loc, player) + item = location.item + max_repeat = 1 + if shop_name not in retro_shops: + if item.name in repeatable_shop_items: + max_repeat = 0 + if item.name in ['Bomb Upgrade (+5)', 'Arrow Upgrade (+5)']: + if item.name == 'Bomb Upgrade (+5)': + found_bomb_upgrade = True + if item.name == 'Arrow Upgrade (+5)': + found_arrow_upgrade = True + max_repeat = 7 + if shop_name in retro_shops: + price = 0 + else: + price = 120 if shop_name == 'Potion Shop' and item.name == 'Red Potion' else item.price + if world.retro[player] and item.name == 'Single Arrow': + price = 80 + # randomize price + shop.add_inventory(idx, item.name, randomize_price(price), max_repeat) + if item.name in cap_replacements and shop_name not in retro_shops: + possible_replacements.append((shop, idx, location, item)) + # todo: randomize shopkeeper + # handle capacity upgrades - randomly choose a bomb bunch or arrow bunch to become capacity upgrades + if not found_bomb_upgrade and len(possible_replacements) > 0: + choices = [] + for shop, idx, loc, item in possible_replacements: + if item.name in ['Bombs (3)', 'Bombs (10)']: + choices.append((shop, idx, loc, item)) + if len(choices) > 0: + shop, idx, loc, item = random.choice(choices) + upgrade = ItemFactory('Bomb Upgrade (+5)', player) + shop.add_inventory(idx, upgrade.name, randomize_price(upgrade.price), 6, + item.name, randomize_price(item.price)) + loc.item = upgrade + upgrade.location = loc + if not found_arrow_upgrade and len(possible_replacements) > 0: + choices = [] + for shop, idx, loc, item in possible_replacements: + if item.name == 'Arrows (10)' or (item.name == 'Single Arrow' and not world.retro[player]): + choices.append((shop, idx, loc, item)) + if len(choices) > 0: + shop, idx, loc, item = random.choice(choices) + upgrade = ItemFactory('Arrow Upgrade (+5)', player) + shop.add_inventory(idx, upgrade.name, randomize_price(upgrade.price), 6, + item.name, randomize_price(item.price)) + loc.item = upgrade + upgrade.location = loc + change_shop_items_to_rupees(world, player, shops_to_customize) + + +def randomize_price(price): + half_price = price // 2 + max_price = price - half_price + if max_price % 5 == 0: + max_price //= 5 + return random.randint(0, max_price) * 5 + half_price + else: + return price + + +def change_shop_items_to_rupees(world, player, shops): + locations = world.get_filled_locations(player) + for location in locations: + if location.item.name in shop_transfer.keys() and location.parent_region not in shops: + new_item = ItemFactory(shop_transfer[location.item.name], location.item.player) + location.item = new_item + + +repeatable_shop_items = ['Single Arrow', 'Arrows (10)', 'Bombs (3)', 'Bombs (10)', 'Red Potion', 'Small Heart', + 'Blue Shield', 'Red Shield', 'Bee', 'Small Key (Universal)'] + + +cap_replacements = ['Single Arrow', 'Arrows (10)', 'Bombs (3)', 'Bombs (10)'] + + +shop_transfer = {'Red Potion': 'Rupees (100)', 'Bee': 'Rupees (5)', 'Blue Potion': 'Rupees (100)', + 'Blue Shield': 'Rupees (50)', 'Red Shield': 'Rupees (300)'} def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, swords, retro, door_shuffle): diff --git a/Items.py b/Items.py index b20ebe35..e5d91d4a 100644 --- a/Items.py +++ b/Items.py @@ -11,8 +11,8 @@ def ItemFactory(items, player): singleton = True for item in items: if item in item_table: - advancement, priority, type, code, pedestal_hint, pedestal_credit, sickkid_credit, zora_credit, witch_credit, fluteboy_credit, hint_text = item_table[item] - ret.append(Item(item, advancement, priority, type, code, pedestal_hint, pedestal_credit, sickkid_credit, zora_credit, witch_credit, fluteboy_credit, hint_text, player)) + advancement, priority, type, code, price, pedestal_hint, pedestal_credit, sickkid_credit, zora_credit, witch_credit, fluteboy_credit, hint_text = item_table[item] + ret.append(Item(item, advancement, priority, type, code, price, pedestal_hint, pedestal_credit, sickkid_credit, zora_credit, witch_credit, fluteboy_credit, hint_text, player)) else: logging.getLogger('').warning('Unknown Item: %s', item) return None @@ -23,167 +23,167 @@ def ItemFactory(items, player): # Format: Name: (Advancement, Priority, Type, ItemCode, Pedestal Hint Text, Pedestal Credit Text, Sick Kid Credit Text, Zora Credit Text, Witch Credit Text, Flute Boy Credit Text, Hint Text) -item_table = {'Bow': (True, False, None, 0x0B, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'the Bow'), - 'Progressive Bow': (True, False, None, 0x64, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), - 'Progressive Bow (Alt)': (True, False, None, 0x65, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), - 'Book of Mudora': (True, False, None, 0x1D, 'This is a\nparadox?!', 'and the story book', 'the scholarly kid', 'moon runes for sale', 'drugs for literacy', 'book-worm boy can read again', 'the Book'), - 'Hammer': (True, False, None, 0x09, 'stop\nhammer time!', 'and m c hammer', 'hammer-smashing kid', 'm c hammer for sale', 'stop... hammer time', 'stop, hammer time', 'the hammer'), - 'Hookshot': (True, False, None, 0x0A, 'BOING!!!\nBOING!!!\nBOING!!!', 'and the tickle beam', 'tickle-monster kid', 'tickle beam for sale', 'witch and tickle boy', 'beam boy tickles again', 'the Hookshot'), - 'Magic Mirror': (True, False, None, 0x1A, 'Isn\'t your\nreflection so\npretty?', 'the face reflector', 'the narcissistic kid', 'your face for sale', 'trades looking-glass', 'narcissistic boy is happy again', 'the Mirror'), - 'Ocarina': (True, False, None, 0x14, 'Save the duck\nand fly to\nfreedom!', 'and the duck call', 'the duck-call kid', 'duck call for sale', 'duck-calls for trade', 'ocarina boy plays again', 'the Flute'), - 'Pegasus Boots': (True, False, None, 0x4B, 'Gotta go fast!', 'and the sprint shoes', 'the running-man kid', 'sprint shoe for sale', 'shrooms for speed', 'gotta-go-fast boy runs again', 'the Boots'), - 'Power Glove': (True, False, None, 0x1B, 'Now you can\nlift weak\nstuff!', 'and the grey mittens', 'body-building kid', 'lift glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'the glove'), - 'Cape': (True, False, None, 0x19, 'Wear this to\nbecome\ninvisible!', 'the camouflage cape', 'red riding-hood kid', 'red hood for sale', 'hood from a hood', 'dapper boy hides again', 'the cape'), - 'Mushroom': (True, False, None, 0x29, 'I\'m a fun guy!\n\nI\'m a funghi!', 'and the legal drugs', 'the drug-dealing kid', 'legal drugs for sale', 'shroom swap', 'shroom boy sells drugs again', 'the mushroom'), - 'Shovel': (True, False, None, 0x13, 'Can\n You\n Dig it?', 'and the spade', 'archaeologist kid', 'dirt spade for sale', 'can you dig it', 'shovel boy digs again', 'the shovel'), - 'Lamp': (True, False, None, 0x12, 'Baby, baby,\nbaby.\nLight my way!', 'and the flashlight', 'light-shining kid', 'flashlight for sale', 'fungus for illumination', 'illuminated boy can see again', 'the lamp'), - 'Magic Powder': (True, False, None, 0x0D, 'you can turn\nanti-faeries\ninto faeries', 'and the magic sack', 'the sack-holding kid', 'magic sack for sale', 'the witch and assistant', 'magic boy plays marbles again', 'the powder'), - 'Moon Pearl': (True, False, None, 0x1F, ' Bunny Link\n be\n gone!', 'and the jaw breaker', 'fortune-telling kid', 'lunar orb for sale', 'shrooms for moon rock', 'moon boy plays ball again', 'the moon pearl'), - 'Cane of Somaria': (True, False, None, 0x15, 'I make blocks\nto hold down\nswitches!', 'and the red blocks', 'the block-making kid', 'block stick for sale', 'block stick for trade', 'cane boy makes blocks again', 'the red cane'), - 'Fire Rod': (True, False, None, 0x07, 'I\'m the hot\nrod. I make\nthings burn!', 'and the flamethrower', 'fire-starting kid', 'rage rod for sale', 'fungus for rage-rod', 'firestarter boy burns again', 'the fire rod'), - 'Flippers': (True, False, None, 0x1E, 'fancy a swim?', 'and the toewebs', 'the swimming kid', 'finger webs for sale', 'shrooms let you swim', 'swimming boy swims again', 'the flippers'), - 'Ice Rod': (True, False, None, 0x08, 'I\'m the cold\nrod. I make\nthings freeze!', 'and the freeze ray', 'the ice-bending kid', 'freeze ray for sale', 'fungus for ice-rod', 'ice-cube boy freezes again', 'the ice rod'), - 'Titans Mitts': (True, False, None, 0x1C, 'Now you can\nlift heavy\nstuff!', 'and the golden glove', 'body-building kid', 'carry glove for sale', 'fungus for bling-gloves', 'body-building boy has gold again', 'the mitts'), - 'Bombos': (True, False, None, 0x0F, 'Burn, baby,\nburn! Fear my\nring of fire!', 'and the swirly coin', 'coin-collecting kid', 'swirly coin for sale', 'shrooms for swirly-coin', 'medallion boy melts room again', 'Bombos'), - 'Ether': (True, False, None, 0x10, 'This magic\ncoin freezes\neverything!', 'and the bolt coin', 'coin-collecting kid', 'bolt coin for sale', 'shrooms for bolt-coin', 'medallion boy sees floor again', 'Ether'), - 'Quake': (True, False, None, 0x11, 'Maxing out the\nRichter scale\nis what I do!', 'and the wavy coin', 'coin-collecting kid', 'wavy coin for sale', 'shrooms for wavy-coin', 'medallion boy shakes dirt again', 'Quake'), - 'Bottle': (True, False, None, 0x16, 'Now you can\nstore potions\nand stuff!', 'and the terrarium', 'the terrarium kid', 'terrarium for sale', 'special promotion', 'bottle boy has terrarium again', 'a Bottle'), - 'Bottle (Red Potion)': (True, False, None, 0x2B, 'Hearty red goop!', 'and the red goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has red goo again', 'a Bottle'), - 'Bottle (Green Potion)': (True, False, None, 0x2C, 'Refreshing green goop!', 'and the green goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has green goo again', 'a Bottle'), - 'Bottle (Blue Potion)': (True, False, None, 0x2D, 'Delicious blue goop!', 'and the blue goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has blue goo again', 'a Bottle'), - 'Bottle (Fairy)': (True, False, None, 0x3D, 'Save me and I will revive you', 'and the captive', 'the tingle kid', 'hostage for sale', 'fairy dust and shrooms', 'bottle boy has friend again', 'a Bottle'), - 'Bottle (Bee)': (True, False, None, 0x3C, 'I will sting your foes a few times', 'and the sting buddy', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has mad bee again', 'a Bottle'), - 'Bottle (Good Bee)': (True, False, None, 0x48, 'I will sting your foes a whole lot!', 'and the sparkle sting', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has beetor again', 'a Bottle'), - 'Master Sword': (True, False, 'Sword', 0x50, 'I beat barries and pigs alike', 'and the master sword', 'sword-wielding kid', 'glow sword for sale', 'fungus for blue slasher', 'sword boy fights again', 'the Master Sword'), - 'Tempered Sword': (True, False, 'Sword', 0x02, 'I stole the\nblacksmith\'s\njob!', 'the tempered sword', 'sword-wielding kid', 'flame sword for sale', 'fungus for red slasher', 'sword boy fights again', 'the Tempered Sword'), - 'Fighter Sword': (True, False, 'Sword', 0x49, 'A pathetic\nsword rests\nhere!', 'the tiny sword', 'sword-wielding kid', 'tiny sword for sale', 'fungus for tiny slasher', 'sword boy fights again', 'the small sword'), - 'Golden Sword': (True, False, 'Sword', 0x03, 'The butter\nsword rests\nhere!', 'and the butter sword', 'sword-wielding kid', 'butter for sale', 'cap churned to butter', 'sword boy fights again', 'the Golden Sword'), - 'Progressive Sword': (True, False, 'Sword', 0x5E, 'a better copy\nof your sword\nfor your time', 'the unknown sword', 'sword-wielding kid', 'sword for sale', 'fungus for some slasher', 'sword boy fights again', 'a sword'), - 'Progressive Glove': (True, False, None, 0x61, 'a way to lift\nheavier things', 'and the lift upgrade', 'body-building kid', 'some glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'a glove'), - 'Silver Arrows': (True, False, None, 0x58, 'Do you fancy\nsilver tipped\narrows?', 'and the ganonsbane', 'ganon-killing kid', 'ganon doom for sale', 'fungus for pork', 'archer boy shines again', 'the silver arrows'), - 'Green Pendant': (True, False, 'Crystal', [0x04, 0x38, 0x62, 0x00, 0x69, 0x01], None, None, None, None, None, None, None), - 'Blue Pendant': (True, False, 'Crystal', [0x02, 0x34, 0x60, 0x00, 0x69, 0x02], None, None, None, None, None, None, None), - 'Red Pendant': (True, False, 'Crystal', [0x01, 0x32, 0x60, 0x00, 0x69, 0x03], None, None, None, None, None, None, None), - 'Triforce': (True, False, None, 0x6A, '\n YOU WIN!', 'and the triforce', 'victorious kid', 'victory for sale', 'fungus for the win', 'greedy boy wins game again', 'the Triforce'), - 'Power Star': (True, False, None, 0x6B, 'a small victory', 'and the power star', 'star-struck kid', 'star for sale', 'see stars with shroom', 'mario powers up again', 'a Power Star'), - 'Triforce Piece': (True, False, None, 0x6C, 'a small victory', 'and the thirdforce', 'triangular kid', 'triangle for sale', 'fungus for triangle', 'wise boy has triangle again', 'a Triforce Piece'), - 'Crystal 1': (True, False, 'Crystal', [0x02, 0x34, 0x64, 0x40, 0x7F, 0x06], None, None, None, None, None, None, None), - 'Crystal 2': (True, False, 'Crystal', [0x10, 0x34, 0x64, 0x40, 0x79, 0x06], None, None, None, None, None, None, None), - 'Crystal 3': (True, False, 'Crystal', [0x40, 0x34, 0x64, 0x40, 0x6C, 0x06], None, None, None, None, None, None, None), - 'Crystal 4': (True, False, 'Crystal', [0x20, 0x34, 0x64, 0x40, 0x6D, 0x06], None, None, None, None, None, None, None), - 'Crystal 5': (True, False, 'Crystal', [0x04, 0x32, 0x64, 0x40, 0x6E, 0x06], None, None, None, None, None, None, None), - 'Crystal 6': (True, False, 'Crystal', [0x01, 0x32, 0x64, 0x40, 0x6F, 0x06], None, None, None, None, None, None, None), - 'Crystal 7': (True, False, 'Crystal', [0x08, 0x34, 0x64, 0x40, 0x7C, 0x06], None, None, None, None, None, None, None), - 'Single Arrow': (False, False, None, 0x43, 'a lonely arrow\nsits here.', 'and the arrow', 'stick-collecting kid', 'sewing needle for sale', 'fungus for arrow', 'archer boy sews again', 'an arrow'), - 'Arrows (10)': (False, False, None, 0x44, 'This will give\nyou ten shots\nwith your bow!', 'and the arrow pack', 'stick-collecting kid', 'sewing kit for sale', 'fungus for arrows', 'archer boy sews again', 'ten arrows'), - 'Arrow Upgrade (+10)': (False, False, None, 0x54, '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, '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, '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'), - 'Bombs (3)': (False, False, None, 0x28, 'I make things\ngo triple\nBOOM!!!', 'and the explosions', 'the bomb-holding kid', 'firecrackers for sale', 'blend fungus into bombs', '\'splosion boy explodes again', 'three bombs'), - 'Bombs (10)': (False, False, None, 0x31, 'I make things\ngo BOOM! Ten\ntimes!', 'and the explosions', 'the bomb-holding kid', 'firecrackers for sale', 'blend fungus into bombs', '\'splosion boy explodes again', 'ten bombs'), - 'Bomb Upgrade (+10)': (False, False, None, 0x52, 'increase bomb\nstorage, low\nlow price', 'and the bomb bag', 'boom-enlarging kid', 'bomb boost for sale', 'the shroom goes boom', 'upgrade boy explodes more again', 'bomb capacity'), - 'Bomb Upgrade (+5)': (False, False, None, 0x51, 'increase bomb\nstorage, low\nlow price', 'and the bomb bag', 'boom-enlarging kid', 'bomb boost for sale', 'the shroom goes boom', 'upgrade boy explodes more again', 'bomb capacity'), - 'Blue Mail': (False, True, None, 0x22, 'Now you\'re a\nblue elf!', 'and the banana hat', 'the protected kid', 'banana hat for sale', 'the clothing store', 'tailor boy banana hatted again', 'the blue mail'), - 'Red Mail': (False, True, None, 0x23, 'Now you\'re a\nred elf!', 'and the eggplant hat', 'well-protected kid', 'purple hat for sale', 'the nice clothing store', 'tailor boy fears nothing again', 'the red mail'), - 'Progressive Armor': (False, True, None, 0x60, 'time for a\nchange of\nclothes?', 'and the unknown hat', 'the protected kid', 'new hat for sale', 'the clothing store', 'tailor boy has threads again', 'some armor'), - 'Blue Boomerang': (True, False, None, 0x0C, 'No matter what\nyou do, blue\nreturns to you', 'and the bluemarang', 'the bat-throwing kid', 'bent stick for sale', 'fungus for puma-stick', 'throwing boy plays fetch again', 'the blue boomerang'), - 'Red Boomerang': (True, False, None, 0x2A, 'No matter what\nyou do, red\nreturns to you', 'and the badmarang', 'the bat-throwing kid', 'air foil for sale', 'fungus for return-stick', 'magical boy plays fetch again', 'the red boomerang'), - 'Blue Shield': (False, True, None, 0x04, 'Now you can\ndefend against\npebbles!', 'and the stone blocker', 'shield-wielding kid', 'shield for sale', 'fungus for shield', 'shield boy defends again', 'the blue shield'), - 'Red Shield': (False, True, None, 0x05, 'Now you can\ndefend against\nfireballs!', 'and the shot blocker', 'shield-wielding kid', 'fire shield for sale', 'fungus for fire shield', 'shield boy defends again', 'the red shield'), - 'Mirror Shield': (True, False, None, 0x06, 'Now you can\ndefend against\nlasers!', 'and the laser blocker', 'shield-wielding kid', 'face shield for sale', 'fungus for face shield', 'shield boy defends again', 'the mirror shield'), - 'Progressive Shield': (True, False, None, 0x5F, 'have a better\nblocker in\nfront of you', 'and the new shield', 'shield-wielding kid', 'shield for sale', 'fungus for shield', 'shield boy defends again', 'a shield'), - 'Bug Catching Net': (True, False, None, 0x21, 'Let\'s catch\nsome bees and\nfaeries!', 'and the bee catcher', 'the bug-catching kid', 'stick web for sale', 'fungus for butterflies', 'wrong boy catches bees again', 'the bug net'), - 'Cane of Byrna': (True, False, None, 0x18, 'Use this to\nbecome\ninvincible!', 'and the bad cane', 'the spark-making kid', 'spark stick for sale', 'spark-stick for trade', 'cane boy encircles again', 'the blue cane'), - 'Boss Heart Container': (False, False, None, 0x3E, 'Maximum health\nincreased!\nYeah!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), - 'Sanctuary Heart Container': (False, False, None, 0x3F, 'Maximum health\nincreased!\nYeah!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), - 'Piece of Heart': (False, False, None, 0x17, 'Just a little\npiece of love!', 'and the broken heart', 'the life-giving kid', 'little love for sale', 'fungus for life', 'life boy feels some love again', 'a heart piece'), - 'Rupee (1)': (False, False, None, 0x34, 'Just pocket\nchange. Move\nright along.', 'the pocket change', 'poverty-struck kid', 'life lesson for sale', 'buying cheap drugs', 'destitute boy has snack again', 'a green rupee'), - 'Rupees (5)': (False, False, None, 0x35, 'Just pocket\nchange. Move\nright along.', 'the pocket change', 'poverty-struck kid', 'life lesson for sale', 'buying cheap drugs', 'destitute boy has snack again', 'a blue rupee'), - 'Rupees (20)': (False, False, None, 0x36, 'Just couch\ncash. Move\nright along.', 'and the couch cash', 'the piggy-bank kid', 'life lesson for sale', 'the witch buying drugs', 'destitute boy has lunch again', 'a red rupee'), - 'Rupees (50)': (False, False, None, 0x41, 'A rupee pile!\nOkay?', 'and the rupee pile', 'the well-off kid', 'life lesson for sale', 'buying okay drugs', 'destitute boy has dinner again', 'fifty rupees'), - 'Rupees (100)': (False, False, None, 0x40, 'A rupee stash!\nHell yeah!', 'and the rupee stash', 'the kind-of-rich kid', 'life lesson for sale', 'buying good drugs', 'affluent boy goes drinking again', 'one hundred rupees'), - 'Rupees (300)': (False, False, None, 0x46, 'A rupee hoard!\nHell yeah!', 'and the rupee hoard', 'the really-rich kid', 'life lesson for sale', 'buying the best drugs', 'fat-cat boy is rich again', 'three hundred rupees'), - 'Rupoor': (False, False, None, 0x59, 'a debt collector', 'and the toll-booth', 'the toll-booth kid', 'double loss for sale', 'witch stole your rupees', 'affluent boy steals rupees', 'a rupoor'), - 'Red Clock': (False, True, None, 0x5B, 'a waste of time', 'the ruby clock', 'the ruby-time kid', 'red time for sale', 'for ruby time', 'moment boy travels time again', 'a red clock'), - 'Blue Clock': (False, True, None, 0x5C, 'a bit of time', 'the sapphire clock', 'sapphire-time kid', 'blue time for sale', 'for sapphire time', 'moment boy time travels again', 'a blue clock'), - 'Green Clock': (False, True, None, 0x5D, 'a lot of time', 'the emerald clock', 'the emerald-time kid', 'green time for sale', 'for emerald time', 'moment boy adjusts time again', 'a red clock'), - 'Single RNG': (False, True, None, 0x62, 'something you don\'t yet have', None, None, None, None, 'unknown boy somethings again', 'a new mystery'), - 'Multi RNG': (False, True, None, 0x63, 'something you may already have', None, None, None, None, 'unknown boy somethings again', 'a total mystery'), - 'Magic Upgrade (1/2)': (True, False, None, 0x4E, 'Your magic\npower has been\ndoubled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'half magic'), # can be required to beat mothula in an open seed in very very rare circumstance - 'Magic Upgrade (1/4)': (True, False, None, 0x4F, 'Your magic\npower has been\nquadrupled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'quarter magic'), # can be required to beat mothula in an open seed in very very rare circumstance - 'Small Key (Eastern Palace)': (False, False, 'SmallKey', 0xA2, 'A small key to Armos Knights', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Eastern Palace'), - 'Big Key (Eastern Palace)': (False, False, 'BigKey', 0x9D, 'A big key to Armos Knights', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Eastern Palace'), - 'Compass (Eastern Palace)': (False, True, 'Compass', 0x8D, 'Now you can find the Armos Knights!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Eastern Palace'), - 'Map (Eastern Palace)': (False, True, 'Map', 0x7D, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Eastern Palace'), - 'Small Key (Desert Palace)': (False, False, 'SmallKey', 0xA3, 'A small key to the desert', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Desert Palace'), - 'Big Key (Desert Palace)': (False, False, 'BigKey', 0x9C, 'A big key to the desert', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Desert Palace'), - 'Compass (Desert Palace)': (False, True, 'Compass', 0x8C, 'Now you can find Lanmolas!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Desert Palace'), - 'Map (Desert Palace)': (False, True, 'Map', 0x7C, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Desert Palace'), - 'Small Key (Tower of Hera)': (False, False, 'SmallKey', 0xAA, 'A small key to Hera', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Tower of Hera'), - 'Big Key (Tower of Hera)': (False, False, 'BigKey', 0x95, 'A big key to Hera', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Tower of Hera'), - 'Compass (Tower of Hera)': (False, True, 'Compass', 0x85, 'Now you can find Moldorm!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Tower of Hera'), - 'Map (Tower of Hera)': (False, True, 'Map', 0x75, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Tower of Hera'), - 'Small Key (Escape)': (False, False, 'SmallKey', 0xA0, 'A small key to the castle', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Hyrule Castle'), - 'Big Key (Escape)': (False, False, 'BigKey', 0x9F, 'A big key to the castle', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Hyrule Castle'), - 'Compass (Escape)': (False, True, 'Compass', 0x8F, 'Now you can find no boss!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Hyrule Castle'), - 'Map (Escape)': (False, True, 'Map', 0x7F, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Hyrule Castle'), - 'Small Key (Agahnims Tower)': (False, False, 'SmallKey', 0xA4, 'A small key to Agahnim', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Castle Tower'), - 'Big Key (Agahnims Tower)': (False, False, 'BigKey', 0x9B, 'A big key to Agahnim', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Castle Tower'), - 'Compass (Agahnims Tower)': (False, True, 'Compass', 0x8B, 'Now you can find Aga1!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Castle Tower'), - 'Map (Agahnims Tower)': (False, True, 'Map', 0x7B, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Castle Tower'), - 'Small Key (Palace of Darkness)': (False, False, 'SmallKey', 0xA6, 'A small key to darkness', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Palace of Darkness'), - 'Big Key (Palace of Darkness)': (False, False, 'BigKey', 0x99, 'A big key to darkness', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Palace of Darkness'), - 'Compass (Palace of Darkness)': (False, True, 'Compass', 0x89, 'Now you can find Helmasaur King!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Palace of Darkness'), - 'Map (Palace of Darkness)': (False, True, 'Map', 0x79, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Palace of Darkness'), - 'Small Key (Thieves Town)': (False, False, 'SmallKey', 0xAB, 'A small key to thievery', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Thieves\' Town'), - 'Big Key (Thieves Town)': (False, False, 'BigKey', 0x94, 'A big key to thievery', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Thieves\' Town'), - 'Compass (Thieves Town)': (False, True, 'Compass', 0x84, 'Now you can find Blind!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Thieves\' Town'), - 'Map (Thieves Town)': (False, True, 'Map', 0x74, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Thieves\' Town'), - 'Small Key (Skull Woods)': (False, False, 'SmallKey', 0xA8, 'A small key to the woods', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Skull Woods'), - 'Big Key (Skull Woods)': (False, False, 'BigKey', 0x97, 'A big key to the woods', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Skull Woods'), - 'Compass (Skull Woods)': (False, True, 'Compass', 0x87, 'Now you can find Mothula!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Skull Woods'), - 'Map (Skull Woods)': (False, True, 'Map', 0x77, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Skull Woods'), - 'Small Key (Swamp Palace)': (False, False, 'SmallKey', 0xA5, 'A small key to the swamp', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Swamp Palace'), - 'Big Key (Swamp Palace)': (False, False, 'BigKey', 0x9A, 'A big key to the swamp', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Swamp Palace'), - 'Compass (Swamp Palace)': (False, True, 'Compass', 0x8A, 'Now you can find Arrghus!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Swamp Palace'), - 'Map (Swamp Palace)': (False, True, 'Map', 0x7A, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Swamp Palace'), - 'Small Key (Ice Palace)': (False, False, 'SmallKey', 0xA9, 'A small key to the iceberg', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ice Palace'), - 'Big Key (Ice Palace)': (False, False, 'BigKey', 0x96, 'A big key to the iceberg', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ice Palace'), - 'Compass (Ice Palace)': (False, True, 'Compass', 0x86, 'Now you can find Kholdstare!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Ice Palace'), - 'Map (Ice Palace)': (False, True, 'Map', 0x76, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ice Palace'), - 'Small Key (Misery Mire)': (False, False, 'SmallKey', 0xA7, 'A small key to the mire', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Misery Mire'), - 'Big Key (Misery Mire)': (False, False, 'BigKey', 0x98, 'A big key to the mire', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Misery Mire'), - 'Compass (Misery Mire)': (False, True, 'Compass', 0x88, 'Now you can find Vitreous!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Misery Mire'), - 'Map (Misery Mire)': (False, True, 'Map', 0x78, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Misery Mire'), - 'Small Key (Turtle Rock)': (False, False, 'SmallKey', 0xAC, 'A small key to the pipe maze', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Turtle Rock'), - 'Big Key (Turtle Rock)': (False, False, 'BigKey', 0x93, 'A big key to the pipe maze', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Turtle Rock'), - 'Compass (Turtle Rock)': (False, True, 'Compass', 0x83, 'Now you can find Trinexx!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Turtle Rock'), - 'Map (Turtle Rock)': (False, True, 'Map', 0x73, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Turtle Rock'), - 'Small Key (Ganons Tower)': (False, False, 'SmallKey', 0xAD, 'A small key to the evil tower', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ganon\'s Tower'), - 'Big Key (Ganons Tower)': (False, False, 'BigKey', 0x92, 'A big key to the evil tower', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ganon\'s Tower'), - 'Compass (Ganons Tower)': (False, True, 'Compass', 0x82, 'Now you can find Agahnim!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a comapss to Ganon\'s Tower'), - 'Map (Ganons Tower)': (False, True, 'Map', 0x72, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ganon\'s Tower'), - 'Small Key (Universal)': (False, True, None, 0xAF, 'A small key for any door', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key'), - 'Nothing': (False, False, None, 0x5A, 'Some Hot Air', 'and the Nothing', 'the zen kid', 'outright theft', 'shroom theft', 'empty boy is bored again', 'nothing'), - 'Bee Trap': (False, False, None, 0xB0, 'We will sting your face a whole lot!', 'and the sting buddies', 'the beekeeper kid', 'insects for sale', 'shroom pollenation', 'bottle boy has mad bees again', 'friendship'), - 'Red Potion': (False, False, None, 0x2E, 'Hearty red goop!', 'and the red goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has red goo again', 'a red potion'), - 'Green Potion': (False, False, None, 0x2F, 'Refreshing green goop!', 'and the green goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has green goo again', 'a green potion'), - 'Blue Potion': (False, False, None, 0x30, 'Delicious blue goop!', 'and the blue goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has blue goo again', 'a blue potion'), - 'Bee': (False, False, None, 0x0E, 'I will sting your foes a few times', 'and the sting buddy', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has mad bee again', 'a bee'), - 'Small Heart': (False, False, None, 0x42, 'Just a little\npiece of love!', 'and the heart', 'the life-giving kid', 'little love for sale', 'fungus for life', 'life boy feels some love again', 'a heart'), - 'Beat Agahnim 1': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Beat Agahnim 2': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Get Frog': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Return Smith': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Pick Up Purple Chest': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Open Floodgate': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Trench 1 Filled': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Trench 2 Filled': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Drained Swamp': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Shining Light': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Maiden Rescued': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Maiden Unmasked': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Convenient Block': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Zelda Herself': (True, False, 'Event', None, None, None, None, None, None, None, None), - 'Zelda Delivered': (True, False, 'Event', None, None, None, None, None, None, None, None), +item_table = {'Bow': (True, False, None, 0x0B, 300, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'the Bow'), + 'Progressive Bow': (True, False, None, 0x64, 200, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), + 'Progressive Bow (Alt)': (True, False, None, 0x65, 200, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), + 'Book of Mudora': (True, False, None, 0x1D, 200, 'This is a\nparadox?!', 'and the story book', 'the scholarly kid', 'moon runes for sale', 'drugs for literacy', 'book-worm boy can read again', 'the Book'), + 'Hammer': (True, False, None, 0x09, 300, 'stop\nhammer time!', 'and m c hammer', 'hammer-smashing kid', 'm c hammer for sale', 'stop... hammer time', 'stop, hammer time', 'the hammer'), + 'Hookshot': (True, False, None, 0x0A, 300, 'BOING!!!\nBOING!!!\nBOING!!!', 'and the tickle beam', 'tickle-monster kid', 'tickle beam for sale', 'witch and tickle boy', 'beam boy tickles again', 'the Hookshot'), + 'Magic Mirror': (True, False, None, 0x1A, 300, 'Isn\'t your\nreflection so\npretty?', 'the face reflector', 'the narcissistic kid', 'your face for sale', 'trades looking-glass', 'narcissistic boy is happy again', 'the Mirror'), + 'Ocarina': (True, False, None, 0x14, 300, 'Save the duck\nand fly to\nfreedom!', 'and the duck call', 'the duck-call kid', 'duck call for sale', 'duck-calls for trade', 'ocarina boy plays again', 'the Flute'), + 'Pegasus Boots': (True, False, None, 0x4B, 300, 'Gotta go fast!', 'and the sprint shoes', 'the running-man kid', 'sprint shoe for sale', 'shrooms for speed', 'gotta-go-fast boy runs again', 'the Boots'), + 'Power Glove': (True, False, None, 0x1B, 150, 'Now you can\nlift weak\nstuff!', 'and the grey mittens', 'body-building kid', 'lift glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'the glove'), + 'Cape': (True, False, None, 0x19, 100, 'Wear this to\nbecome\ninvisible!', 'the camouflage cape', 'red riding-hood kid', 'red hood for sale', 'hood from a hood', 'dapper boy hides again', 'the cape'), + 'Mushroom': (True, False, None, 0x29, 100, 'I\'m a fun guy!\n\nI\'m a funghi!', 'and the legal drugs', 'the drug-dealing kid', 'legal drugs for sale', 'shroom swap', 'shroom boy sells drugs again', 'the mushroom'), + 'Shovel': (True, False, None, 0x13, 100, 'Can\n You\n Dig it?', 'and the spade', 'archaeologist kid', 'dirt spade for sale', 'can you dig it', 'shovel boy digs again', 'the shovel'), + 'Lamp': (True, False, None, 0x12, 200, 'Baby, baby,\nbaby.\nLight my way!', 'and the flashlight', 'light-shining kid', 'flashlight for sale', 'fungus for illumination', 'illuminated boy can see again', 'the lamp'), + 'Magic Powder': (True, False, None, 0x0D, 100, 'you can turn\nanti-faeries\ninto faeries', 'and the magic sack', 'the sack-holding kid', 'magic sack for sale', 'the witch and assistant', 'magic boy plays marbles again', 'the powder'), + 'Moon Pearl': (True, False, None, 0x1F, 300, ' Bunny Link\n be\n gone!', 'and the jaw breaker', 'fortune-telling kid', 'lunar orb for sale', 'shrooms for moon rock', 'moon boy plays ball again', 'the moon pearl'), + 'Cane of Somaria': (True, False, None, 0x15, 300, 'I make blocks\nto hold down\nswitches!', 'and the red blocks', 'the block-making kid', 'block stick for sale', 'block stick for trade', 'cane boy makes blocks again', 'the red cane'), + 'Fire Rod': (True, False, None, 0x07, 300, 'I\'m the hot\nrod. I make\nthings burn!', 'and the flamethrower', 'fire-starting kid', 'rage rod for sale', 'fungus for rage-rod', 'firestarter boy burns again', 'the fire rod'), + 'Flippers': (True, False, None, 0x1E, 300, 'fancy a swim?', 'and the toewebs', 'the swimming kid', 'finger webs for sale', 'shrooms let you swim', 'swimming boy swims again', 'the flippers'), + 'Ice Rod': (True, False, None, 0x08, 300, 'I\'m the cold\nrod. I make\nthings freeze!', 'and the freeze ray', 'the ice-bending kid', 'freeze ray for sale', 'fungus for ice-rod', 'ice-cube boy freezes again', 'the ice rod'), + 'Titans Mitts': (True, False, None, 0x1C, 300, 'Now you can\nlift heavy\nstuff!', 'and the golden glove', 'body-building kid', 'carry glove for sale', 'fungus for bling-gloves', 'body-building boy has gold again', 'the mitts'), + 'Bombos': (True, False, None, 0x0F, 200, 'Burn, baby,\nburn! Fear my\nring of fire!', 'and the swirly coin', 'coin-collecting kid', 'swirly coin for sale', 'shrooms for swirly-coin', 'medallion boy melts room again', 'Bombos'), + 'Ether': (True, False, None, 0x10, 200, 'This magic\ncoin freezes\neverything!', 'and the bolt coin', 'coin-collecting kid', 'bolt coin for sale', 'shrooms for bolt-coin', 'medallion boy sees floor again', 'Ether'), + 'Quake': (True, False, None, 0x11, 200, 'Maxing out the\nRichter scale\nis what I do!', 'and the wavy coin', 'coin-collecting kid', 'wavy coin for sale', 'shrooms for wavy-coin', 'medallion boy shakes dirt again', 'Quake'), + 'Bottle': (True, False, None, 0x16, 100, 'Now you can\nstore potions\nand stuff!', 'and the terrarium', 'the terrarium kid', 'terrarium for sale', 'special promotion', 'bottle boy has terrarium again', 'a Bottle'), + 'Bottle (Red Potion)': (True, False, None, 0x2B, 130, 'Hearty red goop!', 'and the red goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has red goo again', 'a Bottle'), + 'Bottle (Green Potion)': (True, False, None, 0x2C, 110, 'Refreshing green goop!', 'and the green goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has green goo again', 'a Bottle'), + 'Bottle (Blue Potion)': (True, False, None, 0x2D, 160, 'Delicious blue goop!', 'and the blue goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has blue goo again', 'a Bottle'), + 'Bottle (Fairy)': (True, False, None, 0x3D, 150, 'Save me and I will revive you', 'and the captive', 'the tingle kid', 'hostage for sale', 'fairy dust and shrooms', 'bottle boy has friend again', 'a Bottle'), + 'Bottle (Bee)': (True, False, None, 0x3C, 100, 'I will sting your foes a few times', 'and the sting buddy', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has mad bee again', 'a Bottle'), + 'Bottle (Good Bee)': (True, False, None, 0x48, 110, 'I will sting your foes a whole lot!', 'and the sparkle sting', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has beetor again', 'a Bottle'), + 'Master Sword': (True, False, 'Sword', 0x50, 150, 'I beat barries and pigs alike', 'and the master sword', 'sword-wielding kid', 'glow sword for sale', 'fungus for blue slasher', 'sword boy fights again', 'the Master Sword'), + 'Tempered Sword': (True, False, 'Sword', 0x02, 250, 'I stole the\nblacksmith\'s\njob!', 'the tempered sword', 'sword-wielding kid', 'flame sword for sale', 'fungus for red slasher', 'sword boy fights again', 'the Tempered Sword'), + 'Fighter Sword': (True, False, 'Sword', 0x49, 50, 'A pathetic\nsword rests\nhere!', 'the tiny sword', 'sword-wielding kid', 'tiny sword for sale', 'fungus for tiny slasher', 'sword boy fights again', 'the small sword'), + 'Golden Sword': (True, False, 'Sword', 0x03, 300, 'The butter\nsword rests\nhere!', 'and the butter sword', 'sword-wielding kid', 'butter for sale', 'cap churned to butter', 'sword boy fights again', 'the Golden Sword'), + 'Progressive Sword': (True, False, 'Sword', 0x5E, 200, 'a better copy\nof your sword\nfor your time', 'the unknown sword', 'sword-wielding kid', 'sword for sale', 'fungus for some slasher', 'sword boy fights again', 'a sword'), + 'Progressive Glove': (True, False, None, 0x61, 200, 'a way to lift\nheavier things', 'and the lift upgrade', 'body-building kid', 'some glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'a glove'), + 'Silver Arrows': (True, False, None, 0x58, 100, 'Do you fancy\nsilver tipped\narrows?', 'and the ganonsbane', 'ganon-killing kid', 'ganon doom for sale', 'fungus for pork', 'archer boy shines again', 'the silver arrows'), + 'Green Pendant': (True, False, 'Crystal', [0x04, 0x38, 0x62, 0x00, 0x69, 0x01], 999, None, None, None, None, None, None, None), + 'Blue Pendant': (True, False, 'Crystal', [0x02, 0x34, 0x60, 0x00, 0x69, 0x02], 999, None, None, None, None, None, None, None), + 'Red Pendant': (True, False, 'Crystal', [0x01, 0x32, 0x60, 0x00, 0x69, 0x03], 999, None, None, None, None, None, None, None), + 'Triforce': (True, False, None, 0x6A, 777, '\n YOU WIN!', 'and the triforce', 'victorious kid', 'victory for sale', 'fungus for the win', 'greedy boy wins game again', 'the Triforce'), + 'Power Star': (True, False, None, 0x6B, 50, 'a small victory', 'and the power star', 'star-struck kid', 'star for sale', 'see stars with shroom', 'mario powers up again', 'a Power Star'), + 'Triforce Piece': (True, False, None, 0x6C, 50, 'a small victory', 'and the thirdforce', 'triangular kid', 'triangle for sale', 'fungus for triangle', 'wise boy has triangle again', 'a Triforce Piece'), + 'Crystal 1': (True, False, 'Crystal', [0x02, 0x34, 0x64, 0x40, 0x7F, 0x06], 999, None, None, None, None, None, None, None), + 'Crystal 2': (True, False, 'Crystal', [0x10, 0x34, 0x64, 0x40, 0x79, 0x06], 999, None, None, None, None, None, None, None), + 'Crystal 3': (True, False, 'Crystal', [0x40, 0x34, 0x64, 0x40, 0x6C, 0x06], 999, None, None, None, None, None, None, None), + 'Crystal 4': (True, False, 'Crystal', [0x20, 0x34, 0x64, 0x40, 0x6D, 0x06], 999, None, None, None, None, None, None, None), + 'Crystal 5': (True, False, 'Crystal', [0x04, 0x32, 0x64, 0x40, 0x6E, 0x06], 999, None, None, None, None, None, None, None), + 'Crystal 6': (True, False, 'Crystal', [0x01, 0x32, 0x64, 0x40, 0x6F, 0x06], 999, None, None, None, None, None, None, None), + 'Crystal 7': (True, False, 'Crystal', [0x08, 0x34, 0x64, 0x40, 0x7C, 0x06], 999, None, None, None, None, None, None, None), + 'Single Arrow': (False, False, None, 0x43, 3, 'a lonely arrow\nsits here.', 'and the arrow', 'stick-collecting kid', 'sewing needle for sale', 'fungus for arrow', 'archer boy sews again', 'an arrow'), + 'Arrows (10)': (False, False, None, 0x44, 30, 'This will give\nyou ten shots\nwith your bow!', 'and the arrow pack', 'stick-collecting kid', 'sewing kit for sale', 'fungus for arrows', 'archer boy sews again', 'ten arrows'), + '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'), + 'Bombs (3)': (False, False, None, 0x28, 15, 'I make things\ngo triple\nBOOM!!!', 'and the explosions', 'the bomb-holding kid', 'firecrackers for sale', 'blend fungus into bombs', '\'splosion boy explodes again', 'three bombs'), + 'Bombs (10)': (False, False, None, 0x31, 50, 'I make things\ngo BOOM! Ten\ntimes!', 'and the explosions', 'the bomb-holding kid', 'firecrackers for sale', 'blend fungus into bombs', '\'splosion boy explodes again', 'ten bombs'), + 'Bomb Upgrade (+10)': (False, False, None, 0x52, 100, 'increase bomb\nstorage, low\nlow price', 'and the bomb bag', 'boom-enlarging kid', 'bomb boost for sale', 'the shroom goes boom', 'upgrade boy explodes more again', 'bomb capacity'), + 'Bomb Upgrade (+5)': (False, False, None, 0x51, 100, 'increase bomb\nstorage, low\nlow price', 'and the bomb bag', 'boom-enlarging kid', 'bomb boost for sale', 'the shroom goes boom', 'upgrade boy explodes more again', 'bomb capacity'), + 'Blue Mail': (False, True, None, 0x22, 100, 'Now you\'re a\nblue elf!', 'and the banana hat', 'the protected kid', 'banana hat for sale', 'the clothing store', 'tailor boy banana hatted again', 'the blue mail'), + 'Red Mail': (False, True, None, 0x23, 200, 'Now you\'re a\nred elf!', 'and the eggplant hat', 'well-protected kid', 'purple hat for sale', 'the nice clothing store', 'tailor boy fears nothing again', 'the red mail'), + 'Progressive Armor': (False, True, None, 0x60, 100, 'time for a\nchange of\nclothes?', 'and the unknown hat', 'the protected kid', 'new hat for sale', 'the clothing store', 'tailor boy has threads again', 'some armor'), + 'Blue Boomerang': (True, False, None, 0x0C, 100, 'No matter what\nyou do, blue\nreturns to you', 'and the bluemarang', 'the bat-throwing kid', 'bent stick for sale', 'fungus for puma-stick', 'throwing boy plays fetch again', 'the blue boomerang'), + 'Red Boomerang': (True, False, None, 0x2A, 100, 'No matter what\nyou do, red\nreturns to you', 'and the badmarang', 'the bat-throwing kid', 'air foil for sale', 'fungus for return-stick', 'magical boy plays fetch again', 'the red boomerang'), + 'Blue Shield': (False, True, None, 0x04, 50, 'Now you can\ndefend against\npebbles!', 'and the stone blocker', 'shield-wielding kid', 'shield for sale', 'fungus for shield', 'shield boy defends again', 'the blue shield'), + 'Red Shield': (False, True, None, 0x05, 500, 'Now you can\ndefend against\nfireballs!', 'and the shot blocker', 'shield-wielding kid', 'fire shield for sale', 'fungus for fire shield', 'shield boy defends again', 'the red shield'), + 'Mirror Shield': (True, False, None, 0x06, 300, 'Now you can\ndefend against\nlasers!', 'and the laser blocker', 'shield-wielding kid', 'face shield for sale', 'fungus for face shield', 'shield boy defends again', 'the mirror shield'), + 'Progressive Shield': (True, False, None, 0x5F, 100, 'have a better\nblocker in\nfront of you', 'and the new shield', 'shield-wielding kid', 'shield for sale', 'fungus for shield', 'shield boy defends again', 'a shield'), + 'Bug Catching Net': (True, False, None, 0x21, 100, 'Let\'s catch\nsome bees and\nfaeries!', 'and the bee catcher', 'the bug-catching kid', 'stick web for sale', 'fungus for butterflies', 'wrong boy catches bees again', 'the bug net'), + 'Cane of Byrna': (True, False, None, 0x18, 100, 'Use this to\nbecome\ninvincible!', 'and the bad cane', 'the spark-making kid', 'spark stick for sale', 'spark-stick for trade', 'cane boy encircles again', 'the blue cane'), + 'Boss Heart Container': (False, False, None, 0x3E, 80, 'Maximum health\nincreased!\nYeah!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), + 'Sanctuary Heart Container': (False, False, None, 0x3F, 100, 'Maximum health\nincreased!\nYeah!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), + 'Piece of Heart': (False, False, None, 0x17, 20, 'Just a little\npiece of love!', 'and the broken heart', 'the life-giving kid', 'little love for sale', 'fungus for life', 'life boy feels some love again', 'a heart piece'), + 'Rupee (1)': (False, False, None, 0x34, 0, 'Just pocket\nchange. Move\nright along.', 'the pocket change', 'poverty-struck kid', 'life lesson for sale', 'buying cheap drugs', 'destitute boy has snack again', 'a green rupee'), + 'Rupees (5)': (False, False, None, 0x35, 2, 'Just pocket\nchange. Move\nright along.', 'the pocket change', 'poverty-struck kid', 'life lesson for sale', 'buying cheap drugs', 'destitute boy has snack again', 'a blue rupee'), + 'Rupees (20)': (False, False, None, 0x36, 10, 'Just couch\ncash. Move\nright along.', 'and the couch cash', 'the piggy-bank kid', 'life lesson for sale', 'the witch buying drugs', 'destitute boy has lunch again', 'a red rupee'), + 'Rupees (50)': (False, False, None, 0x41, 25, 'A rupee pile!\nOkay?', 'and the rupee pile', 'the well-off kid', 'life lesson for sale', 'buying okay drugs', 'destitute boy has dinner again', 'fifty rupees'), + 'Rupees (100)': (False, False, None, 0x40, 50, 'A rupee stash!\nHell yeah!', 'and the rupee stash', 'the kind-of-rich kid', 'life lesson for sale', 'buying good drugs', 'affluent boy goes drinking again', 'one hundred rupees'), + 'Rupees (300)': (False, False, None, 0x46, 150, 'A rupee hoard!\nHell yeah!', 'and the rupee hoard', 'the really-rich kid', 'life lesson for sale', 'buying the best drugs', 'fat-cat boy is rich again', 'three hundred rupees'), + 'Rupoor': (False, False, None, 0x59, 0, 'a debt collector', 'and the toll-booth', 'the toll-booth kid', 'double loss for sale', 'witch stole your rupees', 'affluent boy steals rupees', 'a rupoor'), + 'Red Clock': (False, True, None, 0x5B, 0, 'a waste of time', 'the ruby clock', 'the ruby-time kid', 'red time for sale', 'for ruby time', 'moment boy travels time again', 'a red clock'), + 'Blue Clock': (False, True, None, 0x5C, 50, 'a bit of time', 'the sapphire clock', 'sapphire-time kid', 'blue time for sale', 'for sapphire time', 'moment boy time travels again', 'a blue clock'), + 'Green Clock': (False, True, None, 0x5D, 200, 'a lot of time', 'the emerald clock', 'the emerald-time kid', 'green time for sale', 'for emerald time', 'moment boy adjusts time again', 'a red clock'), + 'Single RNG': (False, True, None, 0x62, 300, 'something you don\'t yet have', None, None, None, None, 'unknown boy somethings again', 'a new mystery'), + 'Multi RNG': (False, True, None, 0x63, 100, 'something you may already have', None, None, None, None, 'unknown boy somethings again', 'a total mystery'), + 'Magic Upgrade (1/2)': (True, False, None, 0x4E, 100, 'Your magic\npower has been\ndoubled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'half magic'), # can be required to beat mothula in an open seed in very very rare circumstance + 'Magic Upgrade (1/4)': (True, False, None, 0x4F, 200, 'Your magic\npower has been\nquadrupled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'quarter magic'), # can be required to beat mothula in an open seed in very very rare circumstance + 'Small Key (Eastern Palace)': (False, False, 'SmallKey', 0xA2, 50, 'A small key to Armos Knights', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Eastern Palace'), + 'Big Key (Eastern Palace)': (False, False, 'BigKey', 0x9D, 100, 'A big key to Armos Knights', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Eastern Palace'), + 'Compass (Eastern Palace)': (False, True, 'Compass', 0x8D, 10, 'Now you can find the Armos Knights!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Eastern Palace'), + 'Map (Eastern Palace)': (False, True, 'Map', 0x7D, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Eastern Palace'), + 'Small Key (Desert Palace)': (False, False, 'SmallKey', 0xA3, 50, 'A small key to the desert', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Desert Palace'), + 'Big Key (Desert Palace)': (False, False, 'BigKey', 0x9C, 100, 'A big key to the desert', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Desert Palace'), + 'Compass (Desert Palace)': (False, True, 'Compass', 0x8C, 10, 'Now you can find Lanmolas!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Desert Palace'), + 'Map (Desert Palace)': (False, True, 'Map', 0x7C, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Desert Palace'), + 'Small Key (Tower of Hera)': (False, False, 'SmallKey', 0xAA, 50, 'A small key to Hera', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Tower of Hera'), + 'Big Key (Tower of Hera)': (False, False, 'BigKey', 0x95, 100, 'A big key to Hera', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Tower of Hera'), + 'Compass (Tower of Hera)': (False, True, 'Compass', 0x85, 10, 'Now you can find Moldorm!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Tower of Hera'), + 'Map (Tower of Hera)': (False, True, 'Map', 0x75, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Tower of Hera'), + 'Small Key (Escape)': (False, False, 'SmallKey', 0xA0, 50, 'A small key to the castle', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Hyrule Castle'), + 'Big Key (Escape)': (False, False, 'BigKey', 0x9F, 100, 'A big key to the castle', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Hyrule Castle'), + 'Compass (Escape)': (False, True, 'Compass', 0x8F, 10, 'Now you can find no boss!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Hyrule Castle'), + 'Map (Escape)': (False, True, 'Map', 0x7F, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Hyrule Castle'), + 'Small Key (Agahnims Tower)': (False, False, 'SmallKey', 0xA4, 50, 'A small key to Agahnim', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Castle Tower'), + 'Big Key (Agahnims Tower)': (False, False, 'BigKey', 0x9B, 100, 'A big key to Agahnim', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Castle Tower'), + 'Compass (Agahnims Tower)': (False, True, 'Compass', 0x8B, 10, 'Now you can find Aga1!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Castle Tower'), + 'Map (Agahnims Tower)': (False, True, 'Map', 0x7B, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Castle Tower'), + 'Small Key (Palace of Darkness)': (False, False, 'SmallKey', 0xA6, 50, 'A small key to darkness', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Palace of Darkness'), + 'Big Key (Palace of Darkness)': (False, False, 'BigKey', 0x99, 100, 'A big key to darkness', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Palace of Darkness'), + 'Compass (Palace of Darkness)': (False, True, 'Compass', 0x89, 10, 'Now you can find Helmasaur King!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Palace of Darkness'), + 'Map (Palace of Darkness)': (False, True, 'Map', 0x79, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Palace of Darkness'), + 'Small Key (Thieves Town)': (False, False, 'SmallKey', 0xAB, 50, 'A small key to thievery', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Thieves\' Town'), + 'Big Key (Thieves Town)': (False, False, 'BigKey', 0x94, 100, 'A big key to thievery', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Thieves\' Town'), + 'Compass (Thieves Town)': (False, True, 'Compass', 0x84, 10, 'Now you can find Blind!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Thieves\' Town'), + 'Map (Thieves Town)': (False, True, 'Map', 0x74, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Thieves\' Town'), + 'Small Key (Skull Woods)': (False, False, 'SmallKey', 0xA8, 50, 'A small key to the woods', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Skull Woods'), + 'Big Key (Skull Woods)': (False, False, 'BigKey', 0x97, 100, 'A big key to the woods', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Skull Woods'), + 'Compass (Skull Woods)': (False, True, 'Compass', 0x87, 10, 'Now you can find Mothula!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Skull Woods'), + 'Map (Skull Woods)': (False, True, 'Map', 0x77, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Skull Woods'), + 'Small Key (Swamp Palace)': (False, False, 'SmallKey', 0xA5, 50, 'A small key to the swamp', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Swamp Palace'), + 'Big Key (Swamp Palace)': (False, False, 'BigKey', 0x9A, 100, 'A big key to the swamp', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Swamp Palace'), + 'Compass (Swamp Palace)': (False, True, 'Compass', 0x8A, 10, 'Now you can find Arrghus!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Swamp Palace'), + 'Map (Swamp Palace)': (False, True, 'Map', 0x7A, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Swamp Palace'), + 'Small Key (Ice Palace)': (False, False, 'SmallKey', 0xA9, 50, 'A small key to the iceberg', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ice Palace'), + 'Big Key (Ice Palace)': (False, False, 'BigKey', 0x96, 100, 'A big key to the iceberg', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ice Palace'), + 'Compass (Ice Palace)': (False, True, 'Compass', 0x86, 10, 'Now you can find Kholdstare!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Ice Palace'), + 'Map (Ice Palace)': (False, True, 'Map', 0x76, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ice Palace'), + 'Small Key (Misery Mire)': (False, False, 'SmallKey', 0xA7, 50, 'A small key to the mire', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Misery Mire'), + 'Big Key (Misery Mire)': (False, False, 'BigKey', 0x98, 100, 'A big key to the mire', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Misery Mire'), + 'Compass (Misery Mire)': (False, True, 'Compass', 0x88, 10, 'Now you can find Vitreous!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Misery Mire'), + 'Map (Misery Mire)': (False, True, 'Map', 0x78, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Misery Mire'), + 'Small Key (Turtle Rock)': (False, False, 'SmallKey', 0xAC, 50, 'A small key to the pipe maze', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Turtle Rock'), + 'Big Key (Turtle Rock)': (False, False, 'BigKey', 0x93, 100, 'A big key to the pipe maze', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Turtle Rock'), + 'Compass (Turtle Rock)': (False, True, 'Compass', 0x83, 10, 'Now you can find Trinexx!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Turtle Rock'), + 'Map (Turtle Rock)': (False, True, 'Map', 0x73, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Turtle Rock'), + 'Small Key (Ganons Tower)': (False, False, 'SmallKey', 0xAD, 50, 'A small key to the evil tower', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ganon\'s Tower'), + 'Big Key (Ganons Tower)': (False, False, 'BigKey', 0x92, 100, 'A big key to the evil tower', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ganon\'s Tower'), + 'Compass (Ganons Tower)': (False, True, 'Compass', 0x82, 10, 'Now you can find Agahnim!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a comapss to Ganon\'s Tower'), + 'Map (Ganons Tower)': (False, True, 'Map', 0x72, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ganon\'s Tower'), + 'Small Key (Universal)': (False, True, None, 0xAF, 100, 'A small key for any door', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key'), + 'Nothing': (False, False, None, 0x5A, 1, 'Some Hot Air', 'and the Nothing', 'the zen kid', 'outright theft', 'shroom theft', 'empty boy is bored again', 'nothing'), + 'Bee Trap': (False, False, None, 0xB0, 0, 'We will sting your face a whole lot!', 'and the sting buddies', 'the beekeeper kid', 'insects for sale', 'shroom pollenation', 'bottle boy has mad bees again', 'friendship'), + 'Red Potion': (False, False, None, 0x2E, 150, 'Hearty red goop!', 'and the red goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has red goo again', 'a red potion'), + 'Green Potion': (False, False, None, 0x2F, 60, 'Refreshing green goop!', 'and the green goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has green goo again', 'a green potion'), + 'Blue Potion': (False, False, None, 0x30, 160, 'Delicious blue goop!', 'and the blue goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has blue goo again', 'a blue potion'), + 'Bee': (False, False, None, 0x0E, 10, 'I will sting your foes a few times', 'and the sting buddy', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has mad bee again', 'a bee'), + 'Small Heart': (False, False, None, 0x42, 10, 'Just a little\npiece of love!', 'and the heart', 'the life-giving kid', 'little love for sale', 'fungus for life', 'life boy feels some love again', 'a heart'), + 'Beat Agahnim 1': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Beat Agahnim 2': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Get Frog': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Return Smith': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Pick Up Purple Chest': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Open Floodgate': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Trench 1 Filled': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Trench 2 Filled': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Drained Swamp': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Shining Light': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Maiden Rescued': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Maiden Unmasked': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Convenient Block': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Zelda Herself': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), + 'Zelda Delivered': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), } diff --git a/Main.py b/Main.py index aaed4a61..721541bc 100644 --- a/Main.py +++ b/Main.py @@ -21,11 +21,12 @@ from DoorShuffle import link_doors, connect_portal_copy from RoomData import create_rooms from Rules import set_rules from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive -from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items, balance_multiworld_progression -from ItemList import generate_itempool, difficulties, fill_prizes, fill_specific_items +from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items, sell_keys, balance_multiworld_progression +from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names -__version__ = '0.2.0.18u' +__version__ = '0.2.1.0-u' + class EnemizerError(RuntimeError): pass @@ -70,6 +71,7 @@ def main(args, seed=None, fish=None): world.dungeon_counters = args.dungeon_counters.copy() world.potshuffle = args.shufflepots.copy() world.fish = fish + world.shopsanity = args.shopsanity.copy() world.keydropshuffle = args.keydropshuffle.copy() world.mixed_travel = args.mixed_travel.copy() world.standardize_palettes = args.standardize_palettes.copy() @@ -147,6 +149,10 @@ def main(args, seed=None, fish=None): for player in range(1, world.players + 1): set_rules(world, player) + for player in range(1, world.players + 1): + if world.retro[player] and world.shopsanity[player]: + sell_keys(world, player) + logger.info(world.fish.translate("cli","cli","placing.dungeon.prizes")) fill_prizes(world) @@ -205,6 +211,10 @@ def main(args, seed=None, fish=None): if not world.can_beat_game(): raise RuntimeError(world.fish.translate("cli","cli","cannot.beat.game")) + for player in range(1, world.players+1): + if world.shopsanity[player]: + customize_shops(world, player) + outfilebase = 'DR_%s' % (args.outputname if args.outputname else world.seed) rom_names = [] @@ -398,6 +408,7 @@ def copy_world(world): ret.beemizer = world.beemizer.copy() ret.intensity = world.intensity.copy() ret.experimental = world.experimental.copy() + ret.shopsanity = world.shopsanity.copy() ret.keydropshuffle = world.keydropshuffle.copy() ret.mixed_travel = world.mixed_travel.copy() ret.standardize_palettes = world.standardize_palettes.copy() @@ -426,9 +437,10 @@ def copy_world(world): for level, boss in dungeon.bosses.items(): ret.get_dungeon(dungeon.name, dungeon.player).bosses[level] = boss - for shop in world.shops: - copied_shop = ret.get_region(shop.region.name, shop.region.player).shop - copied_shop.inventory = copy.copy(shop.inventory) + for player in range(1, world.players + 1): + for shop in world.shops[player]: + copied_shop = ret.get_region(shop.region.name, shop.region.player).shop + copied_shop.inventory = copy.copy(shop.inventory) # connect copied world for region in world.regions: @@ -490,6 +502,7 @@ def copy_world(world): return ret + def copy_dynamic_regions_and_locations(world, ret): for region in world.dynamic_regions: new_reg = Region(region.name, region.type, region.hint_text, region.player) @@ -501,7 +514,7 @@ def copy_dynamic_regions_and_locations(world, ret): if region.shop: new_reg.shop = Shop(new_reg, region.shop.room_id, region.shop.type, region.shop.shopkeeper_config, region.shop.custom, region.shop.locked) - ret.shops.append(new_reg.shop) + ret.shops[region.player].append(new_reg.shop) for location in world.dynamic_locations: new_reg = ret.get_region(location.parent_region.name, location.parent_region.player) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 46f32ff9..b48a6dc5 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -28,7 +28,13 @@ * Known issues: * Palettes aren't perfect * Some ugly colors - * Invisible floors can be see in many palettes + * Invisible floors can be see in many palettes + +## Shopsanity + +--shopsanity added. This adds 29 shop locations (9 more in retro) to the general and location pool. + +** **Todo** **: add more info here. ## Key Drop Shuffle diff --git a/Regions.py b/Regions.py index fb991200..ee251a18 100644 --- a/Regions.py +++ b/Regions.py @@ -1,4 +1,5 @@ import collections +from Items import ItemFactory from BaseClasses import Region, Location, Entrance, RegionType, Shop, ShopType @@ -38,7 +39,7 @@ def create_regions(world, player): create_cave_region(player, 'Bush Covered House', 'the grass man'), create_cave_region(player, 'Tavern (Front)', 'the tavern'), create_cave_region(player, 'Light World Bomb Hut', 'a restock room'), - create_cave_region(player, 'Kakariko Shop', 'a common shop'), + create_cave_region(player, 'Kakariko Shop', 'a common shop', ['Kakariko Shop - Left', 'Kakariko Shop - Middle', 'Kakariko Shop - Right']), create_cave_region(player, 'Fortune Teller (Light)', 'a fortune teller'), create_cave_region(player, 'Lake Hylia Fortune Teller', 'a fortune teller'), create_cave_region(player, 'Lumberjack House', 'a boring house'), @@ -78,14 +79,14 @@ def create_regions(world, player): create_cave_region(player, 'Ice Rod Cave', 'a cave with a chest', ['Ice Rod Cave']), create_cave_region(player, 'Good Bee Cave', 'a cold bee'), create_cave_region(player, '20 Rupee Cave', 'a cave with some cash'), - create_cave_region(player, 'Cave Shop (Lake Hylia)', 'a common shop'), - create_cave_region(player, 'Cave Shop (Dark Death Mountain)', 'a common shop'), + create_cave_region(player, 'Cave Shop (Lake Hylia)', 'a common shop', ['Lake Hylia Shop - Left', 'Lake Hylia Shop - Middle', 'Lake Hylia Shop - Right']), + create_cave_region(player, 'Cave Shop (Dark Death Mountain)', 'a common shop', ['Dark Death Mountain Shop - Left', 'Dark Death Mountain Shop - Middle', 'Dark Death Mountain Shop - Right']), create_cave_region(player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']), create_cave_region(player, 'Library', 'the library', ['Library']), create_cave_region(player, 'Kakariko Gamble Game', 'a game of chance'), create_cave_region(player, 'Potion Shop', 'the potion shop', ['Potion Shop']), create_lw_region(player, 'Lake Hylia Island', ['Lake Hylia Island']), - create_cave_region(player, 'Capacity Upgrade', 'the queen of fairies'), + create_cave_region(player, 'Capacity Upgrade', 'the queen of fairies', ['Capacity Upgrade - Left', 'Capacity Upgrade - Right']), create_cave_region(player, 'Two Brothers House', 'a connector', None, ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']), create_lw_region(player, 'Maze Race Ledge', ['Maze Race'], ['Two Brothers House (West)']), create_cave_region(player, '50 Rupee Cave', 'a cave with some cash'), @@ -122,7 +123,7 @@ def create_regions(world, player): 'Paradox Cave Upper - Right'], ['Paradox Cave Push Block', 'Paradox Cave Bomb Jump']), create_cave_region(player, 'Paradox Cave', 'a connector', None, ['Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Top)', 'Paradox Cave Drop']), - create_cave_region(player, 'Light World Death Mountain Shop', 'a common shop'), + create_cave_region(player, 'Light World Death Mountain Shop', 'a common shop', ['Paradox Shop - Left', 'Paradox Shop - Middle', 'Paradox Shop - Right']), create_lw_region(player, 'East Death Mountain (Top)', None, ['Paradox Cave (Top)', 'Death Mountain (Top)', 'Spiral Cave Ledge Access', 'East Death Mountain Drop', 'Turtle Rock Teleporter', 'Fairy Ascension Ledge']), create_lw_region(player, 'Spiral Cave Ledge', None, ['Spiral Cave', 'Spiral Cave Ledge Drop']), create_cave_region(player, 'Spiral Cave (Top)', 'a connector', ['Spiral Cave'], ['Spiral Cave (top to bottom)', 'Spiral Cave Exit (Top)']), @@ -157,16 +158,16 @@ def create_regions(world, player): create_dw_region(player, 'Hammer Peg Area', ['Dark Blacksmith Ruins'], ['Bat Cave Drop Ledge Mirror Spot', 'Dark World Hammer Peg Cave', 'Peg Area Rocks']), create_dw_region(player, 'Bumper Cave Entrance', None, ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Mirror Spot', 'Bumper Cave Entrance Drop']), create_cave_region(player, 'Fortune Teller (Dark)', 'a fortune teller'), - create_cave_region(player, 'Village of Outcasts Shop', 'a common shop'), - create_cave_region(player, 'Dark Lake Hylia Shop', 'a common shop'), - create_cave_region(player, 'Dark World Lumberjack Shop', 'a common shop'), - create_cave_region(player, 'Dark World Potion Shop', 'a common shop'), + create_cave_region(player, 'Village of Outcasts Shop', 'a common shop', ['Village of Outcasts Shop - Left', 'Village of Outcasts Shop - Middle', 'Village of Outcasts Shop - Right']), + create_cave_region(player, 'Dark Lake Hylia Shop', 'a common shop', ['Dark Lake Hylia Shop - Left', 'Dark Lake Hylia Shop - Middle', 'Dark Lake Hylia Shop - Right']), + create_cave_region(player, 'Dark World Lumberjack Shop', 'a common shop', ['Dark Lumberjack Shop - Left', 'Dark Lumberjack Shop - Middle', 'Dark Lumberjack Shop - Right']), + create_cave_region(player, 'Dark World Potion Shop', 'a common shop', ['Dark Potion Shop - Left', 'Dark Potion Shop - Middle', 'Dark Potion Shop - Right']), create_cave_region(player, 'Dark World Hammer Peg Cave', 'a cave with an item', ['Peg Cave']), create_cave_region(player, 'Pyramid Fairy', 'a cave with two chests', ['Pyramid Fairy - Left', 'Pyramid Fairy - Right']), create_cave_region(player, 'Brewery', 'a house with a chest', ['Brewery']), create_cave_region(player, 'C-Shaped House', 'a house with a chest', ['C-Shaped House']), create_cave_region(player, 'Chest Game', 'a game of 16 chests', ['Chest Game']), - create_cave_region(player, 'Red Shield Shop', 'the rare shop'), + create_cave_region(player, 'Red Shield Shop', 'the rare shop', ['Red Shield Shop - Left', 'Red Shield Shop - Middle', 'Red Shield Shop - Right']), create_cave_region(player, 'Dark Sanctuary Hint', 'a storyteller'), create_cave_region(player, 'Bumper Cave', 'a connector', None, ['Bumper Cave Exit (Bottom)', 'Bumper Cave Exit (Top)']), create_dw_region(player, 'Bumper Cave Ledge', ['Bumper Cave Ledge'], ['Bumper Cave Ledge Drop', 'Bumper Cave (Top)', 'Bumper Cave Ledge Mirror Spot']), @@ -857,6 +858,7 @@ def mark_light_world_regions(world, player): def create_shops(world, player): + world.shops[player] = [] for region_name, (room_id, type, shopkeeper, custom, locked, inventory) in shop_table.items(): if world.mode[player] == 'inverted' and region_name == 'Dark Lake Hylia Shop': locked = True @@ -864,9 +866,16 @@ def create_shops(world, player): region = world.get_region(region_name, player) shop = Shop(region, room_id, type, shopkeeper, custom, locked) region.shop = shop - world.shops.append(shop) + world.shops[player].append(shop) for index, item in enumerate(inventory): shop.add_inventory(index, *item) + if not world.shopsanity[player]: + if region_name in shop_to_location_table.keys(): + for index, location in enumerate(shop_to_location_table[region_name]): + loc = world.get_location(location, player) + loc.skip = True + loc.forced_item = loc.item = ItemFactory(shop.inventory[index]['item'], player) + loc.item.location = loc def adjust_locations(world, player): @@ -909,6 +918,29 @@ shop_table = { 'Capacity Upgrade': (0x0115, ShopType.UpgradeShop, 0x04, True, True, [('Bomb Upgrade (+5)', 100, 7), ('Arrow Upgrade (+5)', 100, 7)]) } + +shop_to_location_table = { + 'Cave Shop (Dark Death Mountain)': ['Dark Death Mountain Shop - Left', 'Dark Death Mountain Shop - Middle', 'Dark Death Mountain Shop - Right'], + 'Red Shield Shop': ['Red Shield Shop - Left', 'Red Shield Shop - Middle', 'Red Shield Shop - Right'], + 'Dark Lake Hylia Shop': ['Dark Lake Hylia Shop - Left', 'Dark Lake Hylia Shop - Middle', 'Dark Lake Hylia Shop - Right'], + 'Dark World Lumberjack Shop': ['Dark Lumberjack Shop - Left', 'Dark Lumberjack Shop - Middle', 'Dark Lumberjack Shop - Right'], + 'Village of Outcasts Shop': ['Village of Outcasts Shop - Left', 'Village of Outcasts Shop - Middle', 'Village of Outcasts Shop - Right'], + 'Dark World Potion Shop': ['Dark Potion Shop - Left', 'Dark Potion Shop - Middle', 'Dark Potion Shop - Right'], + 'Light World Death Mountain Shop': ['Paradox Shop - Left', 'Paradox Shop - Middle', 'Paradox Shop - Right'], + 'Kakariko Shop': ['Kakariko Shop - Left', 'Kakariko Shop - Middle', 'Kakariko Shop - Right'], + 'Cave Shop (Lake Hylia)': ['Lake Hylia Shop - Left', 'Lake Hylia Shop - Middle', 'Lake Hylia Shop - Right'], + 'Capacity Upgrade': ['Capacity Upgrade - Left', 'Capacity Upgrade - Right'], +} + +retro_shops = { + 'Old Man Sword Cave': ['Old Man Sword Cave Item 1'], + 'Take-Any #1': ['Take-Any #1 Item 1', 'Take-Any #1 Item 2'], + 'Take-Any #2': ['Take-Any #2 Item 1', 'Take-Any #2 Item 2'], + 'Take-Any #3': ['Take-Any #3 Item 1', 'Take-Any #3 Item 2'], + 'Take-Any #4': ['Take-Any #4 Item 1', 'Take-Any #4 Item 2'], +} + + key_drop_data = { 'Hyrule Castle - Map Guard Key Drop': [0x140036, 0x140037, 'in Hyrule Castle', 'Small Key (Escape)'], 'Hyrule Castle - Boomerang Guard Key Drop': [0x140033, 0x140034, 'in Hyrule Castle', 'Small Key (Escape)'], @@ -1202,7 +1234,37 @@ location_table = {'Mushroom': (0x180013, 0x186338, False, 'in the woods'), 'Skull Woods - Prize': ([0x120A3, 0x53F12, 0x53F13, 0x180058, 0x18007B, 0xC704], None, True, 'Skull Woods'), 'Ice Palace - Prize': ([0x120A4, 0x53F5A, 0x53F5B, 0x180059, 0x180073, 0xC705], None, True, 'Ice Palace'), 'Misery Mire - Prize': ([0x120A2, 0x53F48, 0x53F49, 0x180057, 0x180075, 0xC703], None, True, 'Misery Mire'), - 'Turtle Rock - Prize': ([0x120A7, 0x53F24, 0x53F25, 0x18005C, 0x180079, 0xC708], None, True, 'Turtle Rock')} + 'Turtle Rock - Prize': ([0x120A7, 0x53F24, 0x53F25, 0x18005C, 0x180079, 0xC708], None, True, 'Turtle Rock'), + 'Kakariko Shop - Left': (None, None, False, 'for sale in Kakariko'), + 'Kakariko Shop - Middle': (None, None, False, 'for sale in Kakariko'), + 'Kakariko Shop - Right': (None, None, False, 'for sale in Kakariko'), + 'Lake Hylia Shop - Left': (None, None, False, 'for sale near the lake'), + 'Lake Hylia Shop - Middle': (None, None, False, 'for sale near the lake'), + 'Lake Hylia Shop - Right': (None, None, False, 'for sale near the lake'), + 'Paradox Shop - Left': (None, None, False, 'for sale near seven chests'), + 'Paradox Shop - Middle': (None, None, False, 'for sale near seven chests'), + 'Paradox Shop - Right': (None, None, False, 'for sale near seven chests'), + 'Capacity Upgrade - Left': (None, None, False, 'for sale near the queen'), + 'Capacity Upgrade - Right': (None, None, False, 'for sale near the queen'), + 'Village of Outcasts Shop - Left': (None, None, False, 'for sale near outcasts'), + 'Village of Outcasts Shop - Middle': (None, None, False, 'for sale near outcasts'), + 'Village of Outcasts Shop - Right': (None, None, False, 'for sale near outcasts'), + 'Dark Lumberjack Shop - Left': (None, None, False, 'for sale in the far north'), + 'Dark Lumberjack Shop - Middle': (None, None, False, 'for sale in the far north'), + 'Dark Lumberjack Shop - Right': (None, None, False, 'for sale in the far north'), + 'Dark Lake Hylia Shop - Left': (None, None, False, 'for sale near the dark lake'), + 'Dark Lake Hylia Shop - Middle': (None, None, False, 'for sale near the dark lake'), + 'Dark Lake Hylia Shop - Right': (None, None, False, 'for sale near the dark lake'), + 'Dark Potion Shop - Left': (None, None, False, 'for sale near a catfish'), + 'Dark Potion Shop - Middle': (None, None, False, 'for sale near a catfish'), + 'Dark Potion Shop - Right': (None, None, False, 'for sale near a catfish'), + 'Dark Death Mountain Shop - Left': (None, None, False, 'for sale on the dark mountain'), + 'Dark Death Mountain Shop - Middle': (None, None, False, 'for sale on the dark mountain'), + 'Dark Death Mountain Shop - Right': (None, None, False, 'for sale on the dark mountain'), + 'Red Shield Shop - Left': (None, None, False, 'for sale as a curiosity'), + 'Red Shield Shop - Middle': (None, None, False, 'for sale as a curiosity'), + 'Red Shield Shop - Right': (None, None, False, 'for sale as a curiosity') + } lookup_id_to_name = {data[0]: name for name, data in location_table.items() if type(data[0]) == int} lookup_id_to_name = {**lookup_id_to_name, **{data[1]: name for name, data in key_drop_data.items()}} diff --git a/Rom.py b/Rom.py index 620470e9..4d24a0c7 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '185a0f74ab0e2ce8899c8d7d309ca68c' +RANDOMIZERBASEHASH = '7264ffb7c430dde5d6bfe6030b79a575' class JsonRom(object): @@ -1493,7 +1493,7 @@ def patch_race_rom(rom): RaceRom.encrypt(rom) def write_custom_shops(rom, world, player): - shops = [shop for shop in world.shops if shop.custom and shop.region.player == player] + shops = [shop for shop in world.shops[player] if shop.custom and shop.region.player == player] shop_data = bytearray() items_data = bytearray() diff --git a/data/base2current.bps b/data/base2current.bps index 61323175649e7f91ca4f97404fb5a9657034ca8d..c0d427e88d6a9a8fd8616fdbae990a34d1d21e78 100644 GIT binary patch delta 11079 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 YmJN|Jm$@~7@8H>AYO(A*^5N_M1K}I4x&QzG delta 11088 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 Date: Mon, 7 Dec 2020 14:01:04 -0700 Subject: [PATCH 2/4] Inverted shopsanity Randomize shopkeepers One other fix --- InvertedRegions.py | 20 ++++++++++---------- ItemList.py | 7 +++++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/InvertedRegions.py b/InvertedRegions.py index 9e439093..ed70103f 100644 --- a/InvertedRegions.py +++ b/InvertedRegions.py @@ -51,7 +51,7 @@ def create_inverted_regions(world, player): create_cave_region(player, 'Bush Covered House', 'the grass man'), create_cave_region(player, 'Tavern (Front)', 'the tavern'), create_cave_region(player, 'Light World Bomb Hut', 'a restock room'), - create_cave_region(player, 'Kakariko Shop', 'a common shop'), + create_cave_region(player, 'Kakariko Shop', 'a common shop', ['Kakariko Shop - Left', 'Kakariko Shop - Middle', 'Kakariko Shop - Right']), create_cave_region(player, 'Fortune Teller (Light)', 'a fortune teller'), create_cave_region(player, 'Lake Hylia Fortune Teller', 'a fortune teller'), create_cave_region(player, 'Lumberjack House', 'a boring house'), @@ -89,14 +89,14 @@ def create_inverted_regions(world, player): create_cave_region(player, 'Ice Rod Cave', 'a cave with a chest', ['Ice Rod Cave']), create_cave_region(player, 'Good Bee Cave', 'a cold bee'), create_cave_region(player, '20 Rupee Cave', 'a cave with some cash'), - create_cave_region(player, 'Cave Shop (Lake Hylia)', 'a common shop'), - create_cave_region(player, 'Cave Shop (Dark Death Mountain)', 'a common shop'), + create_cave_region(player, 'Cave Shop (Lake Hylia)', 'a common shop', ['Lake Hylia Shop - Left', 'Lake Hylia Shop - Middle', 'Lake Hylia Shop - Right']), + create_cave_region(player, 'Cave Shop (Dark Death Mountain)', 'a common shop', ['Dark Death Mountain Shop - Left', 'Dark Death Mountain Shop - Middle', 'Dark Death Mountain Shop - Right']), create_cave_region(player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']), create_cave_region(player, 'Library', 'the library', ['Library']), create_cave_region(player, 'Kakariko Gamble Game', 'a game of chance'), create_cave_region(player, 'Potion Shop', 'the potion shop', ['Potion Shop']), create_lw_region(player, 'Lake Hylia Island', ['Lake Hylia Island']), - create_cave_region(player, 'Capacity Upgrade', 'the queen of fairies'), + create_cave_region(player, 'Capacity Upgrade', 'the queen of fairies', ['Capacity Upgrade - Left', 'Capacity Upgrade - Right']), create_cave_region(player, 'Two Brothers House', 'a connector', None, ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']), create_lw_region(player, 'Maze Race Ledge', ['Maze Race'], ['Two Brothers House (West)', 'Maze Race Mirror Spot']), create_cave_region(player, '50 Rupee Cave', 'a cave with some cash'), @@ -131,7 +131,7 @@ def create_inverted_regions(world, player): 'Paradox Cave Upper - Right'], ['Paradox Cave Push Block', 'Paradox Cave Bomb Jump']), create_cave_region(player, 'Paradox Cave', 'a connector', None, ['Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Top)', 'Paradox Cave Drop']), - create_cave_region(player, 'Light World Death Mountain Shop', 'a common shop'), + create_cave_region(player, 'Light World Death Mountain Shop', 'a common shop', ['Paradox Shop - Left', 'Paradox Shop - Middle', 'Paradox Shop - Right']), create_lw_region(player, 'East Death Mountain (Top)', ['Floating Island'], ['Paradox Cave (Top)', 'Death Mountain (Top)', 'Spiral Cave Ledge Access', 'East Death Mountain Drop', 'East Death Mountain Mirror Spot (Top)', 'Fairy Ascension Ledge Access', 'Mimic Cave Ledge Access', 'Floating Island Mirror Spot']), create_lw_region(player, 'Spiral Cave Ledge', None, ['Spiral Cave', 'Spiral Cave Ledge Drop', 'Dark Death Mountain Ledge Mirror Spot (West)']), @@ -168,16 +168,16 @@ def create_inverted_regions(world, player): create_dw_region(player, 'Hammer Peg Area', ['Dark Blacksmith Ruins'], ['Dark World Hammer Peg Cave', 'Peg Area Rocks', 'Hammer Peg Area Flute']), create_dw_region(player, 'Bumper Cave Entrance', None, ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Drop']), create_cave_region(player, 'Fortune Teller (Dark)', 'a fortune teller'), - create_cave_region(player, 'Village of Outcasts Shop', 'a common shop'), - create_cave_region(player, 'Dark Lake Hylia Shop', 'a common shop'), - create_cave_region(player, 'Dark World Lumberjack Shop', 'a common shop'), - create_cave_region(player, 'Dark World Potion Shop', 'a common shop'), + create_cave_region(player, 'Village of Outcasts Shop', 'a common shop', ['Village of Outcasts Shop - Left', 'Village of Outcasts Shop - Middle', 'Village of Outcasts Shop - Right']), + create_cave_region(player, 'Dark Lake Hylia Shop', 'a common shop', ['Dark Lake Hylia Shop - Left', 'Dark Lake Hylia Shop - Middle', 'Dark Lake Hylia Shop - Right']), + create_cave_region(player, 'Dark World Lumberjack Shop', 'a common shop', ['Dark Lumberjack Shop - Left', 'Dark Lumberjack Shop - Middle', 'Dark Lumberjack Shop - Right']), + create_cave_region(player, 'Dark World Potion Shop', 'a common shop', ['Dark Potion Shop - Left', 'Dark Potion Shop - Middle', 'Dark Potion Shop - Right']), create_cave_region(player, 'Dark World Hammer Peg Cave', 'a cave with an item', ['Peg Cave']), create_cave_region(player, 'Pyramid Fairy', 'a cave with two chests', ['Pyramid Fairy - Left', 'Pyramid Fairy - Right']), create_cave_region(player, 'Brewery', 'a house with a chest', ['Brewery']), create_cave_region(player, 'C-Shaped House', 'a house with a chest', ['C-Shaped House']), create_cave_region(player, 'Chest Game', 'a game of 16 chests', ['Chest Game']), - create_cave_region(player, 'Red Shield Shop', 'the rare shop'), + create_cave_region(player, 'Red Shield Shop', 'the rare shop', ['Red Shield Shop - Left', 'Red Shield Shop - Middle', 'Red Shield Shop - Right']), create_cave_region(player, 'Inverted Dark Sanctuary', 'a storyteller', None, ['Inverted Dark Sanctuary Exit']), create_cave_region(player, 'Bumper Cave', 'a connector', None, ['Bumper Cave Exit (Bottom)', 'Bumper Cave Exit (Top)']), create_dw_region(player, 'Skull Woods Forest', None, ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)', 'Skull Woods First Section Hole (North)', diff --git a/ItemList.py b/ItemList.py index aa93602b..6f4c172c 100644 --- a/ItemList.py +++ b/ItemList.py @@ -540,7 +540,10 @@ def customize_shops(world, player): shop.add_inventory(idx, item.name, randomize_price(price), max_repeat) if item.name in cap_replacements and shop_name not in retro_shops: possible_replacements.append((shop, idx, location, item)) - # todo: randomize shopkeeper + # randomize shopkeeper + if shop_name != 'Capacity Upgrade': + shopkeeper = random.choice([0xC1, 0xA0, 0xE2, 0xE3]) + shop.shopkeeper_config = shopkeeper # handle capacity upgrades - randomly choose a bomb bunch or arrow bunch to become capacity upgrades if not found_bomb_upgrade and len(possible_replacements) > 0: choices = [] @@ -582,7 +585,7 @@ def randomize_price(price): def change_shop_items_to_rupees(world, player, shops): locations = world.get_filled_locations(player) for location in locations: - if location.item.name in shop_transfer.keys() and location.parent_region not in shops: + if location.item.name in shop_transfer.keys() and location.parent_region.name not in shops: new_item = ItemFactory(shop_transfer[location.item.name], location.item.player) location.item = new_item From b5f3c752e600c66e2920b70f831a48e7ce312411 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 1 Feb 2021 09:57:20 -0700 Subject: [PATCH 3/4] Shop work: - Potion shop - Cap Fairy blacklist - Item counter increased over 255 - Inverted work - Static sram for shops - Price adjustments (and discounts) --- BaseClasses.py | 19 +++-- Fill.py | 39 ++++++--- InvertedRegions.py | 37 ++++++++- ItemList.py | 49 +++++++++--- Items.py | 178 +++++++++++++++++++++--------------------- Main.py | 12 ++- MultiClient.py | 26 +++++- Regions.py | 44 +++++++---- Rom.py | 41 ++++++---- asm/hudadditions.asm | 2 +- data/base2current.bps | Bin 131159 -> 131582 bytes 11 files changed, 292 insertions(+), 155 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 588ff955..a428b19b 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1739,7 +1739,7 @@ class ShopType(Enum): UpgradeShop = 2 class Shop(object): - def __init__(self, region, room_id, type, shopkeeper_config, custom, locked): + def __init__(self, region, room_id, type, shopkeeper_config, custom, locked, sram_address): self.region = region self.room_id = room_id self.type = type @@ -1747,6 +1747,7 @@ class Shop(object): self.shopkeeper_config = shopkeeper_config self.custom = custom self.locked = locked + self.sram_address = sram_address @property def item_count(self): @@ -1763,11 +1764,11 @@ class Shop(object): door_id = door_addresses[entrances[0].name][0]+1 else: door_id = 0 - config |= 0x40 # ignore door id + config |= 0x40 # ignore door id if self.type == ShopType.TakeAny: config |= 0x80 if self.type == ShopType.UpgradeShop: - config |= 0x10 # Alt. VRAM + config |= 0x10 # Alt. VRAM return [0x00]+int16_as_bytes(self.room_id)+[door_id, 0x00, config, self.shopkeeper_config, 0x00] def has_unlimited(self, item): @@ -1783,14 +1784,16 @@ class Shop(object): def clear_inventory(self): self.inventory = [None, None, None] - def add_inventory(self, slot, item, price, max=0, replacement=None, replacement_price=0, create_location=False): + def add_inventory(self, slot: int, item, price, max=0, replacement=None, replacement_price=0, + create_location=False, player=0): self.inventory[slot] = { 'item': item, 'price': price, 'max': max, 'replacement': replacement, 'replacement_price': replacement_price, - 'create_location': create_location + 'create_location': create_location, + 'player': player } @@ -1885,8 +1888,10 @@ class Spoiler(object): for index, item in enumerate(shop.inventory): if item is None: continue - # todo: indicate player? might be fine - shopdata[f'item_{index}'] = f"{item['item']} — {item['price']}" if item['price'] else item['item'] + if self.world.players == 1: + shopdata[f'item_{index}'] = f"{item['item']} — {item['price']}" if item['price'] else item['item'] + else: + shopdata[f'item_{index}'] = f"{item['item']} (Player {item['player']}) — {item['price']}" self.shops.append(shopdata) for player in range(1, self.world.players + 1): diff --git a/Fill.py b/Fill.py index a4fe672f..d7bbcd75 100644 --- a/Fill.py +++ b/Fill.py @@ -2,7 +2,7 @@ import random import logging from BaseClasses import CollectionState -from Regions import shop_to_location_table +from Regions import shop_to_location_table, retro_shops class FillError(RuntimeError): @@ -376,18 +376,33 @@ def flood_items(world): break -def sell_keys(world, player): - choices = [] - shop_map = {} +def sell_potions(world, player): + loc_choices = [] for shop in world.shops[player]: - if shop.region.name in shop_to_location_table: - choices.append(shop.region.name) - shop_map[shop.region.name] = shop - key_seller = random.choice(choices) - location = random.choice(shop_to_location_table[key_seller]) - universal_key = next(item for item in world.itempool if item.name == 'Small Key (Universal)' and item.player == player) - world.push_item(world.get_location(location, player), universal_key, collect=False) - shop_map[key_seller].add_inventory(0, 'Small Key (Universal)', 100) # will be fixed later in customize shops + # potions are excluded from the cap fairy due to visual problem + if shop.region.name in shop_to_location_table and shop.region.name != 'Capacity Upgrade': + loc_choices += [world.get_location(loc, player) for loc in shop_to_location_table[shop.region.name]] + if world.retro[player] and shop.region.name in retro_shops: + loc_choices += [world.get_location(loc, player) for loc in retro_shops[shop.region.name]] + locations = [loc for loc in loc_choices if not loc.item] + for potion in ['Green Potion', 'Blue Potion', 'Red Potion']: + location = random.choice(locations) + locations.remove(location) + p_item = next(item for item in world.itempool if item.name == potion and item.player == player) + world.push_item(location, p_item, collect=False) + world.itempool.remove(p_item) + + +def sell_keys(world, player): + # exclude the old man or take any caves because free keys are too good + shop_names = [shop.region.name for shop in world.shops[player] if shop.region.name in shop_to_location_table] + choices = [world.get_location(loc, player) for shop in shop_names for loc in shop_to_location_table[shop]] + locations = [loc for loc in choices if not loc.item] + location = random.choice(locations) + universal_key = next(i for i in world.itempool if i.name == 'Small Key (Universal)' and i.player == player) + world.push_item(location, universal_key, collect=False) + # seems unnecessary + # shop_map[key_seller].add_inventory(0, 'Small Key (Universal)', 100) # will be fixed later in customize shops world.itempool.remove(universal_key) diff --git a/InvertedRegions.py b/InvertedRegions.py index ed70103f..4ae0bbdb 100644 --- a/InvertedRegions.py +++ b/InvertedRegions.py @@ -94,7 +94,7 @@ def create_inverted_regions(world, player): create_cave_region(player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']), create_cave_region(player, 'Library', 'the library', ['Library']), create_cave_region(player, 'Kakariko Gamble Game', 'a game of chance'), - create_cave_region(player, 'Potion Shop', 'the potion shop', ['Potion Shop']), + create_cave_region(player, 'Potion Shop', 'the potion shop', ['Potion Shop', 'Potion Shop - Left', 'Potion Shop - Middle', 'Potion Shop - Right']), create_lw_region(player, 'Lake Hylia Island', ['Lake Hylia Island']), create_cave_region(player, 'Capacity Upgrade', 'the queen of fairies', ['Capacity Upgrade - Left', 'Capacity Upgrade - Right']), create_cave_region(player, 'Two Brothers House', 'a connector', None, ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']), @@ -473,4 +473,37 @@ location_table = {'Mushroom': (0x180013, 0x186338, False, 'in the woods'), 'Skull Woods - Prize': ([0x120A3, 0x53F12, 0x53F13, 0x180058, 0x18007B, 0xC704], None, True, 'Skull Woods'), 'Ice Palace - Prize': ([0x120A4, 0x53F5A, 0x53F5B, 0x180059, 0x180073, 0xC705], None, True, 'Ice Palace'), 'Misery Mire - Prize': ([0x120A2, 0x53F48, 0x53F49, 0x180057, 0x180075, 0xC703], None, True, 'Misery Mire'), - 'Turtle Rock - Prize': ([0x120A7, 0x53F24, 0x53F25, 0x18005C, 0x180079, 0xC708], None, True, 'Turtle Rock')} + 'Turtle Rock - Prize': ([0x120A7, 0x53F24, 0x53F25, 0x18005C, 0x180079, 0xC708], None, True, 'Turtle Rock'), + 'Kakariko Shop - Left': (None, None, False, 'for sale in Kakariko'), + 'Kakariko Shop - Middle': (None, None, False, 'for sale in Kakariko'), + 'Kakariko Shop - Right': (None, None, False, 'for sale in Kakariko'), + 'Lake Hylia Shop - Left': (None, None, False, 'for sale near the lake'), + 'Lake Hylia Shop - Middle': (None, None, False, 'for sale near the lake'), + 'Lake Hylia Shop - Right': (None, None, False, 'for sale near the lake'), + 'Paradox Shop - Left': (None, None, False, 'for sale near seven chests'), + 'Paradox Shop - Middle': (None, None, False, 'for sale near seven chests'), + 'Paradox Shop - Right': (None, None, False, 'for sale near seven chests'), + 'Capacity Upgrade - Left': (None, None, False, 'for sale near the queen'), + 'Capacity Upgrade - Right': (None, None, False, 'for sale near the queen'), + 'Village of Outcasts Shop - Left': (None, None, False, 'for sale near outcasts'), + 'Village of Outcasts Shop - Middle': (None, None, False, 'for sale near outcasts'), + 'Village of Outcasts Shop - Right': (None, None, False, 'for sale near outcasts'), + 'Dark Lumberjack Shop - Left': (None, None, False, 'for sale in the far north'), + 'Dark Lumberjack Shop - Middle': (None, None, False, 'for sale in the far north'), + 'Dark Lumberjack Shop - Right': (None, None, False, 'for sale in the far north'), + 'Dark Lake Hylia Shop - Left': (None, None, False, 'for sale near the dark lake'), + 'Dark Lake Hylia Shop - Middle': (None, None, False, 'for sale near the dark lake'), + 'Dark Lake Hylia Shop - Right': (None, None, False, 'for sale near the dark lake'), + 'Dark Potion Shop - Left': (None, None, False, 'for sale near a catfish'), + 'Dark Potion Shop - Middle': (None, None, False, 'for sale near a catfish'), + 'Dark Potion Shop - Right': (None, None, False, 'for sale near a catfish'), + 'Dark Death Mountain Shop - Left': (None, None, False, 'for sale on the dark mountain'), + 'Dark Death Mountain Shop - Middle': (None, None, False, 'for sale on the dark mountain'), + 'Dark Death Mountain Shop - Right': (None, None, False, 'for sale on the dark mountain'), + 'Red Shield Shop - Left': (None, None, False, 'for sale as a curiosity'), + 'Red Shield Shop - Middle': (None, None, False, 'for sale as a curiosity'), + 'Red Shield Shop - Right': (None, None, False, 'for sale as a curiosity'), + 'Potion Shop - Left': (None, None, False, 'for sale near the witch'), + 'Potion Shop - Middle': (None, None, False, 'for sale near the witch'), + 'Potion Shop - Right': (None, None, False, 'for sale near the witch'), + } diff --git a/ItemList.py b/ItemList.py index 7d914774..1b062152 100644 --- a/ItemList.py +++ b/ItemList.py @@ -1,5 +1,6 @@ from collections import namedtuple import logging +import math import random from BaseClasses import Region, RegionType, Shop, ShopType, Location @@ -394,7 +395,7 @@ def set_up_take_anys(world, player): entrance = world.get_region(reg, player).entrances[0] connect_entrance(world, entrance, old_man_take_any, player) entrance.target = 0x58 - old_man_take_any.shop = Shop(old_man_take_any, 0x0112, ShopType.TakeAny, 0xE2, True, not world.shopsanity[player]) + old_man_take_any.shop = Shop(old_man_take_any, 0x0112, ShopType.TakeAny, 0xE2, True, not world.shopsanity[player], 32) world.shops[player].append(old_man_take_any.shop) sword = next((item for item in world.itempool if item.type == 'Sword' and item.player == player), None) @@ -418,7 +419,7 @@ def set_up_take_anys(world, player): entrance = world.get_region(reg, player).entrances[0] connect_entrance(world, entrance, take_any, player) entrance.target = target - take_any.shop = Shop(take_any, room_id, take_any_type, 0xE3, True, not world.shopsanity[player]) + take_any.shop = Shop(take_any, room_id, take_any_type, 0xE3, True, not world.shopsanity[player], 33 + num*2) world.shops[player].append(take_any.shop) take_any.shop.add_inventory(0, 'Blue Potion', 0, 0, create_location=world.shopsanity[player]) take_any.shop.add_inventory(1, 'Boss Heart Container', 0, 0, create_location=world.shopsanity[player]) @@ -524,7 +525,7 @@ def customize_shops(world, player): if shop_name not in retro_shops: if item.name in repeatable_shop_items: max_repeat = 0 - if item.name in ['Bomb Upgrade (+5)', 'Arrow Upgrade (+5)']: + if item.name in ['Bomb Upgrade (+5)', 'Arrow Upgrade (+5)'] and item.player == player: if item.name == 'Bomb Upgrade (+5)': found_bomb_upgrade = True if item.name == 'Arrow Upgrade (+5)': @@ -536,8 +537,8 @@ def customize_shops(world, player): price = 120 if shop_name == 'Potion Shop' and item.name == 'Red Potion' else item.price if world.retro[player] and item.name == 'Single Arrow': price = 80 - # randomize price - shop.add_inventory(idx, item.name, randomize_price(price), max_repeat) + # randomize price + shop.add_inventory(idx, item.name, randomize_price(price), max_repeat, player=item.player) if item.name in cap_replacements and shop_name not in retro_shops: possible_replacements.append((shop, idx, location, item)) # randomize shopkeeper @@ -554,7 +555,7 @@ def customize_shops(world, player): shop, idx, loc, item = random.choice(choices) upgrade = ItemFactory('Bomb Upgrade (+5)', player) shop.add_inventory(idx, upgrade.name, randomize_price(upgrade.price), 6, - item.name, randomize_price(item.price)) + item.name, randomize_price(item.price), player=item.player) loc.item = upgrade upgrade.location = loc if not found_arrow_upgrade and len(possible_replacements) > 0: @@ -566,10 +567,11 @@ def customize_shops(world, player): shop, idx, loc, item = random.choice(choices) upgrade = ItemFactory('Arrow Upgrade (+5)', player) shop.add_inventory(idx, upgrade.name, randomize_price(upgrade.price), 6, - item.name, randomize_price(item.price)) + item.name, randomize_price(item.price), player=item.player) loc.item = upgrade upgrade.location = loc change_shop_items_to_rupees(world, player, shops_to_customize) + todays_discounts(world, player) def randomize_price(price): @@ -579,7 +581,13 @@ def randomize_price(price): max_price //= 5 return random.randint(0, max_price) * 5 + half_price else: - return price + if price <= 10: + return price + else: + half_price = int(math.ceil(half_price / 10.0)) * 10 + max_price = price - half_price + max_price //= 5 + return random.randint(0, max_price) * 5 + half_price def change_shop_items_to_rupees(world, player, shops): @@ -588,17 +596,38 @@ def change_shop_items_to_rupees(world, player, shops): if location.item.name in shop_transfer.keys() and location.parent_region.name not in shops: new_item = ItemFactory(shop_transfer[location.item.name], location.item.player) location.item = new_item + if location.parent_region.name == 'Capacity Upgrade' and location.item.name in cap_blacklist: + new_item = ItemFactory('Rupees (300)', location.item.player) + location.item = new_item + shop = world.get_region('Capacity Upgrade', player).shop + slot = shop_to_location_table['Capacity Upgrade'].index(location.name) + shop.add_inventory(slot, new_item.name, randomize_price(new_item.price), 1, player=new_item.player) + + +def todays_discounts(world, player): + locs = [] + for shop, locations in shop_to_location_table.items(): + for slot, loc in enumerate(locations): + locs.append((world.get_location(loc, player), shop, slot)) + discount_number = random.randint(4, 7) + chosen_locations = random.choices(locs, k=discount_number) + for location, shop_name, slot in chosen_locations: + shop = world.get_region(shop_name, player).shop + orig = location.item.price + shop.inventory[slot]['price'] = randomize_price(orig // 10) repeatable_shop_items = ['Single Arrow', 'Arrows (10)', 'Bombs (3)', 'Bombs (10)', 'Red Potion', 'Small Heart', - 'Blue Shield', 'Red Shield', 'Bee', 'Small Key (Universal)'] + 'Blue Shield', 'Red Shield', 'Bee', 'Small Key (Universal)', 'Blue Potion', 'Green Potion'] cap_replacements = ['Single Arrow', 'Arrows (10)', 'Bombs (3)', 'Bombs (10)'] +cap_blacklist = ['Green Potion', 'Red Potion', 'Blue Potion'] + shop_transfer = {'Red Potion': 'Rupees (100)', 'Bee': 'Rupees (5)', 'Blue Potion': 'Rupees (100)', - 'Blue Shield': 'Rupees (50)', 'Red Shield': 'Rupees (300)'} + 'Blue Shield': 'Rupees (50)', 'Red Shield': 'Rupees (300)', 'Green Potion': 'Rupees (50)'} def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, swords, retro, door_shuffle): diff --git a/Items.py b/Items.py index e5d91d4a..1ed849e1 100644 --- a/Items.py +++ b/Items.py @@ -23,43 +23,43 @@ def ItemFactory(items, player): # Format: Name: (Advancement, Priority, Type, ItemCode, Pedestal Hint Text, Pedestal Credit Text, Sick Kid Credit Text, Zora Credit Text, Witch Credit Text, Flute Boy Credit Text, Hint Text) -item_table = {'Bow': (True, False, None, 0x0B, 300, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'the Bow'), - 'Progressive Bow': (True, False, None, 0x64, 200, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), - 'Progressive Bow (Alt)': (True, False, None, 0x65, 200, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), - 'Book of Mudora': (True, False, None, 0x1D, 200, 'This is a\nparadox?!', 'and the story book', 'the scholarly kid', 'moon runes for sale', 'drugs for literacy', 'book-worm boy can read again', 'the Book'), - 'Hammer': (True, False, None, 0x09, 300, 'stop\nhammer time!', 'and m c hammer', 'hammer-smashing kid', 'm c hammer for sale', 'stop... hammer time', 'stop, hammer time', 'the hammer'), - 'Hookshot': (True, False, None, 0x0A, 300, 'BOING!!!\nBOING!!!\nBOING!!!', 'and the tickle beam', 'tickle-monster kid', 'tickle beam for sale', 'witch and tickle boy', 'beam boy tickles again', 'the Hookshot'), - 'Magic Mirror': (True, False, None, 0x1A, 300, 'Isn\'t your\nreflection so\npretty?', 'the face reflector', 'the narcissistic kid', 'your face for sale', 'trades looking-glass', 'narcissistic boy is happy again', 'the Mirror'), - 'Ocarina': (True, False, None, 0x14, 300, 'Save the duck\nand fly to\nfreedom!', 'and the duck call', 'the duck-call kid', 'duck call for sale', 'duck-calls for trade', 'ocarina boy plays again', 'the Flute'), - 'Pegasus Boots': (True, False, None, 0x4B, 300, 'Gotta go fast!', 'and the sprint shoes', 'the running-man kid', 'sprint shoe for sale', 'shrooms for speed', 'gotta-go-fast boy runs again', 'the Boots'), - 'Power Glove': (True, False, None, 0x1B, 150, 'Now you can\nlift weak\nstuff!', 'and the grey mittens', 'body-building kid', 'lift glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'the glove'), - 'Cape': (True, False, None, 0x19, 100, 'Wear this to\nbecome\ninvisible!', 'the camouflage cape', 'red riding-hood kid', 'red hood for sale', 'hood from a hood', 'dapper boy hides again', 'the cape'), - 'Mushroom': (True, False, None, 0x29, 100, 'I\'m a fun guy!\n\nI\'m a funghi!', 'and the legal drugs', 'the drug-dealing kid', 'legal drugs for sale', 'shroom swap', 'shroom boy sells drugs again', 'the mushroom'), - 'Shovel': (True, False, None, 0x13, 100, 'Can\n You\n Dig it?', 'and the spade', 'archaeologist kid', 'dirt spade for sale', 'can you dig it', 'shovel boy digs again', 'the shovel'), - 'Lamp': (True, False, None, 0x12, 200, 'Baby, baby,\nbaby.\nLight my way!', 'and the flashlight', 'light-shining kid', 'flashlight for sale', 'fungus for illumination', 'illuminated boy can see again', 'the lamp'), - 'Magic Powder': (True, False, None, 0x0D, 100, 'you can turn\nanti-faeries\ninto faeries', 'and the magic sack', 'the sack-holding kid', 'magic sack for sale', 'the witch and assistant', 'magic boy plays marbles again', 'the powder'), - 'Moon Pearl': (True, False, None, 0x1F, 300, ' Bunny Link\n be\n gone!', 'and the jaw breaker', 'fortune-telling kid', 'lunar orb for sale', 'shrooms for moon rock', 'moon boy plays ball again', 'the moon pearl'), - 'Cane of Somaria': (True, False, None, 0x15, 300, 'I make blocks\nto hold down\nswitches!', 'and the red blocks', 'the block-making kid', 'block stick for sale', 'block stick for trade', 'cane boy makes blocks again', 'the red cane'), - 'Fire Rod': (True, False, None, 0x07, 300, 'I\'m the hot\nrod. I make\nthings burn!', 'and the flamethrower', 'fire-starting kid', 'rage rod for sale', 'fungus for rage-rod', 'firestarter boy burns again', 'the fire rod'), - 'Flippers': (True, False, None, 0x1E, 300, 'fancy a swim?', 'and the toewebs', 'the swimming kid', 'finger webs for sale', 'shrooms let you swim', 'swimming boy swims again', 'the flippers'), - 'Ice Rod': (True, False, None, 0x08, 300, 'I\'m the cold\nrod. I make\nthings freeze!', 'and the freeze ray', 'the ice-bending kid', 'freeze ray for sale', 'fungus for ice-rod', 'ice-cube boy freezes again', 'the ice rod'), - 'Titans Mitts': (True, False, None, 0x1C, 300, 'Now you can\nlift heavy\nstuff!', 'and the golden glove', 'body-building kid', 'carry glove for sale', 'fungus for bling-gloves', 'body-building boy has gold again', 'the mitts'), - 'Bombos': (True, False, None, 0x0F, 200, 'Burn, baby,\nburn! Fear my\nring of fire!', 'and the swirly coin', 'coin-collecting kid', 'swirly coin for sale', 'shrooms for swirly-coin', 'medallion boy melts room again', 'Bombos'), - 'Ether': (True, False, None, 0x10, 200, 'This magic\ncoin freezes\neverything!', 'and the bolt coin', 'coin-collecting kid', 'bolt coin for sale', 'shrooms for bolt-coin', 'medallion boy sees floor again', 'Ether'), - 'Quake': (True, False, None, 0x11, 200, 'Maxing out the\nRichter scale\nis what I do!', 'and the wavy coin', 'coin-collecting kid', 'wavy coin for sale', 'shrooms for wavy-coin', 'medallion boy shakes dirt again', 'Quake'), - 'Bottle': (True, False, None, 0x16, 100, 'Now you can\nstore potions\nand stuff!', 'and the terrarium', 'the terrarium kid', 'terrarium for sale', 'special promotion', 'bottle boy has terrarium again', 'a Bottle'), - 'Bottle (Red Potion)': (True, False, None, 0x2B, 130, 'Hearty red goop!', 'and the red goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has red goo again', 'a Bottle'), - 'Bottle (Green Potion)': (True, False, None, 0x2C, 110, 'Refreshing green goop!', 'and the green goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has green goo again', 'a Bottle'), - 'Bottle (Blue Potion)': (True, False, None, 0x2D, 160, 'Delicious blue goop!', 'and the blue goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has blue goo again', 'a Bottle'), - 'Bottle (Fairy)': (True, False, None, 0x3D, 150, 'Save me and I will revive you', 'and the captive', 'the tingle kid', 'hostage for sale', 'fairy dust and shrooms', 'bottle boy has friend again', 'a Bottle'), - 'Bottle (Bee)': (True, False, None, 0x3C, 100, 'I will sting your foes a few times', 'and the sting buddy', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has mad bee again', 'a Bottle'), - 'Bottle (Good Bee)': (True, False, None, 0x48, 110, 'I will sting your foes a whole lot!', 'and the sparkle sting', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has beetor again', 'a Bottle'), - 'Master Sword': (True, False, 'Sword', 0x50, 150, 'I beat barries and pigs alike', 'and the master sword', 'sword-wielding kid', 'glow sword for sale', 'fungus for blue slasher', 'sword boy fights again', 'the Master Sword'), - 'Tempered Sword': (True, False, 'Sword', 0x02, 250, 'I stole the\nblacksmith\'s\njob!', 'the tempered sword', 'sword-wielding kid', 'flame sword for sale', 'fungus for red slasher', 'sword boy fights again', 'the Tempered Sword'), +item_table = {'Bow': (True, False, None, 0x0B, 200, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'the Bow'), + 'Progressive Bow': (True, False, None, 0x64, 100, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), + 'Progressive Bow (Alt)': (True, False, None, 0x65, 100, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), + 'Book of Mudora': (True, False, None, 0x1D, 100, 'This is a\nparadox?!', 'and the story book', 'the scholarly kid', 'moon runes for sale', 'drugs for literacy', 'book-worm boy can read again', 'the Book'), + 'Hammer': (True, False, None, 0x09, 200, 'stop\nhammer time!', 'and m c hammer', 'hammer-smashing kid', 'm c hammer for sale', 'stop... hammer time', 'stop, hammer time', 'the hammer'), + 'Hookshot': (True, False, None, 0x0A, 200, 'BOING!!!\nBOING!!!\nBOING!!!', 'and the tickle beam', 'tickle-monster kid', 'tickle beam for sale', 'witch and tickle boy', 'beam boy tickles again', 'the Hookshot'), + 'Magic Mirror': (True, False, None, 0x1A, 200, 'Isn\'t your\nreflection so\npretty?', 'the face reflector', 'the narcissistic kid', 'your face for sale', 'trades looking-glass', 'narcissistic boy is happy again', 'the Mirror'), + 'Ocarina': (True, False, None, 0x14, 200, 'Save the duck\nand fly to\nfreedom!', 'and the duck call', 'the duck-call kid', 'duck call for sale', 'duck-calls for trade', 'ocarina boy plays again', 'the Flute'), + 'Pegasus Boots': (True, False, None, 0x4B, 200, 'Gotta go fast!', 'and the sprint shoes', 'the running-man kid', 'sprint shoe for sale', 'shrooms for speed', 'gotta-go-fast boy runs again', 'the Boots'), + 'Power Glove': (True, False, None, 0x1B, 100, 'Now you can\nlift weak\nstuff!', 'and the grey mittens', 'body-building kid', 'lift glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'the glove'), + 'Cape': (True, False, None, 0x19, 50, 'Wear this to\nbecome\ninvisible!', 'the camouflage cape', 'red riding-hood kid', 'red hood for sale', 'hood from a hood', 'dapper boy hides again', 'the cape'), + 'Mushroom': (True, False, None, 0x29, 50, 'I\'m a fun guy!\n\nI\'m a funghi!', 'and the legal drugs', 'the drug-dealing kid', 'legal drugs for sale', 'shroom swap', 'shroom boy sells drugs again', 'the mushroom'), + 'Shovel': (True, False, None, 0x13, 50, 'Can\n You\n Dig it?', 'and the spade', 'archaeologist kid', 'dirt spade for sale', 'can you dig it', 'shovel boy digs again', 'the shovel'), + 'Lamp': (True, False, None, 0x12, 100, 'Baby, baby,\nbaby.\nLight my way!', 'and the flashlight', 'light-shining kid', 'flashlight for sale', 'fungus for illumination', 'illuminated boy can see again', 'the lamp'), + 'Magic Powder': (True, False, None, 0x0D, 50, 'you can turn\nanti-faeries\ninto faeries', 'and the magic sack', 'the sack-holding kid', 'magic sack for sale', 'the witch and assistant', 'magic boy plays marbles again', 'the powder'), + 'Moon Pearl': (True, False, None, 0x1F, 200, ' Bunny Link\n be\n gone!', 'and the jaw breaker', 'fortune-telling kid', 'lunar orb for sale', 'shrooms for moon rock', 'moon boy plays ball again', 'the moon pearl'), + 'Cane of Somaria': (True, False, None, 0x15, 200, 'I make blocks\nto hold down\nswitches!', 'and the red blocks', 'the block-making kid', 'block stick for sale', 'block stick for trade', 'cane boy makes blocks again', 'the red cane'), + 'Fire Rod': (True, False, None, 0x07, 200, 'I\'m the hot\nrod. I make\nthings burn!', 'and the flamethrower', 'fire-starting kid', 'rage rod for sale', 'fungus for rage-rod', 'firestarter boy burns again', 'the fire rod'), + 'Flippers': (True, False, None, 0x1E, 200, 'fancy a swim?', 'and the toewebs', 'the swimming kid', 'finger webs for sale', 'shrooms let you swim', 'swimming boy swims again', 'the flippers'), + 'Ice Rod': (True, False, None, 0x08, 200, 'I\'m the cold\nrod. I make\nthings freeze!', 'and the freeze ray', 'the ice-bending kid', 'freeze ray for sale', 'fungus for ice-rod', 'ice-cube boy freezes again', 'the ice rod'), + 'Titans Mitts': (True, False, None, 0x1C, 200, 'Now you can\nlift heavy\nstuff!', 'and the golden glove', 'body-building kid', 'carry glove for sale', 'fungus for bling-gloves', 'body-building boy has gold again', 'the mitts'), + 'Bombos': (True, False, None, 0x0F, 100, 'Burn, baby,\nburn! Fear my\nring of fire!', 'and the swirly coin', 'coin-collecting kid', 'swirly coin for sale', 'shrooms for swirly-coin', 'medallion boy melts room again', 'Bombos'), + 'Ether': (True, False, None, 0x10, 100, 'This magic\ncoin freezes\neverything!', 'and the bolt coin', 'coin-collecting kid', 'bolt coin for sale', 'shrooms for bolt-coin', 'medallion boy sees floor again', 'Ether'), + 'Quake': (True, False, None, 0x11, 100, 'Maxing out the\nRichter scale\nis what I do!', 'and the wavy coin', 'coin-collecting kid', 'wavy coin for sale', 'shrooms for wavy-coin', 'medallion boy shakes dirt again', 'Quake'), + 'Bottle': (True, False, None, 0x16, 50, 'Now you can\nstore potions\nand stuff!', 'and the terrarium', 'the terrarium kid', 'terrarium for sale', 'special promotion', 'bottle boy has terrarium again', 'a Bottle'), + 'Bottle (Red Potion)': (True, False, None, 0x2B, 70, 'Hearty red goop!', 'and the red goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has red goo again', 'a Bottle'), + 'Bottle (Green Potion)': (True, False, None, 0x2C, 60, 'Refreshing green goop!', 'and the green goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has green goo again', 'a Bottle'), + 'Bottle (Blue Potion)': (True, False, None, 0x2D, 80, 'Delicious blue goop!', 'and the blue goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has blue goo again', 'a Bottle'), + 'Bottle (Fairy)': (True, False, None, 0x3D, 70, 'Save me and I will revive you', 'and the captive', 'the tingle kid', 'hostage for sale', 'fairy dust and shrooms', 'bottle boy has friend again', 'a Bottle'), + 'Bottle (Bee)': (True, False, None, 0x3C, 50, 'I will sting your foes a few times', 'and the sting buddy', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has mad bee again', 'a Bottle'), + 'Bottle (Good Bee)': (True, False, None, 0x48, 60, 'I will sting your foes a whole lot!', 'and the sparkle sting', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has beetor again', 'a Bottle'), + 'Master Sword': (True, False, 'Sword', 0x50, 100, 'I beat barries and pigs alike', 'and the master sword', 'sword-wielding kid', 'glow sword for sale', 'fungus for blue slasher', 'sword boy fights again', 'the Master Sword'), + 'Tempered Sword': (True, False, 'Sword', 0x02, 150, 'I stole the\nblacksmith\'s\njob!', 'the tempered sword', 'sword-wielding kid', 'flame sword for sale', 'fungus for red slasher', 'sword boy fights again', 'the Tempered Sword'), 'Fighter Sword': (True, False, 'Sword', 0x49, 50, 'A pathetic\nsword rests\nhere!', 'the tiny sword', 'sword-wielding kid', 'tiny sword for sale', 'fungus for tiny slasher', 'sword boy fights again', 'the small sword'), - 'Golden Sword': (True, False, 'Sword', 0x03, 300, 'The butter\nsword rests\nhere!', 'and the butter sword', 'sword-wielding kid', 'butter for sale', 'cap churned to butter', 'sword boy fights again', 'the Golden Sword'), - 'Progressive Sword': (True, False, 'Sword', 0x5E, 200, 'a better copy\nof your sword\nfor your time', 'the unknown sword', 'sword-wielding kid', 'sword for sale', 'fungus for some slasher', 'sword boy fights again', 'a sword'), - 'Progressive Glove': (True, False, None, 0x61, 200, 'a way to lift\nheavier things', 'and the lift upgrade', 'body-building kid', 'some glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'a glove'), + 'Golden Sword': (True, False, 'Sword', 0x03, 200, 'The butter\nsword rests\nhere!', 'and the butter sword', 'sword-wielding kid', 'butter for sale', 'cap churned to butter', 'sword boy fights again', 'the Golden Sword'), + 'Progressive Sword': (True, False, 'Sword', 0x5E, 100, 'a better copy\nof your sword\nfor your time', 'the unknown sword', 'sword-wielding kid', 'sword for sale', 'fungus for some slasher', 'sword boy fights again', 'a sword'), + 'Progressive Glove': (True, False, None, 0x61, 100, 'a way to lift\nheavier things', 'and the lift upgrade', 'body-building kid', 'some glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'a glove'), 'Silver Arrows': (True, False, None, 0x58, 100, 'Do you fancy\nsilver tipped\narrows?', 'and the ganonsbane', 'ganon-killing kid', 'ganon doom for sale', 'fungus for pork', 'archer boy shines again', 'the silver arrows'), 'Green Pendant': (True, False, 'Crystal', [0x04, 0x38, 0x62, 0x00, 0x69, 0x01], 999, None, None, None, None, None, None, None), 'Blue Pendant': (True, False, 'Crystal', [0x02, 0x34, 0x60, 0x00, 0x69, 0x02], 999, None, None, None, None, None, None, None), @@ -83,20 +83,20 @@ item_table = {'Bow': (True, False, None, 0x0B, 300, 'You have\nchosen the\narche 'Bombs (10)': (False, False, None, 0x31, 50, 'I make things\ngo BOOM! Ten\ntimes!', 'and the explosions', 'the bomb-holding kid', 'firecrackers for sale', 'blend fungus into bombs', '\'splosion boy explodes again', 'ten bombs'), 'Bomb Upgrade (+10)': (False, False, None, 0x52, 100, 'increase bomb\nstorage, low\nlow price', 'and the bomb bag', 'boom-enlarging kid', 'bomb boost for sale', 'the shroom goes boom', 'upgrade boy explodes more again', 'bomb capacity'), 'Bomb Upgrade (+5)': (False, False, None, 0x51, 100, 'increase bomb\nstorage, low\nlow price', 'and the bomb bag', 'boom-enlarging kid', 'bomb boost for sale', 'the shroom goes boom', 'upgrade boy explodes more again', 'bomb capacity'), - 'Blue Mail': (False, True, None, 0x22, 100, 'Now you\'re a\nblue elf!', 'and the banana hat', 'the protected kid', 'banana hat for sale', 'the clothing store', 'tailor boy banana hatted again', 'the blue mail'), - 'Red Mail': (False, True, None, 0x23, 200, 'Now you\'re a\nred elf!', 'and the eggplant hat', 'well-protected kid', 'purple hat for sale', 'the nice clothing store', 'tailor boy fears nothing again', 'the red mail'), - 'Progressive Armor': (False, True, None, 0x60, 100, 'time for a\nchange of\nclothes?', 'and the unknown hat', 'the protected kid', 'new hat for sale', 'the clothing store', 'tailor boy has threads again', 'some armor'), - 'Blue Boomerang': (True, False, None, 0x0C, 100, 'No matter what\nyou do, blue\nreturns to you', 'and the bluemarang', 'the bat-throwing kid', 'bent stick for sale', 'fungus for puma-stick', 'throwing boy plays fetch again', 'the blue boomerang'), - 'Red Boomerang': (True, False, None, 0x2A, 100, 'No matter what\nyou do, red\nreturns to you', 'and the badmarang', 'the bat-throwing kid', 'air foil for sale', 'fungus for return-stick', 'magical boy plays fetch again', 'the red boomerang'), + 'Blue Mail': (False, True, None, 0x22, 50, 'Now you\'re a\nblue elf!', 'and the banana hat', 'the protected kid', 'banana hat for sale', 'the clothing store', 'tailor boy banana hatted again', 'the blue mail'), + 'Red Mail': (False, True, None, 0x23, 100, 'Now you\'re a\nred elf!', 'and the eggplant hat', 'well-protected kid', 'purple hat for sale', 'the nice clothing store', 'tailor boy fears nothing again', 'the red mail'), + 'Progressive Armor': (False, True, None, 0x60, 50, 'time for a\nchange of\nclothes?', 'and the unknown hat', 'the protected kid', 'new hat for sale', 'the clothing store', 'tailor boy has threads again', 'some armor'), + 'Blue Boomerang': (True, False, None, 0x0C, 50, 'No matter what\nyou do, blue\nreturns to you', 'and the bluemarang', 'the bat-throwing kid', 'bent stick for sale', 'fungus for puma-stick', 'throwing boy plays fetch again', 'the blue boomerang'), + 'Red Boomerang': (True, False, None, 0x2A, 50, 'No matter what\nyou do, red\nreturns to you', 'and the badmarang', 'the bat-throwing kid', 'air foil for sale', 'fungus for return-stick', 'magical boy plays fetch again', 'the red boomerang'), 'Blue Shield': (False, True, None, 0x04, 50, 'Now you can\ndefend against\npebbles!', 'and the stone blocker', 'shield-wielding kid', 'shield for sale', 'fungus for shield', 'shield boy defends again', 'the blue shield'), 'Red Shield': (False, True, None, 0x05, 500, 'Now you can\ndefend against\nfireballs!', 'and the shot blocker', 'shield-wielding kid', 'fire shield for sale', 'fungus for fire shield', 'shield boy defends again', 'the red shield'), - 'Mirror Shield': (True, False, None, 0x06, 300, 'Now you can\ndefend against\nlasers!', 'and the laser blocker', 'shield-wielding kid', 'face shield for sale', 'fungus for face shield', 'shield boy defends again', 'the mirror shield'), - 'Progressive Shield': (True, False, None, 0x5F, 100, 'have a better\nblocker in\nfront of you', 'and the new shield', 'shield-wielding kid', 'shield for sale', 'fungus for shield', 'shield boy defends again', 'a shield'), - 'Bug Catching Net': (True, False, None, 0x21, 100, 'Let\'s catch\nsome bees and\nfaeries!', 'and the bee catcher', 'the bug-catching kid', 'stick web for sale', 'fungus for butterflies', 'wrong boy catches bees again', 'the bug net'), - 'Cane of Byrna': (True, False, None, 0x18, 100, 'Use this to\nbecome\ninvincible!', 'and the bad cane', 'the spark-making kid', 'spark stick for sale', 'spark-stick for trade', 'cane boy encircles again', 'the blue cane'), - 'Boss Heart Container': (False, False, None, 0x3E, 80, 'Maximum health\nincreased!\nYeah!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), - 'Sanctuary Heart Container': (False, False, None, 0x3F, 100, 'Maximum health\nincreased!\nYeah!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), - 'Piece of Heart': (False, False, None, 0x17, 20, 'Just a little\npiece of love!', 'and the broken heart', 'the life-giving kid', 'little love for sale', 'fungus for life', 'life boy feels some love again', 'a heart piece'), + 'Mirror Shield': (True, False, None, 0x06, 200, 'Now you can\ndefend against\nlasers!', 'and the laser blocker', 'shield-wielding kid', 'face shield for sale', 'fungus for face shield', 'shield boy defends again', 'the mirror shield'), + 'Progressive Shield': (True, False, None, 0x5F, 50, 'have a better\nblocker in\nfront of you', 'and the new shield', 'shield-wielding kid', 'shield for sale', 'fungus for shield', 'shield boy defends again', 'a shield'), + 'Bug Catching Net': (True, False, None, 0x21, 50, 'Let\'s catch\nsome bees and\nfaeries!', 'and the bee catcher', 'the bug-catching kid', 'stick web for sale', 'fungus for butterflies', 'wrong boy catches bees again', 'the bug net'), + 'Cane of Byrna': (True, False, None, 0x18, 50, 'Use this to\nbecome\ninvincible!', 'and the bad cane', 'the spark-making kid', 'spark stick for sale', 'spark-stick for trade', 'cane boy encircles again', 'the blue cane'), + 'Boss Heart Container': (False, False, None, 0x3E, 40, 'Maximum health\nincreased!\nYeah!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), + 'Sanctuary Heart Container': (False, False, None, 0x3F, 50, 'Maximum health\nincreased!\nYeah!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), + 'Piece of Heart': (False, False, None, 0x17, 10, 'Just a little\npiece of love!', 'and the broken heart', 'the life-giving kid', 'little love for sale', 'fungus for life', 'life boy feels some love again', 'a heart piece'), 'Rupee (1)': (False, False, None, 0x34, 0, 'Just pocket\nchange. Move\nright along.', 'the pocket change', 'poverty-struck kid', 'life lesson for sale', 'buying cheap drugs', 'destitute boy has snack again', 'a green rupee'), 'Rupees (5)': (False, False, None, 0x35, 2, 'Just pocket\nchange. Move\nright along.', 'the pocket change', 'poverty-struck kid', 'life lesson for sale', 'buying cheap drugs', 'destitute boy has snack again', 'a blue rupee'), 'Rupees (20)': (False, False, None, 0x36, 10, 'Just couch\ncash. Move\nright along.', 'and the couch cash', 'the piggy-bank kid', 'life lesson for sale', 'the witch buying drugs', 'destitute boy has lunch again', 'a red rupee'), @@ -109,60 +109,60 @@ item_table = {'Bow': (True, False, None, 0x0B, 300, 'You have\nchosen the\narche 'Green Clock': (False, True, None, 0x5D, 200, 'a lot of time', 'the emerald clock', 'the emerald-time kid', 'green time for sale', 'for emerald time', 'moment boy adjusts time again', 'a red clock'), 'Single RNG': (False, True, None, 0x62, 300, 'something you don\'t yet have', None, None, None, None, 'unknown boy somethings again', 'a new mystery'), 'Multi RNG': (False, True, None, 0x63, 100, 'something you may already have', None, None, None, None, 'unknown boy somethings again', 'a total mystery'), - 'Magic Upgrade (1/2)': (True, False, None, 0x4E, 100, 'Your magic\npower has been\ndoubled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'half magic'), # can be required to beat mothula in an open seed in very very rare circumstance - 'Magic Upgrade (1/4)': (True, False, None, 0x4F, 200, 'Your magic\npower has been\nquadrupled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'quarter magic'), # can be required to beat mothula in an open seed in very very rare circumstance - 'Small Key (Eastern Palace)': (False, False, 'SmallKey', 0xA2, 50, 'A small key to Armos Knights', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Eastern Palace'), - 'Big Key (Eastern Palace)': (False, False, 'BigKey', 0x9D, 100, 'A big key to Armos Knights', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Eastern Palace'), + 'Magic Upgrade (1/2)': (True, False, None, 0x4E, 50, 'Your magic\npower has been\ndoubled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'half magic'), # can be required to beat mothula in an open seed in very very rare circumstance + 'Magic Upgrade (1/4)': (True, False, None, 0x4F, 100, 'Your magic\npower has been\nquadrupled!', 'and the spell power', 'the magic-saving kid', 'wizardry for sale', 'mekalekahi mekahiney ho', 'magic boy saves magic again', 'quarter magic'), # can be required to beat mothula in an open seed in very very rare circumstance + 'Small Key (Eastern Palace)': (False, False, 'SmallKey', 0xA2, 30, 'A small key to Armos Knights', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Eastern Palace'), + 'Big Key (Eastern Palace)': (False, False, 'BigKey', 0x9D, 50, 'A big key to Armos Knights', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Eastern Palace'), 'Compass (Eastern Palace)': (False, True, 'Compass', 0x8D, 10, 'Now you can find the Armos Knights!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Eastern Palace'), - 'Map (Eastern Palace)': (False, True, 'Map', 0x7D, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Eastern Palace'), - 'Small Key (Desert Palace)': (False, False, 'SmallKey', 0xA3, 50, 'A small key to the desert', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Desert Palace'), - 'Big Key (Desert Palace)': (False, False, 'BigKey', 0x9C, 100, 'A big key to the desert', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Desert Palace'), + 'Map (Eastern Palace)': (False, True, 'Map', 0x7D, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Eastern Palace'), + 'Small Key (Desert Palace)': (False, False, 'SmallKey', 0xA3, 30, 'A small key to the desert', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Desert Palace'), + 'Big Key (Desert Palace)': (False, False, 'BigKey', 0x9C, 50, 'A big key to the desert', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Desert Palace'), 'Compass (Desert Palace)': (False, True, 'Compass', 0x8C, 10, 'Now you can find Lanmolas!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Desert Palace'), - 'Map (Desert Palace)': (False, True, 'Map', 0x7C, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Desert Palace'), - 'Small Key (Tower of Hera)': (False, False, 'SmallKey', 0xAA, 50, 'A small key to Hera', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Tower of Hera'), - 'Big Key (Tower of Hera)': (False, False, 'BigKey', 0x95, 100, 'A big key to Hera', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Tower of Hera'), + 'Map (Desert Palace)': (False, True, 'Map', 0x7C, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Desert Palace'), + 'Small Key (Tower of Hera)': (False, False, 'SmallKey', 0xAA, 30, 'A small key to Hera', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Tower of Hera'), + 'Big Key (Tower of Hera)': (False, False, 'BigKey', 0x95, 50, 'A big key to Hera', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Tower of Hera'), 'Compass (Tower of Hera)': (False, True, 'Compass', 0x85, 10, 'Now you can find Moldorm!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Tower of Hera'), - 'Map (Tower of Hera)': (False, True, 'Map', 0x75, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Tower of Hera'), - 'Small Key (Escape)': (False, False, 'SmallKey', 0xA0, 50, 'A small key to the castle', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Hyrule Castle'), - 'Big Key (Escape)': (False, False, 'BigKey', 0x9F, 100, 'A big key to the castle', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Hyrule Castle'), + 'Map (Tower of Hera)': (False, True, 'Map', 0x75, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Tower of Hera'), + 'Small Key (Escape)': (False, False, 'SmallKey', 0xA0, 30, 'A small key to the castle', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Hyrule Castle'), + 'Big Key (Escape)': (False, False, 'BigKey', 0x9F, 50, 'A big key to the castle', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Hyrule Castle'), 'Compass (Escape)': (False, True, 'Compass', 0x8F, 10, 'Now you can find no boss!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Hyrule Castle'), - 'Map (Escape)': (False, True, 'Map', 0x7F, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Hyrule Castle'), - 'Small Key (Agahnims Tower)': (False, False, 'SmallKey', 0xA4, 50, 'A small key to Agahnim', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Castle Tower'), - 'Big Key (Agahnims Tower)': (False, False, 'BigKey', 0x9B, 100, 'A big key to Agahnim', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Castle Tower'), + 'Map (Escape)': (False, True, 'Map', 0x7F, 10, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Hyrule Castle'), + 'Small Key (Agahnims Tower)': (False, False, 'SmallKey', 0xA4, 30, 'A small key to Agahnim', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Castle Tower'), + 'Big Key (Agahnims Tower)': (False, False, 'BigKey', 0x9B, 50, 'A big key to Agahnim', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Castle Tower'), 'Compass (Agahnims Tower)': (False, True, 'Compass', 0x8B, 10, 'Now you can find Aga1!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Castle Tower'), - 'Map (Agahnims Tower)': (False, True, 'Map', 0x7B, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Castle Tower'), - 'Small Key (Palace of Darkness)': (False, False, 'SmallKey', 0xA6, 50, 'A small key to darkness', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Palace of Darkness'), - 'Big Key (Palace of Darkness)': (False, False, 'BigKey', 0x99, 100, 'A big key to darkness', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Palace of Darkness'), + 'Map (Agahnims Tower)': (False, True, 'Map', 0x7B, 10, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Castle Tower'), + 'Small Key (Palace of Darkness)': (False, False, 'SmallKey', 0xA6, 30, 'A small key to darkness', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Palace of Darkness'), + 'Big Key (Palace of Darkness)': (False, False, 'BigKey', 0x99, 50, 'A big key to darkness', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Palace of Darkness'), 'Compass (Palace of Darkness)': (False, True, 'Compass', 0x89, 10, 'Now you can find Helmasaur King!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Palace of Darkness'), - 'Map (Palace of Darkness)': (False, True, 'Map', 0x79, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Palace of Darkness'), - 'Small Key (Thieves Town)': (False, False, 'SmallKey', 0xAB, 50, 'A small key to thievery', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Thieves\' Town'), - 'Big Key (Thieves Town)': (False, False, 'BigKey', 0x94, 100, 'A big key to thievery', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Thieves\' Town'), + 'Map (Palace of Darkness)': (False, True, 'Map', 0x79, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Palace of Darkness'), + 'Small Key (Thieves Town)': (False, False, 'SmallKey', 0xAB, 30, 'A small key to thievery', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Thieves\' Town'), + 'Big Key (Thieves Town)': (False, False, 'BigKey', 0x94, 50, 'A big key to thievery', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Thieves\' Town'), 'Compass (Thieves Town)': (False, True, 'Compass', 0x84, 10, 'Now you can find Blind!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Thieves\' Town'), - 'Map (Thieves Town)': (False, True, 'Map', 0x74, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Thieves\' Town'), - 'Small Key (Skull Woods)': (False, False, 'SmallKey', 0xA8, 50, 'A small key to the woods', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Skull Woods'), - 'Big Key (Skull Woods)': (False, False, 'BigKey', 0x97, 100, 'A big key to the woods', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Skull Woods'), + 'Map (Thieves Town)': (False, True, 'Map', 0x74, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Thieves\' Town'), + 'Small Key (Skull Woods)': (False, False, 'SmallKey', 0xA8, 30, 'A small key to the woods', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Skull Woods'), + 'Big Key (Skull Woods)': (False, False, 'BigKey', 0x97, 50, 'A big key to the woods', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Skull Woods'), 'Compass (Skull Woods)': (False, True, 'Compass', 0x87, 10, 'Now you can find Mothula!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Skull Woods'), - 'Map (Skull Woods)': (False, True, 'Map', 0x77, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Skull Woods'), - 'Small Key (Swamp Palace)': (False, False, 'SmallKey', 0xA5, 50, 'A small key to the swamp', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Swamp Palace'), - 'Big Key (Swamp Palace)': (False, False, 'BigKey', 0x9A, 100, 'A big key to the swamp', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Swamp Palace'), + 'Map (Skull Woods)': (False, True, 'Map', 0x77, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Skull Woods'), + 'Small Key (Swamp Palace)': (False, False, 'SmallKey', 0xA5, 30, 'A small key to the swamp', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Swamp Palace'), + 'Big Key (Swamp Palace)': (False, False, 'BigKey', 0x9A, 50, 'A big key to the swamp', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Swamp Palace'), 'Compass (Swamp Palace)': (False, True, 'Compass', 0x8A, 10, 'Now you can find Arrghus!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Swamp Palace'), - 'Map (Swamp Palace)': (False, True, 'Map', 0x7A, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Swamp Palace'), - 'Small Key (Ice Palace)': (False, False, 'SmallKey', 0xA9, 50, 'A small key to the iceberg', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ice Palace'), - 'Big Key (Ice Palace)': (False, False, 'BigKey', 0x96, 100, 'A big key to the iceberg', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ice Palace'), + 'Map (Swamp Palace)': (False, True, 'Map', 0x7A, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Swamp Palace'), + 'Small Key (Ice Palace)': (False, False, 'SmallKey', 0xA9, 30, 'A small key to the iceberg', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ice Palace'), + 'Big Key (Ice Palace)': (False, False, 'BigKey', 0x96, 50, 'A big key to the iceberg', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ice Palace'), 'Compass (Ice Palace)': (False, True, 'Compass', 0x86, 10, 'Now you can find Kholdstare!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Ice Palace'), - 'Map (Ice Palace)': (False, True, 'Map', 0x76, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ice Palace'), - 'Small Key (Misery Mire)': (False, False, 'SmallKey', 0xA7, 50, 'A small key to the mire', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Misery Mire'), - 'Big Key (Misery Mire)': (False, False, 'BigKey', 0x98, 100, 'A big key to the mire', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Misery Mire'), + 'Map (Ice Palace)': (False, True, 'Map', 0x76, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ice Palace'), + 'Small Key (Misery Mire)': (False, False, 'SmallKey', 0xA7, 30, 'A small key to the mire', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Misery Mire'), + 'Big Key (Misery Mire)': (False, False, 'BigKey', 0x98, 50, 'A big key to the mire', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Misery Mire'), 'Compass (Misery Mire)': (False, True, 'Compass', 0x88, 10, 'Now you can find Vitreous!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Misery Mire'), - 'Map (Misery Mire)': (False, True, 'Map', 0x78, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Misery Mire'), - 'Small Key (Turtle Rock)': (False, False, 'SmallKey', 0xAC, 50, 'A small key to the pipe maze', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Turtle Rock'), - 'Big Key (Turtle Rock)': (False, False, 'BigKey', 0x93, 100, 'A big key to the pipe maze', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Turtle Rock'), + 'Map (Misery Mire)': (False, True, 'Map', 0x78, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Misery Mire'), + 'Small Key (Turtle Rock)': (False, False, 'SmallKey', 0xAC, 30, 'A small key to the pipe maze', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Turtle Rock'), + 'Big Key (Turtle Rock)': (False, False, 'BigKey', 0x93, 50, 'A big key to the pipe maze', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Turtle Rock'), 'Compass (Turtle Rock)': (False, True, 'Compass', 0x83, 10, 'Now you can find Trinexx!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Turtle Rock'), - 'Map (Turtle Rock)': (False, True, 'Map', 0x73, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Turtle Rock'), - 'Small Key (Ganons Tower)': (False, False, 'SmallKey', 0xAD, 50, 'A small key to the evil tower', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ganon\'s Tower'), - 'Big Key (Ganons Tower)': (False, False, 'BigKey', 0x92, 100, 'A big key to the evil tower', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ganon\'s Tower'), + 'Map (Turtle Rock)': (False, True, 'Map', 0x73, 20, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Turtle Rock'), + 'Small Key (Ganons Tower)': (False, False, 'SmallKey', 0xAD, 30, 'A small key to the evil tower', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Ganon\'s Tower'), + 'Big Key (Ganons Tower)': (False, False, 'BigKey', 0x92, 50, 'A big key to the evil tower', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Ganon\'s Tower'), 'Compass (Ganons Tower)': (False, True, 'Compass', 0x82, 10, 'Now you can find Agahnim!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a comapss to Ganon\'s Tower'), - 'Map (Ganons Tower)': (False, True, 'Map', 0x72, 50, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ganon\'s Tower'), + 'Map (Ganons Tower)': (False, True, 'Map', 0x72, 10, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Ganon\'s Tower'), 'Small Key (Universal)': (False, True, None, 0xAF, 100, 'A small key for any door', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key'), 'Nothing': (False, False, None, 0x5A, 1, 'Some Hot Air', 'and the Nothing', 'the zen kid', 'outright theft', 'shroom theft', 'empty boy is bored again', 'nothing'), 'Bee Trap': (False, False, None, 0xB0, 0, 'We will sting your face a whole lot!', 'and the sting buddies', 'the beekeeper kid', 'insects for sale', 'shroom pollenation', 'bottle boy has mad bees again', 'friendship'), diff --git a/Main.py b/Main.py index 5cf4c918..3b780520 100644 --- a/Main.py +++ b/Main.py @@ -21,7 +21,8 @@ from DoorShuffle import link_doors, connect_portal from RoomData import create_rooms from Rules import set_rules from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive -from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items, sell_keys, balance_multiworld_progression +from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items +from Fill import sell_potions, sell_keys, balance_multiworld_progression from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names @@ -149,8 +150,10 @@ def main(args, seed=None, fish=None): set_rules(world, player) for player in range(1, world.players + 1): - if world.retro[player] and world.shopsanity[player]: - sell_keys(world, player) + if world.shopsanity[player]: + sell_potions(world, player) + if world.retro[player]: + sell_keys(world, player) logger.info(world.fish.translate("cli","cli","placing.dungeon.prizes")) @@ -507,7 +510,8 @@ def copy_dynamic_regions_and_locations(world, ret): # Note: ideally exits should be copied here, but the current use case (Take anys) do not require this if region.shop: - new_reg.shop = Shop(new_reg, region.shop.room_id, region.shop.type, region.shop.shopkeeper_config, region.shop.custom, region.shop.locked) + new_reg.shop = Shop(new_reg, region.shop.room_id, region.shop.type, region.shop.shopkeeper_config, + region.shop.custom, region.shop.locked, region.shop.sram_address) ret.shops[region.player].append(new_reg.shop) for location in world.dynamic_locations: diff --git a/MultiClient.py b/MultiClient.py index 15840488..66c66e82 100644 --- a/MultiClient.py +++ b/MultiClient.py @@ -52,6 +52,7 @@ class Context: self.awaiting_rom = False self.rom = None self.auth = None + self.total_locations = None def color_code(*args): codes = {'reset': 0, 'bold': 1, 'underline': 4, 'black': 30, 'red': 31, 'green': 32, 'yellow': 33, 'blue': 34, @@ -86,6 +87,12 @@ SCOUT_LOCATION_ADDR = SAVEDATA_START + 0x4D7 # 1 byte SCOUTREPLY_LOCATION_ADDR = SAVEDATA_START + 0x4D8 # 1 byte SCOUTREPLY_ITEM_ADDR = SAVEDATA_START + 0x4D9 # 1 byte SCOUTREPLY_PLAYER_ADDR = SAVEDATA_START + 0x4DA # 1 byte +SHOP_ADDR = SAVEDATA_START + 0x302 # 2 bytes? +DYNAMIC_TOTAL_ADDR = SAVEDATA_START + 0x33E + +SHOP_SRAM_LEN = 0x29 # 41 tracked items +location_shop_order = [Regions.shop_to_location_table.keys()] + [Regions.retro_shops.keys()] +location_shop_ids = {0x0112, 0x0110, 0x010F, 0x00FF, 0x011F, 0x0109, 0x0115} location_table_uw = {"Blind's Hideout - Top": (0x11d, 0x10), "Blind's Hideout - Left": (0x11d, 0x20), @@ -800,11 +807,28 @@ def get_location_name_from_address(address): async def track_locations(ctx : Context, roomid, roomdata): new_locations = [] + if ctx.total_locations is None: + total_data = await snes_read(ctx, DYNAMIC_TOTAL_ADDR, 2) + ttl = total_data[0] | (total_data[1] << 8) + if ttl > 0: + ctx.total_locations = ttl + def new_check(location): ctx.locations_checked.add(location) - logging.info("New check: %s (%d/216)" % (location, len(ctx.locations_checked))) + logging.info(f"New check: {location} ({len(ctx.locations_checked)}/{ctx.total_locations})") new_locations.append(Regions.lookup_name_to_id[location]) + try: + if roomid in location_shop_ids: + misc_data = await snes_read(ctx, SHOP_ADDR, SHOP_SRAM_LEN) + for cnt, b in enumerate(misc_data): + my_check = Regions.shop_table_by_location_id[0x400000 + cnt] + if int(b) > 0 and my_check not in ctx.locations_checked: + new_check(my_check) + except Exception as e: + print(e) + logging.warning(e) + for location, (loc_roomid, loc_mask) in location_table_uw.items(): if location not in ctx.locations_checked and loc_roomid == roomid and (roomdata << 4) & loc_mask != 0: new_check(location) diff --git a/Regions.py b/Regions.py index 0d75c6d4..b7050259 100644 --- a/Regions.py +++ b/Regions.py @@ -84,7 +84,7 @@ def create_regions(world, player): create_cave_region(player, 'Bonk Rock Cave', 'a cave with a chest', ['Bonk Rock Cave']), create_cave_region(player, 'Library', 'the library', ['Library']), create_cave_region(player, 'Kakariko Gamble Game', 'a game of chance'), - create_cave_region(player, 'Potion Shop', 'the potion shop', ['Potion Shop']), + create_cave_region(player, 'Potion Shop', 'the potion shop', ['Potion Shop', 'Potion Shop - Left', 'Potion Shop - Middle', 'Potion Shop - Right']), create_lw_region(player, 'Lake Hylia Island', ['Lake Hylia Island']), create_cave_region(player, 'Capacity Upgrade', 'the queen of fairies', ['Capacity Upgrade - Left', 'Capacity Upgrade - Right']), create_cave_region(player, 'Two Brothers House', 'a connector', None, ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']), @@ -859,12 +859,12 @@ def mark_light_world_regions(world, player): def create_shops(world, player): world.shops[player] = [] - for region_name, (room_id, type, shopkeeper, custom, locked, inventory) in shop_table.items(): + for region_name, (room_id, type, shopkeeper, custom, locked, inventory, sram) in shop_table.items(): if world.mode[player] == 'inverted' and region_name == 'Dark Lake Hylia Shop': locked = True inventory = [('Blue Potion', 160), ('Blue Shield', 50), ('Bombs (10)', 50)] region = world.get_region(region_name, player) - shop = Shop(region, room_id, type, shopkeeper, custom, locked) + shop = Shop(region, room_id, type, shopkeeper, custom, locked, sram) region.shop = shop world.shops[player].append(shop) for index, item in enumerate(inventory): @@ -905,17 +905,20 @@ def adjust_locations(world, player): _basic_shop_defaults = [('Red Potion', 150), ('Small Heart', 10), ('Bombs (10)', 50)] _dark_world_shop_defaults = [('Red Potion', 150), ('Blue Shield', 50), ('Bombs (10)', 50)] shop_table = { - 'Cave Shop (Dark Death Mountain)': (0x0112, ShopType.Shop, 0xC1, False, False, _basic_shop_defaults), - 'Red Shield Shop': (0x0110, ShopType.Shop, 0xC1, False, False, [('Red Shield', 500), ('Bee', 10), ('Arrows (10)', 30)]), - 'Dark Lake Hylia Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults), - 'Dark World Lumberjack Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults), - 'Village of Outcasts Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults), - 'Dark World Potion Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults), - 'Light World Death Mountain Shop': (0x00FF, ShopType.Shop, 0xA0, False, False, _basic_shop_defaults), - 'Kakariko Shop': (0x011F, ShopType.Shop, 0xA0, False, False, _basic_shop_defaults), - 'Cave Shop (Lake Hylia)': (0x0112, ShopType.Shop, 0xA0, False, False, _basic_shop_defaults), - 'Potion Shop': (0x0109, ShopType.Shop, 0xFF, False, True, [('Red Potion', 120), ('Green Potion', 60), ('Blue Potion', 160)]), - 'Capacity Upgrade': (0x0115, ShopType.UpgradeShop, 0x04, True, True, [('Bomb Upgrade (+5)', 100, 7), ('Arrow Upgrade (+5)', 100, 7)]) + 'Cave Shop (Dark Death Mountain)': (0x0112, ShopType.Shop, 0xC1, False, False, _basic_shop_defaults, 0), + 'Red Shield Shop': (0x0110, ShopType.Shop, 0xC1, False, False, + [('Red Shield', 500), ('Bee', 10), ('Arrows (10)', 30)], 3), + 'Dark Lake Hylia Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults, 6), + 'Dark World Lumberjack Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults, 9), + 'Village of Outcasts Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults, 12), + 'Dark World Potion Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults, 15), + 'Light World Death Mountain Shop': (0x00FF, ShopType.Shop, 0xA0, False, False, _basic_shop_defaults, 18), + 'Kakariko Shop': (0x011F, ShopType.Shop, 0xA0, False, False, _basic_shop_defaults, 21), + 'Cave Shop (Lake Hylia)': (0x0112, ShopType.Shop, 0xA0, False, False, _basic_shop_defaults, 24), + 'Potion Shop': (0x0109, ShopType.Shop, 0xFF, False, True, + [('Red Potion', 120), ('Green Potion', 60), ('Blue Potion', 160)], 27), + 'Capacity Upgrade': (0x0115, ShopType.UpgradeShop, 0x04, True, True, + [('Bomb Upgrade (+5)', 100, 7), ('Arrow Upgrade (+5)', 100, 7)], 30) } @@ -929,6 +932,7 @@ shop_to_location_table = { 'Light World Death Mountain Shop': ['Paradox Shop - Left', 'Paradox Shop - Middle', 'Paradox Shop - Right'], 'Kakariko Shop': ['Kakariko Shop - Left', 'Kakariko Shop - Middle', 'Kakariko Shop - Right'], 'Cave Shop (Lake Hylia)': ['Lake Hylia Shop - Left', 'Lake Hylia Shop - Middle', 'Lake Hylia Shop - Right'], + 'Potion Shop': ['Potion Shop - Left', 'Potion Shop - Middle', 'Potion Shop - Right'], 'Capacity Upgrade': ['Capacity Upgrade - Left', 'Capacity Upgrade - Right'], } @@ -940,6 +944,11 @@ retro_shops = { 'Take-Any #4': ['Take-Any #4 Item 1', 'Take-Any #4 Item 2'], } +flat_normal_shops = [loc_name for name, location_list in shop_to_location_table.items() for loc_name in location_list] +flat_retro_shops = [loc_name for name, location_list in retro_shops.items() for loc_name in location_list] +shop_table_by_location_id = {0x400000+cnt: x for cnt, x in enumerate(flat_normal_shops)} +shop_table_by_location_id = {**shop_table_by_location_id, **{0x400020+cnt: x for cnt, x in enumerate(flat_retro_shops)}} +shop_table_by_location = {y: x for x, y in shop_table_by_location_id.items()} key_drop_data = { 'Hyrule Castle - Map Guard Key Drop': [0x140036, 0x140037, 'in Hyrule Castle', 'Small Key (Escape)'], @@ -1263,10 +1272,15 @@ location_table = {'Mushroom': (0x180013, 0x186338, False, 'in the woods'), 'Dark Death Mountain Shop - Right': (None, None, False, 'for sale on the dark mountain'), 'Red Shield Shop - Left': (None, None, False, 'for sale as a curiosity'), 'Red Shield Shop - Middle': (None, None, False, 'for sale as a curiosity'), - 'Red Shield Shop - Right': (None, None, False, 'for sale as a curiosity') + 'Red Shield Shop - Right': (None, None, False, 'for sale as a curiosity'), + 'Potion Shop - Left': (None, None, False, 'for sale near the witch'), + 'Potion Shop - Middle': (None, None, False, 'for sale near the witch'), + 'Potion Shop - Right': (None, None, False, 'for sale near the witch'), } lookup_id_to_name = {data[0]: name for name, data in location_table.items() if type(data[0]) == int} lookup_id_to_name = {**lookup_id_to_name, **{data[1]: name for name, data in key_drop_data.items()}} +lookup_id_to_name.update(shop_table_by_location_id) lookup_name_to_id = {name: data[0] for name, data in location_table.items() if type(data[0]) == int} lookup_name_to_id = {**lookup_name_to_id, **{name: data[1] for name, data in key_drop_data.items()}} +lookup_name_to_id.update(shop_table_by_location) diff --git a/Rom.py b/Rom.py index 0e96f520..bb158850 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '30147375153cc57197805eddf38c2a23' +RANDOMIZERBASEHASH = '7f00024960d910e4490be397c5561e1e' class JsonRom(object): @@ -743,14 +743,24 @@ def patch_rom(world, rom, player, team, enemized): def credits_digit(num): # top: $54 is 1, 55 2, etc , so 57=4, 5C=9 # bot: $7A is 1, 7B is 2, etc so 7D=4, 82=9 (zero unknown...) - return 0x53+num, 0x79+num + return 0x53+int(num), 0x79+int(num) + + credits_total = 216 + if world.keydropshuffle[player]: + credits_total += 33 + if world.shopsanity[player]: + credits_total += 32 + if world.retro[player]: + credits_total += 9 if world.shopsanity[player] else 5 if world.keydropshuffle[player]: rom.write_byte(0x140000, 1) - rom.write_byte(0x187010, 249) # dynamic credits + + write_int16(rom, 0x187010, credits_total) # dynamic credits + if credits_total != 216: # collection rate address: 238C37 - mid_top, mid_bot = credits_digit(4) - last_top, last_bot = credits_digit(9) + mid_top, mid_bot = credits_digit((credits_total // 10) % 10) + last_top, last_bot = credits_digit(credits_total % 10) # top half rom.write_byte(0x118C53, mid_top) rom.write_byte(0x118C54, last_top) @@ -1506,24 +1516,27 @@ def write_custom_shops(rom, world, player): shop_data = bytearray() items_data = bytearray() - sram_offset = 0 for shop_id, shop in enumerate(shops): if shop_id == len(shops) - 1: shop_id = 0xFF bytes = shop.get_bytes() bytes[0] = shop_id - bytes[-1] = sram_offset - if shop.type == ShopType.TakeAny: - sram_offset += 1 - else: - sram_offset += shop.item_count + bytes[-1] = shop.sram_address shop_data.extend(bytes) - # [id][item][price-low][price-high][max][repl_id][repl_price-low][repl_price-high] - for item in shop.inventory: + # [id][item][price-low][price-high][max][repl_id][repl_price-low][repl_price-high][player][sram] + for index, item in enumerate(shop.inventory): if item is None: break - item_data = [shop_id, ItemFactory(item['item'], player).code] + int16_as_bytes(item['price']) + [item['max'], ItemFactory(item['replacement'], player).code if item['replacement'] else 0xFF] + int16_as_bytes(item['replacement_price']) + if world.shopsanity[player] or shop.type == ShopType.TakeAny: + slot = 0 if shop.type == ShopType.TakeAny else index + rom.write_byte(0x186560 + shop.sram_address + slot, 1) + item_id = ItemFactory(item['item'], player).code + price = int16_as_bytes(item['price']) + replace = ItemFactory(item['replacement'], player).code if item['replacement'] else 0xFF + replace_price = int16_as_bytes(item['replacement_price']) + item_player = 0 if item['player'] == player else item['player'] + item_data = [shop_id, item_id] + price + [item['max'], replace] + replace_price + [item_player] items_data.extend(item_data) rom.write_bytes(0x184800, shop_data) diff --git a/asm/hudadditions.asm b/asm/hudadditions.asm index 9b78a0a4..94edd3d0 100644 --- a/asm/hudadditions.asm +++ b/asm/hudadditions.asm @@ -8,7 +8,7 @@ DrHudOverride: HudAdditions: { lda.l DRFlags : and #$0008 : beq ++ - lda $7EF423 : and #$00ff + lda $7EF423 jsr HudHexToDec4DigitCopy LDX.b $05 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+10 ; draw 100's digit LDX.b $06 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+12 ; draw 10's digit diff --git a/data/base2current.bps b/data/base2current.bps index 74ee4e9a0243b2269d24e8feeb57a51a99cf4a00..a78021b41948b971adfb2f134e573dfd72d09b2f 100644 GIT binary patch delta 15979 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 From 09cae6e640e2cd0509c9ddb77ece4406a02b9dff Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 3 Feb 2021 10:49:29 -0700 Subject: [PATCH 4/4] Shopsanity multiworld and rupee progression balancing --- Fill.py | 156 +++++++++++++++++++++++++++++++++++++++++- ItemList.py | 17 +++-- Items.py | 30 ++++---- Main.py | 3 +- Regions.py | 7 ++ Rom.py | 4 +- data/base2current.bps | Bin 131582 -> 132284 bytes 7 files changed, 190 insertions(+), 27 deletions(-) diff --git a/Fill.py b/Fill.py index d7bbcd75..38a9d8f5 100644 --- a/Fill.py +++ b/Fill.py @@ -2,7 +2,8 @@ import random import logging from BaseClasses import CollectionState -from Regions import shop_to_location_table, retro_shops +from Items import ItemFactory +from Regions import shop_to_location_table class FillError(RuntimeError): @@ -382,8 +383,6 @@ def sell_potions(world, player): # potions are excluded from the cap fairy due to visual problem if shop.region.name in shop_to_location_table and shop.region.name != 'Capacity Upgrade': loc_choices += [world.get_location(loc, player) for loc in shop_to_location_table[shop.region.name]] - if world.retro[player] and shop.region.name in retro_shops: - loc_choices += [world.get_location(loc, player) for loc in retro_shops[shop.region.name]] locations = [loc for loc in loc_choices if not loc.item] for potion in ['Green Potion', 'Blue Potion', 'Red Potion']: location = random.choice(locations) @@ -502,3 +501,154 @@ def balance_multiworld_progression(world): break elif not sphere_locations: raise RuntimeError('Not all required items reachable. Something went terribly wrong here.') + + +def balance_money_progression(world): + logger = logging.getLogger('') + state = CollectionState(world) + unchecked_locations = world.get_locations().copy() + wallet = {player: 0 for player in range(1, world.players+1)} + kiki_check = {player: False for player in range(1, world.players+1)} + kiki_paid = {player: False for player in range(1, world.players+1)} + rooms_visited = {player: set() for player in range(1, world.players+1)} + balance_locations = {player: set() for player in range(1, world.players+1)} + + pay_for_locations = {'Bottle Merchant': 100, 'Chest Game': 30, 'Digging Game': 80, + 'King Zora': 500, 'Blacksmith': 10} + rupee_chart = {'Rupee (1)': 1, 'Rupees (5)': 5, 'Rupees (20)': 20, 'Rupees (50)': 50, + 'Rupees (100)': 100, 'Rupees (300)': 300} + rupee_rooms = {'Eastern Rupees': 90, 'Mire Key Rupees': 45, 'Mire Shooter Rupees': 90, + 'TR Rupees': 270, 'PoD Dark Basement': 270} + acceptable_balancers = ['Bombs (3)', 'Arrows (10)', 'Bombs (10)'] + + def get_sphere_locations(sphere_state, locations): + sphere_state.sweep_for_events(key_only=True, locations=locations) + return [loc for loc in locations if sphere_state.can_reach(loc) and sphere_state.not_flooding_a_key(sphere_state.world, loc)] + + def interesting_item(location, item, world, player): + if item.advancement: + return True + if item.type is not None or item.name.startswith('Rupee'): + return True + if item.name in ['Progressive Armor', 'Blue Mail', 'Red Mail']: + return True + if world.retro[player] and (item.name in ['Single Arrow', 'Small Key (Universal)']): + return True + if location.name in pay_for_locations: + return True + return False + + def kiki_required(state, location): + path = state.path[location.parent_region] + if path: + while path[1]: + if path[0] == 'Palace of Darkness': + return True + path = path[1] + return False + + done = False + while not done: + sphere_costs = {player: 0 for player in range(1, world.players+1)} + locked_by_money = {player: set() for player in range(1, world.players+1)} + sphere_locations = get_sphere_locations(state, unchecked_locations) + checked_locations = [] + for player in range(1, world.players+1): + if not kiki_check[player]: + kiki_payable = state.prog_items[('Moon Pearl', player)] > 0 or world.mode[player] == 'inverted' + if kiki_payable and world.get_region('East Dark World', player) in state.reachable_regions[player]: + if not kiki_paid[player]: + kiki_check[player] = True + sphere_costs[player] += 110 + locked_by_money[player].add('Kiki') + for location in sphere_locations: + location_free, loc_player = True, location.player + if location.parent_region.name in shop_to_location_table and location.name != 'Potion Shop': + slot = shop_to_location_table[location.parent_region.name].index(location.name) + shop = location.parent_region.shop + shop_item = shop.inventory[slot] + sphere_costs[loc_player] += shop_item['price'] + location_free = False + locked_by_money[loc_player].add(location) + elif location.name in pay_for_locations: + sphere_costs[loc_player] += pay_for_locations[location.name] + location_free = False + locked_by_money[loc_player].add(location) + if kiki_check[loc_player] and not kiki_paid[loc_player] and kiki_required(state, location): + locked_by_money[loc_player].add(location) + location_free = False + if location_free: + state.collect(location.item, True, location) + unchecked_locations.remove(location) + if location.item.name.startswith('Rupee'): + wallet[location.item.player] += rupee_chart[location.item.name] + if location.item.name != 'Rupees (300)': + balance_locations[location.item.player].add(location) + if interesting_item(location, location.item, world, location.item.player): + checked_locations.append(location) + elif location.item.name in acceptable_balancers: + balance_locations[location.item.player].add(location) + for room, income in rupee_rooms.items(): + for player in range(1, world.players+1): + if room not in rooms_visited[player] and world.get_region(room, player) in state.reachable_regions[player]: + wallet[player] += income + rooms_visited[player].add(room) + if checked_locations: + if world.has_beaten_game(state): + done = True + continue + # else go to next sphere + else: + # check for solvent players + solvent = set() + insolvent = set() + for player in range(1, world.players+1): + if wallet[player] >= sphere_costs[player] > 0: + solvent.add(player) + if sphere_costs[player] > 0 and sphere_costs[player] > wallet[player]: + insolvent.add(player) + if len(solvent) == 0: + target_player = min(insolvent, key=lambda p: sphere_costs[p]-wallet[p]) + difference = sphere_costs[target_player]-wallet[target_player] + logger.debug(f'Money balancing needed: Player {target_player} short {difference}') + while difference > 0: + swap_targets = [x for x in unchecked_locations if x not in sphere_locations and x.item.name.startswith('Rupees') and x.item.player == target_player] + if len(swap_targets) == 0: + best_swap, best_value = None, 300 + else: + best_swap = max(swap_targets, key=lambda t: rupee_chart[t.item.name]) + best_value = rupee_chart[best_swap.item.name] + increase_targets = [x for x in balance_locations[target_player] if x.item.name in rupee_chart and rupee_chart[x.item.name] < best_value] + if len(increase_targets) == 0: + increase_targets = [x for x in balance_locations[target_player] if (rupee_chart[x.item.name] if x.item.name in rupee_chart else 0) < best_value] + if len(increase_targets) == 0: + raise Exception('No early sphere swaps for rupees - money grind would be required - bailing for now') + best_target = min(increase_targets, key=lambda t: rupee_chart[t.item.name] if t.item.name in rupee_chart else 0) + old_value = rupee_chart[best_target.item.name] if best_target.item.name in rupee_chart else 0 + if best_swap is None: + logger.debug(f'Upgrading {best_target.item.name} @ {best_target.name} for 300 Rupees') + best_target.item = ItemFactory('Rupees (300)', best_target.item.player) + best_target.item.location = best_target + else: + old_item = best_target.item + logger.debug(f'Swapping {best_target.item.name} @ {best_target.name} for {best_swap.item.name} @ {best_swap.name}') + best_target.item = best_swap.item + best_target.item.location = best_target + best_swap.item = old_item + best_swap.item.location = best_swap + increase = best_value - old_value + difference -= increase + wallet[target_player] += increase + solvent.add(player) + # apply solvency + for player in solvent: + wallet[player] -= sphere_costs[player] + sphere_costs[player] = 0 + for location in locked_by_money[player]: + if location == 'Kiki': + kiki_paid[player] = True + else: + state.collect(location.item, True, location) + unchecked_locations.remove(location) + if location.item.name.startswith('Rupee'): + wallet[location.item.player] += rupee_chart[location.item.name] diff --git a/ItemList.py b/ItemList.py index 1b062152..38fb83d8 100644 --- a/ItemList.py +++ b/ItemList.py @@ -7,7 +7,7 @@ from BaseClasses import Region, RegionType, Shop, ShopType, Location from Bosses import place_bosses from Dungeons import get_dungeon_item_pool from EntranceShuffle import connect_entrance -from Regions import shop_to_location_table, retro_shops +from Regions import shop_to_location_table, retro_shops, shop_table_by_location from Fill import FillError, fill_restrictive from Items import ItemFactory @@ -437,7 +437,10 @@ def create_dynamic_shop_locations(world, player): if item is None: continue if item['create_location']: - loc = Location(player, "{} Item {}".format(shop.region.name, i+1), parent=shop.region) + slot_name = "{} Item {}".format(shop.region.name, i+1) + address = shop_table_by_location[slot_name] if world.shopsanity[player] else None + loc = Location(player, slot_name, address=address, + parent=shop.region, hint_text='in an old-fashioned cave') shop.region.locations.append(loc) world.dynamic_locations.append(loc) @@ -483,16 +486,18 @@ def set_up_shops(world, player): removals = [next(item for item in world.itempool if item.name == 'Arrows (10)' and item.player == player)] red_pots = [item for item in world.itempool if item.name == 'Red Potion' and item.player == player][:5] shields_n_hearts = [item for item in world.itempool if item.name in ['Blue Shield', 'Small Heart'] and item.player == player] + removals.extend([item for item in world.itempool if item.name == 'Arrow Upgrade (+5)' and item.player == player]) removals.extend(red_pots) removals.extend(random.sample(shields_n_hearts, 5)) for remove in removals: world.itempool.remove(remove) - for i in range(6): + for i in range(6): # replace the Arrows (10) and randomly selected hearts/blue shield arrow_item = ItemFactory('Single Arrow', player) arrow_item.advancement = True world.itempool.append(arrow_item) - for i in range(5): + for i in range(5): # replace the red potions world.itempool.append(ItemFactory('Small Key (Universal)', player)) + world.itempool.append(ItemFactory('Rupees (50)', player)) # replaces the arrow upgrade # TODO: move hard+ mode changes for shields here, utilizing the new shops else: rss = world.get_region('Red Shield Shop', player).shop @@ -509,7 +514,7 @@ def set_up_shops(world, player): def customize_shops(world, player): - found_bomb_upgrade, found_arrow_upgrade = False, False + found_bomb_upgrade, found_arrow_upgrade = False, world.retro[player] possible_replacements = [] shops_to_customize = shop_to_location_table.copy() if world.retro[player]: @@ -584,7 +589,7 @@ def randomize_price(price): if price <= 10: return price else: - half_price = int(math.ceil(half_price / 10.0)) * 10 + half_price = int(math.ceil(half_price / 5.0)) * 5 max_price = price - half_price max_price //= 5 return random.randint(0, max_price) * 5 + half_price diff --git a/Items.py b/Items.py index 1ed849e1..d280d6e5 100644 --- a/Items.py +++ b/Items.py @@ -24,25 +24,25 @@ def ItemFactory(items, player): # Format: Name: (Advancement, Priority, Type, ItemCode, Pedestal Hint Text, Pedestal Credit Text, Sick Kid Credit Text, Zora Credit Text, Witch Credit Text, Flute Boy Credit Text, Hint Text) item_table = {'Bow': (True, False, None, 0x0B, 200, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'the Bow'), - 'Progressive Bow': (True, False, None, 0x64, 100, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), - 'Progressive Bow (Alt)': (True, False, None, 0x65, 100, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), - 'Book of Mudora': (True, False, None, 0x1D, 100, 'This is a\nparadox?!', 'and the story book', 'the scholarly kid', 'moon runes for sale', 'drugs for literacy', 'book-worm boy can read again', 'the Book'), - 'Hammer': (True, False, None, 0x09, 200, 'stop\nhammer time!', 'and m c hammer', 'hammer-smashing kid', 'm c hammer for sale', 'stop... hammer time', 'stop, hammer time', 'the hammer'), - 'Hookshot': (True, False, None, 0x0A, 200, 'BOING!!!\nBOING!!!\nBOING!!!', 'and the tickle beam', 'tickle-monster kid', 'tickle beam for sale', 'witch and tickle boy', 'beam boy tickles again', 'the Hookshot'), - 'Magic Mirror': (True, False, None, 0x1A, 200, 'Isn\'t your\nreflection so\npretty?', 'the face reflector', 'the narcissistic kid', 'your face for sale', 'trades looking-glass', 'narcissistic boy is happy again', 'the Mirror'), - 'Ocarina': (True, False, None, 0x14, 200, 'Save the duck\nand fly to\nfreedom!', 'and the duck call', 'the duck-call kid', 'duck call for sale', 'duck-calls for trade', 'ocarina boy plays again', 'the Flute'), - 'Pegasus Boots': (True, False, None, 0x4B, 200, 'Gotta go fast!', 'and the sprint shoes', 'the running-man kid', 'sprint shoe for sale', 'shrooms for speed', 'gotta-go-fast boy runs again', 'the Boots'), + 'Progressive Bow': (True, False, None, 0x64, 150, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), + 'Progressive Bow (Alt)': (True, False, None, 0x65, 150, 'You have\nchosen the\narcher class.', 'the stick and twine', 'arrow-slinging kid', 'arrow sling for sale', 'witch and robin hood', 'archer boy shoots again', 'a Bow'), + 'Book of Mudora': (True, False, None, 0x1D, 150, 'This is a\nparadox?!', 'and the story book', 'the scholarly kid', 'moon runes for sale', 'drugs for literacy', 'book-worm boy can read again', 'the Book'), + 'Hammer': (True, False, None, 0x09, 250, 'stop\nhammer time!', 'and m c hammer', 'hammer-smashing kid', 'm c hammer for sale', 'stop... hammer time', 'stop, hammer time', 'the hammer'), + 'Hookshot': (True, False, None, 0x0A, 250, 'BOING!!!\nBOING!!!\nBOING!!!', 'and the tickle beam', 'tickle-monster kid', 'tickle beam for sale', 'witch and tickle boy', 'beam boy tickles again', 'the Hookshot'), + 'Magic Mirror': (True, False, None, 0x1A, 250, 'Isn\'t your\nreflection so\npretty?', 'the face reflector', 'the narcissistic kid', 'your face for sale', 'trades looking-glass', 'narcissistic boy is happy again', 'the Mirror'), + 'Ocarina': (True, False, None, 0x14, 250, 'Save the duck\nand fly to\nfreedom!', 'and the duck call', 'the duck-call kid', 'duck call for sale', 'duck-calls for trade', 'ocarina boy plays again', 'the Flute'), + 'Pegasus Boots': (True, False, None, 0x4B, 250, 'Gotta go fast!', 'and the sprint shoes', 'the running-man kid', 'sprint shoe for sale', 'shrooms for speed', 'gotta-go-fast boy runs again', 'the Boots'), 'Power Glove': (True, False, None, 0x1B, 100, 'Now you can\nlift weak\nstuff!', 'and the grey mittens', 'body-building kid', 'lift glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'the glove'), 'Cape': (True, False, None, 0x19, 50, 'Wear this to\nbecome\ninvisible!', 'the camouflage cape', 'red riding-hood kid', 'red hood for sale', 'hood from a hood', 'dapper boy hides again', 'the cape'), 'Mushroom': (True, False, None, 0x29, 50, 'I\'m a fun guy!\n\nI\'m a funghi!', 'and the legal drugs', 'the drug-dealing kid', 'legal drugs for sale', 'shroom swap', 'shroom boy sells drugs again', 'the mushroom'), 'Shovel': (True, False, None, 0x13, 50, 'Can\n You\n Dig it?', 'and the spade', 'archaeologist kid', 'dirt spade for sale', 'can you dig it', 'shovel boy digs again', 'the shovel'), - 'Lamp': (True, False, None, 0x12, 100, 'Baby, baby,\nbaby.\nLight my way!', 'and the flashlight', 'light-shining kid', 'flashlight for sale', 'fungus for illumination', 'illuminated boy can see again', 'the lamp'), + 'Lamp': (True, False, None, 0x12, 150, 'Baby, baby,\nbaby.\nLight my way!', 'and the flashlight', 'light-shining kid', 'flashlight for sale', 'fungus for illumination', 'illuminated boy can see again', 'the lamp'), 'Magic Powder': (True, False, None, 0x0D, 50, 'you can turn\nanti-faeries\ninto faeries', 'and the magic sack', 'the sack-holding kid', 'magic sack for sale', 'the witch and assistant', 'magic boy plays marbles again', 'the powder'), 'Moon Pearl': (True, False, None, 0x1F, 200, ' Bunny Link\n be\n gone!', 'and the jaw breaker', 'fortune-telling kid', 'lunar orb for sale', 'shrooms for moon rock', 'moon boy plays ball again', 'the moon pearl'), - 'Cane of Somaria': (True, False, None, 0x15, 200, 'I make blocks\nto hold down\nswitches!', 'and the red blocks', 'the block-making kid', 'block stick for sale', 'block stick for trade', 'cane boy makes blocks again', 'the red cane'), - 'Fire Rod': (True, False, None, 0x07, 200, 'I\'m the hot\nrod. I make\nthings burn!', 'and the flamethrower', 'fire-starting kid', 'rage rod for sale', 'fungus for rage-rod', 'firestarter boy burns again', 'the fire rod'), - 'Flippers': (True, False, None, 0x1E, 200, 'fancy a swim?', 'and the toewebs', 'the swimming kid', 'finger webs for sale', 'shrooms let you swim', 'swimming boy swims again', 'the flippers'), - 'Ice Rod': (True, False, None, 0x08, 200, 'I\'m the cold\nrod. I make\nthings freeze!', 'and the freeze ray', 'the ice-bending kid', 'freeze ray for sale', 'fungus for ice-rod', 'ice-cube boy freezes again', 'the ice rod'), + 'Cane of Somaria': (True, False, None, 0x15, 250, 'I make blocks\nto hold down\nswitches!', 'and the red blocks', 'the block-making kid', 'block stick for sale', 'block stick for trade', 'cane boy makes blocks again', 'the red cane'), + 'Fire Rod': (True, False, None, 0x07, 250, 'I\'m the hot\nrod. I make\nthings burn!', 'and the flamethrower', 'fire-starting kid', 'rage rod for sale', 'fungus for rage-rod', 'firestarter boy burns again', 'the fire rod'), + 'Flippers': (True, False, None, 0x1E, 250, 'fancy a swim?', 'and the toewebs', 'the swimming kid', 'finger webs for sale', 'shrooms let you swim', 'swimming boy swims again', 'the flippers'), + 'Ice Rod': (True, False, None, 0x08, 250, 'I\'m the cold\nrod. I make\nthings freeze!', 'and the freeze ray', 'the ice-bending kid', 'freeze ray for sale', 'fungus for ice-rod', 'ice-cube boy freezes again', 'the ice rod'), 'Titans Mitts': (True, False, None, 0x1C, 200, 'Now you can\nlift heavy\nstuff!', 'and the golden glove', 'body-building kid', 'carry glove for sale', 'fungus for bling-gloves', 'body-building boy has gold again', 'the mitts'), 'Bombos': (True, False, None, 0x0F, 100, 'Burn, baby,\nburn! Fear my\nring of fire!', 'and the swirly coin', 'coin-collecting kid', 'swirly coin for sale', 'shrooms for swirly-coin', 'medallion boy melts room again', 'Bombos'), 'Ether': (True, False, None, 0x10, 100, 'This magic\ncoin freezes\neverything!', 'and the bolt coin', 'coin-collecting kid', 'bolt coin for sale', 'shrooms for bolt-coin', 'medallion boy sees floor again', 'Ether'), @@ -58,8 +58,8 @@ item_table = {'Bow': (True, False, None, 0x0B, 200, 'You have\nchosen the\narche 'Tempered Sword': (True, False, 'Sword', 0x02, 150, 'I stole the\nblacksmith\'s\njob!', 'the tempered sword', 'sword-wielding kid', 'flame sword for sale', 'fungus for red slasher', 'sword boy fights again', 'the Tempered Sword'), 'Fighter Sword': (True, False, 'Sword', 0x49, 50, 'A pathetic\nsword rests\nhere!', 'the tiny sword', 'sword-wielding kid', 'tiny sword for sale', 'fungus for tiny slasher', 'sword boy fights again', 'the small sword'), 'Golden Sword': (True, False, 'Sword', 0x03, 200, 'The butter\nsword rests\nhere!', 'and the butter sword', 'sword-wielding kid', 'butter for sale', 'cap churned to butter', 'sword boy fights again', 'the Golden Sword'), - 'Progressive Sword': (True, False, 'Sword', 0x5E, 100, 'a better copy\nof your sword\nfor your time', 'the unknown sword', 'sword-wielding kid', 'sword for sale', 'fungus for some slasher', 'sword boy fights again', 'a sword'), - 'Progressive Glove': (True, False, None, 0x61, 100, 'a way to lift\nheavier things', 'and the lift upgrade', 'body-building kid', 'some glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'a glove'), + 'Progressive Sword': (True, False, 'Sword', 0x5E, 150, 'a better copy\nof your sword\nfor your time', 'the unknown sword', 'sword-wielding kid', 'sword for sale', 'fungus for some slasher', 'sword boy fights again', 'a sword'), + 'Progressive Glove': (True, False, None, 0x61, 150, 'a way to lift\nheavier things', 'and the lift upgrade', 'body-building kid', 'some glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'a glove'), 'Silver Arrows': (True, False, None, 0x58, 100, 'Do you fancy\nsilver tipped\narrows?', 'and the ganonsbane', 'ganon-killing kid', 'ganon doom for sale', 'fungus for pork', 'archer boy shines again', 'the silver arrows'), 'Green Pendant': (True, False, 'Crystal', [0x04, 0x38, 0x62, 0x00, 0x69, 0x01], 999, None, None, None, None, None, None, None), 'Blue Pendant': (True, False, 'Crystal', [0x02, 0x34, 0x60, 0x00, 0x69, 0x02], 999, None, None, None, None, None, None, None), diff --git a/Main.py b/Main.py index 3b780520..8c079b6d 100644 --- a/Main.py +++ b/Main.py @@ -22,7 +22,7 @@ from RoomData import create_rooms from Rules import set_rules from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items -from Fill import sell_potions, sell_keys, balance_multiworld_progression +from Fill import sell_potions, sell_keys, balance_multiworld_progression, balance_money_progression from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names @@ -216,6 +216,7 @@ def main(args, seed=None, fish=None): for player in range(1, world.players+1): if world.shopsanity[player]: customize_shops(world, player) + balance_money_progression(world) outfilebase = 'DR_%s' % (args.outputname if args.outputname else world.seed) diff --git a/Regions.py b/Regions.py index 4da654aa..6794eee7 100644 --- a/Regions.py +++ b/Regions.py @@ -902,6 +902,13 @@ def adjust_locations(world, player): dungeon.small_keys.append(key_item) elif key_item.bigkey: dungeon.big_key = key_item + if world.shopsanity[player]: + index = 0 + for shop, location_list in shop_to_location_table.items(): + for location in location_list: + world.get_location(location, player).address = 0x400000 + index + # player address? it is in the shop table + index += 1 # (type, room_id, shopkeeper, custom, locked, [items]) diff --git a/Rom.py b/Rom.py index 43ad26ff..62eded0b 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'bffd4e834049ca5f5295601436fc6009' +RANDOMIZERBASEHASH = '05128f2ed347479abb5f3149463bb06d' class JsonRom(object): @@ -535,7 +535,7 @@ def patch_rom(world, rom, player, team, enemized): itemid = location.item.code if location.item is not None else 0x5A - if location.address is None: + if location.address is None or (type(location.address) is int and location.address >= 0x400000): continue if not location.crystal: diff --git a/data/base2current.bps b/data/base2current.bps index a78021b41948b971adfb2f134e573dfd72d09b2f..81effac2f4f23bb5a75cbff86b2cefa2887cabce 100644 GIT binary patch delta 11922 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 a{|BES7VIE63Kwj4Jtn*KV*R7}&Ho4UnbpYv delta 11386 zcmW+c30xD$*Sop6As|QOkYzywo+zGpp`xIog13ko6%~#5RYgi>0}BRRk}$v;B4&X^ z3`m2b#j`{dC4O3C>s73GwHmd?)?T)M`6h*5=Dm4yzj^cKy*GPa<^H+AT@w}X@)dRd z6=fU;n5=1__Mk57gf?M%;D+-?v642OpRd-E{nSQ>`&lYhs~P4VWa9+jIQdR{ZI+^c zr!gHcUoJYys(notwv+)p|s==mpF%!A>A%>*BNrZN*YtrO!mLb zk-HxFWN8YFNyQAgxl~%A-!WgwGy~2q%u+I0KfzF5q@veVqr)L7&;_WZrsGagRl*i! zP60zUtEA&fR3v=bRq5x!)JyU!lMuP-;oOO6o{2 zWMx?eNhPOO%L<*R|w#2%cofM@s4W`oT3H;dyT~XZHfBOja$fnl8LOx>!r9 z3XG1x64i5fn-}d7a+ym;b51KN=Laf=L3Wc6{FCMZlB%@iblT`h*Q-JcjejxZS67Ve z$|;3{+DdXikZRm-Gvoju#R@9Pga2h|(#wq!Y%PqT7&4^O_?9MfdL{sYQbm$i;c{T7 z$(j4WNtYyyDwQUiwPbRE)DezGd5dN|UxoHAWwnfWAS+CC73AD-Z1WGNV}dBROKgW*%s@`ywAkFjkFC6em zuBap%;Az32ki|EQ!_h`wM*Ho^*$;O}OJnFt@;>}mAaQ$inRD1xBVm{@oOiJVjuEbl zICqL`VaSuGxW$M&e?8>hs@DI)NvO6N^kvmhctO}3p9k*=hbU%uva1=pmOOWvlMOd8 zS!mRFWevGS%{h58$3U7PJG!{xfc|^}K1oL02yA7yEGa*)kDpggllD0v>12{p)qR3X z*RXs4Jjr_A++$Mp@8H5~D#`92(Ntro`iyW!m3G;PAz5iTVvH%EMb1Fw;lM~Zu9SgA zqF^`e3GOF`{0Y{JrsJvbooK*_fsY_=cUP*OtGS&fRbLH<_ECPrm|RTd>(hA@p;isP zW_+c3L34zGA(ymqIaR7RaF*L(MN)+{9c|(D4lXbgZPs5uavM?B`=N^)zm^(P*-Emt z1Z{=5j3Fl-Fn-jMp^rF65)!Lf4>`x^uT)2=*qqkGSRW;`k8fWVj`|QoV-^DX|1)O6 zve|D;9>m8UyMTCb(veoCx^s#PFEDJMTabQ5)uZD^A4CTNaIdsvZ)kMHSE#^cqqvG8 zA6_;dW5^h2Og2`MyJ$|sm!K}cFO}X_<$cRtR~>`H-1{x5xXPh}LPlKS06!b(NLd%> z6gcJ=GGy5!E{T4;d$}ftew<4sRWhV+sr0gmjCE-rvg?X5o?@~lHyG0j^eG$4Rb7B% zM~^5^*HPjmG|pyt+&z5Cw@3hFr8AqZda4#9u1$W=y{ej;Nd4#uA_pmNpCYfg_RFD( zB^$aq2a$~?GNlx8YQL5|fLP;FHXTsx5sd>l+#@RN|2}dKL79$ReuhhXc`O~t{Nyv7 z11mF=3b@rHaLJaRILA>fX#||(CoTB|>UG#3C+h2jYvvy@<(*|JEo&$8Xg;H0m*S z0SRH6pEew5vpP^q84{K|*Nk1N>hHPx_qHxX*nGE*EmO) zHp_U!=s2XSzC&Xd^mh)@)%Pme^OqyZ#Q+zJHXog@f9dM`TMOyN?*ge>@)5<^5!YO5 z6Qu){^fmi2`s^(XEtsV_N6Ra1Ru-B<7hV1Rd|+5yY=s9fKFdfuXS7+;`g8{Ms%;ZyX#W~nynNyphZW{)Edd4EBgFx z#q(Vn<}xQxGG-p;a5CgRtvIBB0!H60pLOKQl~g&a8* zZuTm|{o(Ikk?A66+=Fg1^*N)YfRYcVR8J4P#4A#3e5)cq=u*6a>n6Elc#e=2Zk0rfHN)zjBA)Yq|j10qn#ng zv_|@@zO56XKnD$(b`buASq$UaM;UlZQM^CNPN;>zRf~n z`uGs%K)2d=TB$cplbP($uPBFiLA|)`q?SyBb$$bQWhL;YUr@lMZmt4tRyTKZ^2X-* zMOyL_{KGE`?+53JQ^GUfaWSQE&eHPHYKENsf|DUhLcpc^XTz_>Bk<+$tvG?#a|A~D z$4w(YZ~}vh-2I*n4KH%ZlUS+E+Vp{Q#8OYQ+?<@FWJcpNf?SO5EQcd|R`xX4?IJr` zOWvwC%85rdd0KldX=&B?SN03FzT;$)64kELTwt-v@Q%warB8F%TA-Q@lSaoXn!m0e z^2LS2qlQ0#ktqjNSHI>YVL%menyV(4DqZmFB3GJzQZ=bmnnP)`;;;T^8*IADwW#J^ z<+dWG-Bfe8;pQdx^OTk3BvkC!ikKeBj;6MP^2yttEoUiLZV2m-Wm+(n)JW|b->MZgQ|$)<{#9Ox!)Qc0v$C0&iihhjhYO< z8WR@u`xP#^08U(WI~K5Cgq9{1*OGHe;iEBq`bDv8=R8aXl}PIaml~6mbku3qEBNvJ z?+g;T;g|{ob=PT92Fb+fqLxmhoJ?umme`Erme$B|(LB$nuesb$^6pHse{0%=l{kL5 z^{a`#Li`ZCkR0Z-y~_wZ$>S&$kWTm_S?WFi0hdN=ZU5NaNO7xV>MWiYq5yZ>YP*0G z*KbV`;+tEyrG56`*X=cOxXZy3EKR*0YApKyceOUC2wuxv>xz69P|GGylJR`q@r zF{728I~3@b4hOc^Cph4S2xJq><;V$Ceh>zX0L``-dw3=nL#CYLa_jbbKdDm8MTXT2 z#Dq*ZT}$P{2{0q`->8aHT&F<8e+7PTuRO)Ei?%;lPnCFjHnvxt;+R+I?FZrJrNhHP zYxCQ5M7@AzjDF!>gJm#J(l78bUU=59)8IEtV^-v~s!x@!2CDb@t?E_a!WEH|uiVtr z6f4IGV$}O9Y-BG$;T9dmV*?6c6iwkQbBiZWHI>--P7&E~ibG7UK7|%gFEy67P^mEf z%5hwskgiYQu-J`*m_nm4feHrHKLE4Rdec=h(*^6SMD9#vZUqRb9GO*=j7 zHthV4@>lPto$iJN_%Lf8GHiw}iz3cWTl7FR`gIa38`#~jV)g^td=5Tm+;w)JO9RKg zEK7#lm&FXrykcy=EVvm3;+^^-8|dRUH)j~R@rqGyPN2KkaW_<67C9S$7wXJzau?l@ z1G|<*;0%1ZY<=&Phqcd6a|Ud#;?=7^u}8Wm3QY5T?5C^IFlYJbL5qhxK3q=8%RP#Z zr&>r5k3@!dhOKqy&}g0FzG75(sO zuz1BX_q%7&j!W1@@a>8yd^_}&#Yc}mpW5vXSIh@L@RctxtGC_9a^Sao51>Y=@-}Ae zuip+=%8G(7@by*O3T&8_u=ACRaBDvV(s9UNsZAIJ!Z2GPjtIRlTaXKSVYXlwgyD5Qf0cm7_x5UWB`TKI3a0YxlJD|Cp~LoIEg=oeX=e8b(Yi zd_9Y2#q1tLk(Fq(DwB9t+%7^HSw<~45h(|B4# zSf=v&q? zM8wXE$_m^X#nyR%65L9n@)%UExv0#;tud&ayQtibTl?C3iwNsQWe$rM*RI5^QdHvJ zq1IBdY$%Ld9iw=1Q5l6>6A-yihcX1WjzS$JqK?EDl^(b?5#`3A+#Rd(AIv(Aoe7u^ zm~}k6f$IDjvra&zNvJgEqVfmKn#%5HZerHy?0`b16SK~!cL%knG3!jUm}slo7t}Uk z)-;qEcu_3^orf{&EYw_>j@l1|w^lz8@~j70A9y@F8r?W|vMo3V=`}gwudFh)7f_D? zrIP_8BL;UspYedPdt2tRgQ3UT)gil%p4#)V1#9~TZ5(Mk zj@hi36B+I{9JBkfCt)hQur>sbf_K(RgO^+~PZ*@T+#^3@?TPDoue0`?>42+Xz`9vJ zi%itNELl{wbD4@A3pcKdOp`4Fln~A#0n?uMTfY8#l_*E8K2PTu;NWOrCJ%n#$QMeE zcnO-^VnF%4)CMXCPL2V`vw7M4j(9n_?2ib`vetE-RN!+DcyHYV#pHc}y1+hR$L<9+ z0F#@s8mo_<05Anm$?UjX0Qb!X4cpT|Bv?HQG)Nl_t10dC%jj(AA5`Y%$j@^=^|Oyf zf>pBseKZxmSEsa8;%X$tIr^EiUQ?;8yYzKs4*5pI$zkH{TtlT!_ZQ5XkHGD=g^p}yZJtkJo17|g??vEf*j>%evZw{9s<|a zXp@}Y779)s0Gj#gB&3<1@oi)61K@C2B9FjF!K3n&-f<6VmFxMoId(rYuc?19s9eam zrQ7}W{?L8n06Y^8-&l&2p><<8o&g_joPcH=zA1A!nu$_@+vIj05ZE@_$$v)ekE4|H zaN8zyS8uZ!m8rOGGeTPsIv%%eLFjwfxTzdp4aaXD>ozwPP{R%DpklK$+;v}m%8`@n zpwWW3ZudsZA>=z=x{~h!GEmP=0XP)+E3A(T9gnk>eh=&L8`59asa8 zZ5@DbhWEG5&EC@QMhI9}?C?sc>s2&x=nc!>B-AQl4xL#j+xP)aoBZ^K=pb4Xzz@>= z%Y3`Q+(Yx5oYzezPnxX^^-d6P&f9nz~Um#5~4Q~7!dcd-6 z5%>mpY}+jS9Q?FR7rJB+Fl&Cx4>h3VlT!pY)iDoqKFOMPX29m{Nb`&NaB+5{RrQBK6e zfjf41cn+Z8l!xjsyWr6sBY1gI_;|-c@1U`u@|hU)x2$D1!$~_A;OUUvIU;3BFrZ@8 z>qQ?<3X&RnE02? z`K#p`V$l$QO!wF_J7P2gH2|4X5!#tl1YpVkf}Cb=OmkleaJJhe$n>78|DJ7(6-g?UNv(j zTQ9~y)x6Jihqx^i{%`l35aE}g*4NUIu80$0&Z>z1PL+w1vx{3-f8oIK+}7E9{c*2d zJRGQo(Y$Do4L9UQ3YQE9>|$7!8|pTFCk}=v$F*8=kKp(exG=9@uU=#Sf-3`xsZDzC z*di5*1~rJFIGXV&`?WsEtT=2^Bag-Kr~ z^0x1Vd0#H{eEVK*<6-uh#9R2|my!5T`0tm~LwKwIJtfG>yb$(eH`XG^a-I)U#{&I$ zn3ca39j+VstMEB6UXd_jZPKR~L_xgM``R_}n=Iq$uq?~zuxIhen`%!gh-Y`nDk`%s zoDQQg!{*EiZEwpm4AaNKgNl^!d+6Rt{*^=eT8+nIX2E}{k1N%u!+#W1#3qG<;jmHxSGM1)*>d4)NWhygP$Br6Go3M1nt0!X3Z*^jJ99&zFic6uTAj7v7MgIaj2uoh8 zZ=vc0N}9x?Mcel41$$cCE9Q!X(-*4PjMiYiT10$0Z0rz|!8JzWT5A^nE!H7MNC#2p zD<^vyjHIHqvvwhlA_w91F?bxDR3C+Z16S8)x${?)QiTT53V5}?k6Uk9DYf4a-ukva zlQ(jy_W>2J&Zj*2`MrGa1C+d~?@;;%&lD!NA%$+6>~y!KI|a53ySsjj&w;A36SUKT z9EHj9j!fWvk=}a#h#vR$Sa^UE{yLs_Y%EA=Mq?%+A^I8irqI%rQEy$`^kMNA`bh7zKMD+mo;(zZ7oF zFGc>sxw7!JfR^X5GuM^Y+R_zHp&75k;F?!DxupwPuI|wPAG#NSIJ|sJ!SnKkQ=5}< z2`p(|9lEjBNUl1JoWo&CBiW>plK5#O3Kq4KccI%?$;)Lv6m6NU-{M0-fdD}Fp=Bzb zQ^ZaUW#EiZMuj`2>`;X7{Dul^81YZ__FiT5mIA}HbcUTe>G3Y$j@$>dALCV+MeK}M zPe4YP8{-{iaemCVdy?B>^H;>Exsz|P2}=N!C@FWtv>0FrPGBm@lLefmSU+<)qoq0H zGcjDIth7u+j?Sv;=HbjY)sBhgER`!j-F z4NaB___y#U%aVCKF{3{MTlFVkyZ)Qf|ARxu-nXS)glXL{t_QP=>i(=oXksEuj=N7^ zgz6%y$DpL$^m;YrXQ-e;3`#0et)%Ou>XPbd{~HQ`FHs0JEkS+F0*vM%Kf3f8VK$~V zAvwi_6WNdHJrH`dp zquxaEkp-bR@`wuCj7ZUVYCl<~Jrg=IB$?K)28Z<)sK z0lKR?F5BOd!j|c7>bM+#ODe+d>9~#lmgxw4j8^7vnSrpM(bWAdNN1Pn-s`wm{+3y+ zAJDl~b8r1Evsp&xSIx-+Ea?afsphf+EEx!ktmbk8kRi|Lq}ANU0LwhsADrQS6Sh*X+Gs(QLM)3S8Sr-aE({rUWP}*Ngiwe+3wZ7M^lpp91PeRdfG}EeqIKKP5Ha z;9bb9tLF0HFw_m3rDVsJ=#xrn>V}|7{+5MoWU+1{Dh{wLV*My;ry(9_=Tvjyy;u(= zm7a_DJ91l&bf0oAR9&~E`_@P#K^zem^C{*!;;7*w2^D_-4O z30L)2(hJ4<6od|jPfz_ZFlCb`&>^2kZYc%^akwXVxWfHeJcADw5y8}8beG)JWe>iT26<<8NLF%hn&iy^USgiv%jT`&nK357OK$Lh%$cRV`mZUY z1bSs(Aj(jnNH8rR+u=WF=K3z0uBOjBsui%NWCnQ{EHbc<7GC1fQeMr0z(BmC%smsoPb@?H+ZMl)*pi=>U`@@ZeW|B zPQMYlo$rsrSi{cun=TovRPjJacLu+zUNrYWjnGp3Yrfn}u!H6vIPRRA*I?`GSnn}5nD^iTC3U)(w~|we>Vqz)oH$e zeCf$f^Qx1Ex0O1CY(8$OH2IzCG#8;?_Nn$;6r=YAR7IJt6r4bGBseUWzI)%<4!Tu%Th0kTwNS(jx3 zTyveo+u{D}v&SS5Obv;hGd?3MTc8(Bk%rm*82X9E5}i?|mt>StYYid_rpzm=RIk07 zukP0|68l zZ~HA?DAeeha_TUwL|)aKKJ(9cW3LOwVHb=E-x#NVV{Gf4_(+A!4|WfIN>0pe&+f{$ zxsH?F3vQw+G4a-G;=dbvA2D~doBlwaHlOgl$nG6|{1y=gr{0WC+8+3GjlkKP zbCkepC3eB*H<#ePaJ>Bo(E_37qS*n%Z$$+9SdEhPg|atloPCq6)Jhl<7LuEq1f*=Oa?v-SQrmK_BxISu9;s*&cZb2Px2J1~{dp;^TNu zqS+U>?X&mRPxm_jcixFoES?Q+h|vW)?qhza?PtDIphj41j$EJX&ved2L^VoWce`A@ z<+uE9sJv9541sz99V z%msLCLvEB>trP+|$|HOBKWDce47?j7@#v$z)M`QjWKrf(S7m*AvRW%3`@{6R!NLW& znvI9@yK#%XNHvP}E49d3UU^zSAxf={MBPaBLH_E}v!&-szcQEjNk8VR(eG1EL%N^3 z)8!j^SQ1^UKuJzo|4w!;a=O@2Q(o8jSjM{OW7(1L?cM${s3;*%Q#E8}^AD&Rif%rO zx44)Y5voRjL~qJX<6z>wJ^`bbm6`f|%$IB#g}fd=SOnL@4fl%iweZ(_Lvb67xnD6R zD$5Pr$-3bbBBf$>t4a4G(yoy|f9yjXxOO-#;+?^J%>im-eR@9C81AElncMCk@sGbm z{Z&60ez+ezakZkXe0pzvZ54-;d7w_?Tff+yft%c!R=MnT5Xf{thRrAU>NphcF>y|j zMTmk1!gdso_7sI?ewZmP35K(O z>@)oukgOMRIPnA!9YB6BHtsi70M}zFqI&5gLIOaui9BK^t^tlmBvV)Of&&0+)k@ZT zb3ILkH1a>k1Z!ZzhH7@z26+3&S&Bx=gxUCZPh$RooR$=t15d-rdfz4e{F*HxIhK+^Y z4^uO4@oM-Y87)Agpb)hgr_tbXV))0IU+nxty9F{6PJfOQ%$T7sXR?LnJ+SQpA2~O? z7LoZcS^#)2g)%m1VE}+Ja{|Dv`NUZzOnNL4omDorUsuBAk9&t-QA$(U)UKgGm?K&L zM{15_Q?`J~7RYCQysU(W9*>C6FJ=Vv?40tQA5HS+Y=M2)%#R@jYP)L30p9b-6#;-T z3u*uQzD0v5Ioa|Vm&4&t`bBFBazSrXQyj*7)7b6?q=crx)HM3FJ4QF<0$z4g`I-`# z|0E+Y-S1E8Rn^wi(!M}IWEIjFv8xb1e=>$=EQEcY#!p`;`e_8PeTi#?W-$%~qhD{t zWW?`Xro zK{8B7eW6zB@?8BD6&*Eiln6iGV zs@a!WF0l1;@^b(`r(CoRum&oCO|E+9)r{!N(Qd79x*u9DFxAER$1HDBy{|-rAX+3@W2VjZ!TUnN z?*ozGO7@!?XV4;4pEqOl3z5@@7I{k6G}4V6u0H7xa3nNLiA${Dy60ntE~!)nm_M<* zt6l_3){y9%7~ae15*IcP)ezHesKW`!SP%jN;W#m2KkR-UF2;L-sRf5}1t{M1-|S(} z^RU3JCbO_H&LxGoleF=iiRi5i4*Y4YVD2U)hXpT22Crp51lsm$f=9pJLkkXiO4bV+ ziM#vZ%@(0F?LTv~tsNdq#cwjsS3Ywu#Ps45JRd_taKumZ6dI8$MyCFU=0N4bLIRO9EJ{U-Na-YS5!f-l5K9(Befi`!s z*dM?Mci8?i96t(wd>M_iRQFthRJnuL3 zQ5ky2K#=9-R>Olo$3}{I`a6fudXtjVK1c`K9=Ev1`PqCmysj?2S|7C+KK?n8x33h2 zy)r9ys5u_eHtlL8RP+8{f56brp0yuP*31X)jpEc+2Aa^izZ2U$05G@SqSt z3(H`XgXB#rgHs*o8M3T(lfw^BSf&AiR-w8dxRI>^o}M&@Ua(CVcqp@Cm@`(*QqioE zp){a3yI)tO0e-|r4Ya(OHV}nWh*k}|KC0C0jyd~UqCe&nODg`9OabbwB1)!L!i^(U zm3G|qK@yC7JDj&m02jO+5D;9Uu45N&02hr{^Do3ZiQo!Y{#J_jhG*Z#@fHf;i?@lq zj1U<0E|}*%3yygg8C9*7N)%sfrAOOkPN^!siO;&=;u{YO*;GTcb?2?KhXuvwfRY%$JvpA1RZdsR-NoK1z&KNomT@hqR6U|F|S z@7Y@Pr_x*KVR$c_+2$j_gLuNR;f?S6v`Iy{yFfJHK?v|0#E$U9PXyF?&S{xaG;v5P zlaYKc?F-bdsq+l z#j5r@I6l9tnC&&G?P&_W5ce%l6qJ;E?66Wn^$B6twyD!`@hnM#Uw5Y>wg+3`slXQT z&H-T(|8vhBeNNk^Dm>gvq@S1a^Y|iGU5gup{2tUVn^1?(;!j9;*`}<+6L7wG_1U)5 z^>`TR-83iQwW_h_T$AslZ`sG4cwgS~du?u4@VMUiMt109d^x_MP4gJv5FQq|@&WZl zeF2qMKWg;@ifUTBpDNbJkN8}6 e{N%PjKjYJcJYEz#QNY{fKIZm#b;57;-~T_h#`gpO