From e834fd85a1132b6db62471399c3ebf67beaefabf Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 3 Dec 2020 16:25:51 -0700 Subject: [PATCH 01/21] 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 02/21] 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 03/21] 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 zcmX9_2|yFa*WcZQ5bl87hlB;?5EVrc#RCBa6%{-YQKO=w@vhdhWHt~m;If1f)({~J z1Ti2Dh!mA7hoZ!)OP?UZBEGP(3O*cC3eyH=LQF}Tc{afa%x6~x;$%d zk#2A><8w+JRZyNKEYhi7jr5P`)1?8LJYUIGq(nZCYSl*(4mKE$b>+t&g37vPoK3(cUpu&ZoxUF}YD$BJ-H+YvOlW*$6ij?xJx~+xE zn;l#lP?5G*xj{#u6rJNrVa!Ny_;Z@f%I6N>p~=w@euKL&`|&b2sG~{SE8Gp5JfaK@ zDQYGou5jeupPaHv^K|irG`YPv^qA(8C33nMaHcFdo%PtvxvOi)5yhxa=y!!Cb7`F; z>Iw_EkoitaWX)~~!>$z`!LY0_}n3gwVW7ecAXzX3NmRYj9tSKuFnA2}Yf+ibvxR67t~ zp(5ufbc1OcrEk9OJxzXoRmZMP%!iS@5hAZX-3tYoW0?;4awSP#gKK%=(@`7ZhXW;Q zvKS?9%ws*ygsCY0moyn<=DJm6%dyZw|DJL(Q-wMf^>sO!ehM)XN=Z63d`-izcq53Y z2KbsceT?d+?#O@b z=c{x-tH@YdC-J6e^3riGq^z90{U-;Ul8%+55rtZQp<{W{agcgS= z%E`Od=wZ;5;8QFF4St#zO1vIYoW=r?OX;Lv-kJ77s}0l za^6(OT*VdTxIekA1@)x3fvd&Dlm90Z0!}k(#(qEDXN^(ITyPh_w$j&RAWP+B?LOqC*SCKmy8D}OW zgOLiF?Cs|!0L8~M@Iew1vwIu6V@27QnyAHP3evO?#Gj3qD+kVSX{GFecV}7qulLt0 zBYHXis&aDRXVkF}sxIB1R;FIjVR2`Z z({l``Q>xBzHjioY@fo;W5Jof%mH zY3I20OsSgGGdi==V8!mk>LnEr98(^<#)*&+1Fmv_mkrdUq@OeM2bbj2WXUgFyyE_+ zt4l)^_YYF>W=)}fwg-Wu z<+t0(tJd)!EDa+Y2Dm|SHfmsEu?UIxh>ARl+) z)#tg?C#TcU6iztL4PqsFQif859pYv0rQ+XJ@yxh1*;`fCj>p{KDHW+hE6QUP`2cn3 zc+HFgF6$E{;z3~nofUOUC&?=(*ZqOoahhF9LYV5J@&~G{Ui78}spFmNx_)Klcii0{ zb}q}KW#ry3I7yq5>^sTsJ9s>UQfC>DqN)bnkzT$&s*B90q+v*}uc9?}F!CB|Jz6na z*c7j0M`?0ZvF>mX(xx4Z?gUzS8Ql_{ip;*w4fdT1JpVFf=KlX5Gxv{U|IZZ@+;OO|pCogC#2r@B zjcQSo^He(0>+?BsR-djSAi46n$Fi~}(f2B!t3?x2b+(Eiug;|j8w zjkP(6HrczXtlKE@92+cVcFNI6c0xbLrT(RzI^cF~;iAIs<{Q{t{5l?imEmsqITgA3 z7(D9eGY%CvN0S0hmvu~efYVKotH?A?H;5sbjN)_|fVRr?FxoegIh~0nCv$DzJFdnF z%Uc-ZOv)7GGi}n+lA{Vy=n;iWXe#Pv$p19!hcR`F9gEK?$b@V5(;D{x1?i&YvWhA2 zR7L(z!%6rQ#YY?PDn{pxnwoNgyM2+YJkOOnq#n61p8cy7eKHB{LV`}tD($cn92*dm z=UqgT{+-;O!ke#M&l4E^*7ZER?d)NvW^{Xy>K+%Yuj1KigMTbq{@sL0EG9H?6!rPl0wqRfg`!48)N#K_;E zt!Tvb>=GS2@4$I>r{e|GmtBnVuv~e%E!Z8&rn@Z|%Ts3l!G#pVg)7Tq(ekz6H%@}o z9TBU6wBR?mMKpm}{Tt*&;|a@2cv}>nOupjyS|$1EOV-!Fz^e5kxhiYhD{e51dYENv z<_3%AHa-%Q8OXpume~C4*(5RvB&TY~Z|ZbX@h?VcYF7c%;L}-N|hCL?LV_?+cmC5x#$|V6UqB)hPw^7uef_yUQW(L*@HXLSO&7O z)J{;Au1E{Cf2f|apiarK<_8s-)CTqCDGpy&Uo zhu6>4i>Bza_vg-s4`N4*Z13Pg0OfL`Ze`#vs^{c~K5kDnHHA$aCQr(@R+{Dol(Wyl zQIkhU9z^q+ucoHM#otafQVFb&=`=HCFUY1~b&>)WPkl&dO};riOG#(_?<&ln96aGK zIObXiGKG1?I!6T+#BN-8FA0>RJ;AeBmn2sNonsw5?=SgQ>n+uuR$`#`hJuv9pC*e5 znjr z3LcrZ+ac%+?%mBbIGvt>q{+Gj{ZY&|L~Rk>3h$>6A2khsB(89sUbL4w{xvFrn(u&j;l?PV z#l(|ico$}j`Z_I5X6DI%hhd9IS(nflHISmmo*$n(w=qY%E={J#v>Vc7Lzx5Y+yx(S z;JssOnyj&lc$3?yU7994HPpp7Mwt_j-$$f0M^E)9s*7W>xP3WfFB&l9O&#~uF=L8Q-JnTMaGyL^(I0;M`j#}$QC#aTs+k)uEQI< zX6m^{@qGQkA=YEdd(FP}RE_-kM2hjWlbrekP4Y}c|707K6T%J-F%OwO zWll~`g~w<2Ravi!1=703D_@+)F|5dYGjL@R(qxaKj%#DwU#NRU67*R(Vew32Pbb{B zcoNU=k`cBp9ww`pI;#rKocct4$sk_U+$7Zu|MW>aFZE#~vdYNc-wqeYH^Es*5@t`O z*yJ`)ceKjP8v=Gi0IM5cs77NLZfo`}JMgoj9xL0@(EclCrEjvM(VTvD+l7M6?5 zju&q?!O5!f2cpuq7aunqE~AE+mla`uRk_%}xFy4gz*{hFNtn!S?o%qhV&>(F5p%k3 zX4}^Lh6~O1`f!C%e_CM&g!*ypEv+A*_)tzM*kGGW)NBnY>7ZxN#R%4sRFub~4>g@` zI7)Rkc*_@4Uh--ZF7Ln$(a z8riU|idL)4C%^dI%sU7s9@MOr-J1y_#VUi?{5km~Pf*Gew;IHo4FB=&%>#tVrT(vQ zV799l868`A;*REi^kerdf2=m30g?=4LXo`B=xla2jxpOC$C?F51qt9-7U%-hk$Rlj zktTyVc}id!!zRo2E357=Mq?&!5uc2Zm(yc#`9n;b>y^(g+L^ET2GbZR*UCkSRkQ__ zV%J8z=ovt|Q-t)t3#mVIygRq3!ExA&DwD7)_tz+9A#<-4Y0@dON^RSPW`Hk~3+j=E zEliVH-(hzuZ<<04s0AhmYp(-jFFvBit=(j zZq2AmJEj1n;WkQPoK!{TdLjn)eH<}Q1) z3%mJwtI4+3k+YUNIMgJm8~;D0+z!`}3KeQoulU-L@;cn!{!}Xrzpv=;*GTT4mzjjE z7!%r^3+!7_`}i;-Px(lEuufXYq?gl1%*2OF;E!WW1aL8qMWG!USDW*DThSEme$K`* z?PiD=Z!gHmoqT!>MRfrOtudk%{=je*8ZpHCz;tgt95?siq=)F z8(QJc9(A+n9*|zJcpHae*o zCUkoMr0Go({0#4m?U_K#f&pN`B$Coni^VdKnW7NXi;e4A?CWqgcA5g(Wd!hrzdKPd zA|oWkd$SPJj_uCvLL&0sEW)(o5I?FrR~y}(`$#+_fh+g`?#vjSy1tD$q7=_w)rRZX2@>T)Zkko6$B)QL`LJ? zlMxw-cVmbI;@$jG=k7UX`|dQepnEl1ka_aGSa%%C+m6-ynYT1QBaFCtJ(?%YC48eB zT4Ch#Fry0|j+jKuD6%HRVMc!|jmE6T5>Gw~GX`2|aOJ91nt8FTC3w6-w%6PE|d_yIo4{yS-St?1me1TS2Olc8_MLlQ{?w*2TQ&H?rH~eF* zKatY|9o7YkgS#1LP}78Ur=o^L_Amm_SB-VgM`hDc*~lI^cin)1=swOm$za5Kl2|Q+ z3)cI&gdeTPC3a#4iPR7Thr|8r_fL#rzHtTdOw8L{32L!4Wx#+~-|!iYRvO-I%_wp~ z0TTlwsp2p|g=sbc7?d3!@U&aPH~?lMC{6&hL_DS!I!yyKvdb2+W8z?L_Bwnoe3YDTeU$sJc444n zhrCA3IayCc%xW0n3#c`WEhs+m$J#WRRGalCH^n*|O@bm{2GJa8vkYyc0njBFP+r=E zLx8%-K49YxAWIOF>anVBCyf}uWI!dcQx5`oXaQ*0oeBcM`uU(Cv{AdBQvG@b&3DaD zJ}b{5pOW29B-VqV=%hEf(rV$X2AaUkp5Gp!q*{?ZwAmzfo;H3^E!8{IV{s`vW(2=f$x55H6{XF2HC zr>0EKq<1L?$6u*I1{iQ8KShxX+CwVQdzY z=t}B;>D%M2nBDIJ@~h(}-)9yg*sG}131(1m)u(WCPO4zK=rNRzg`GLUAq|pJIClkj zX!!Pn4RZ*|!{}%da9LT&cQ9ix;#NUtMcL+{;oH(ac1=zDsKo5lH(Q=~C`Jr7wud~2bGN#`Jc%WU89pK9cr zdB%k%7d_Dw;R(u@@r-FESB+~n%-#|~WM;$CEk(qdZs;%dBhqKV$UMif`O%B0o$z5>Ck%@?iC1FN7ZQ3_f-wVP%>uJ>x5#WSPUDppmD&H7Vu;&H{H8DJbZ zahEvpBXQyxk;!5I*$(KWPHuua0~%73WAj}?Ed7~A;mn^A|0Z_FBg#h`R7yFqyG}FC zU;KfxPGGdvPeI=T z8TvRYNjGjVxxv)!fSqVWPKz2R0KPD;GYumV5P|Zai|_xWw=kt?G7y4L2^T9Wfs!?= zO|WFU*zr*0z4dwGiTB1*E|cJe?K7q=39cSX1x~%!wj}P}Ca_`2jjv-{ZK(}sep;Ab zHI^bbAFWvL1~f}jE6XI4i#}f$T2?XIvF=is-SMvNJ9=Quj@I1rDjk6x(A%$IC^1!pHbyeT-2L<#WY3f>hSl7mITYm&l{WuV;73L6@r!x})v z!?+@LcQAr68yvfteSfQ?4f~LxFdJ_D8`^z<&v*FaTcB{~e4_IwxO`{4UvlR+X|e~H znLqbBcs~@5OXkj<%LJv#>aeHq%+83>Jp(DVSQplfumrQ;W!&UC09T9#`qDSKzFHIv znFVlLEqyO%NYbPueJ>2dlQVSp5}>&dZ3omA%-E7i=8hii8QIz-(w@=Nh4 zQgPHhSiEbu(0&vJ6YnvfL7Uw%_+dD8_i`tXI8gpb1R@L@+3hDGw|fbZ<^%uQJz-v= zC!j)@si3~GYu|nDCXZ*Dsu{cVooa$!n9{^U=YW_L z!@)PXMw#htj(!>l(}-uhH=17?t|M_iKucP@X&^`M0-WK7d(h7xmh2fre7YW9+A~`= z!3(s~k+{6rqW{nxuZF=J+7f2R%h&3GALs9Q4Gav#+gr7CPk4G}@WQ zJ`!n`@BX`C5m4C}cbbG1^X9R2A`Db4{;22`b@*<7-(~VcX@s&v4@4{kG5d ziEzig1P+wr6+|$|-U+YoA1+ui2Cx}p;Gg?_gmd=bV61%V?lzYL^>}(>22hyAz20k} z+W8`ILZ=UnBe*ElAK@^xTOQT5IQEM5N7-R<@8MdvLTa1FF|0s|yqOIG*$_or!56qH z9H@cGTCPkZh=77aD`w`-xvY@p#DR<<%BfCXvGVXE%3P5Nn8(^tu7kAMPVb>{bRAUa zJvEo$<*t9u z6P{W5Z6ufv$aa8{2k*nMg4NNEU+E09HABUv$Y-YK!kA>BMxrvg8>Tb82-8Lw5L2#> zf18_S0vP<98rLxK8N5*7>l5~@F5s)O8LQ-qEb%;Q=ID1WO6psEPxDKZdaRb6G!7wNX|ksX(|S`YVyBLSzZWLEg+Ai4*0W3YcP`JH z5?0c6YL3Guzc4M4S#>zbTy6(+1Ur%zKWkz0h25D@=7+f!k)@7;?R$6FDe`Of;r2S zZ2I9gwe}T3HbuxfwHs$wFrxfEizPQVA$MbL$kdRj8xfbATRnDJQQPTSTb}3Mk;Urj zkM;fDo3V<+LG4N#>^VDH295P%L7;7M(~QyZWxYS)5dxh~`UVYE>(B)j&nlhxdRrFn z1=cGPT4?OgWiAj2{J$o-Fj`Bv|m2w6vo4BvvbXq_wan+yy{PR8rhpKF4C&jA6_9=0 z&&%~_9wEb`H%ekCgIyH|4*ieu2h1uvv=TSTZ<2Byyb1i5AgV2)UxuLQCP1~rOH>#F zTSvn26qR2mrwSPKu)H)W$?9IgR2f7N=3|cJanU^9188bCfaJ9H|M%YytdAK9|2b*#+!tTlO&vXzcUl|-#mS<R6}n#oQ_ zE8?cB<^U-vx~3zi6ym+2lU&#NBf3W-@BOYoRXX zh)xP;6_ky|6sjyAy-CRKOZ(@V^ENx6to<1Z@)PXR#|goQG!(Qg%umLh?3Nv+Y+g?z zPRD`h1X!mCA^uiEqaxUaU2~!QZ)I;(i+#ny(`x}7Qus&R#}In%Wa1$ZL+>E1;vD{q z1{mrP?BV`(O7K4nanvx^n<>l6P{4(O3|!t2IT;IN>Tz^Hks1ZvE)bJorT2~qd!VvWBMp}9Qx};3D z$_=;~ZP0O1Yxfzvb;_5w)su$LPc7wb3K76W{i4xky8bnSSDiqJIHClxB4qUXJRr=@ z4-iQBz{V_i;DlfS+Y*8x@1KXg`q{&fPuKjFq?sTZAGn(MwKj(B?qMa09eLW>X*4@)=KZ}uh|n*zNKI2>29Y_6nf@kMZ%aD{8O(2UP4?vO zG99vn5#MZ&BgDlOS@nF)t)v_^f?IG-b0BZ47Y(J&v*Wg<3P7>tp_DwM=EzBT zsLvxRIdV)TSId`L<8bmn?5Fc=LHj0jfx#YSq5FQqM`CupkcKasr||zKZ~X})KKHeG zn+xZE4^uv$EF(m;<|J&>oPk}MOT}Nov2k~esXZ`t09rRULG8Or#7>#Ql2h+0dLUCk zS+sJ6twzI8F4|-0ND^8}B4z;WnS-}CYnF34; z#h^x_x6Tj1+6FcESY$}x?G!s4gGNfkG}5w4?uF(Edr7kpP(t`lS;;-sgi)+crm3fR z2%Ax%TTzc)*)!~Tpt(=+nJ-oE)LfPuTg2*$w*hqrintnP!IG-lE;T1{HOyxB1NAjE zm+fjuW=qsxtGOIkLki-4P;*;d4Ra88AN9=DFc)#Zqo%tW<{|E-ntSSMn9m}=jV)@C zt6|0hmR7q|auPQ~8sfYvxokH>I^qH=xg0kH5z*?%E2w+Q#r>wA&d(Zr-1T&}9jnAi%ETfqt|H)$n+D2F;7cWG$R{7LDQy4O}HL8Y6 zZoey21kbVGYk!~&+Pg}-+769MVOXiXNOz&?8g$e(?UyL^Yip`hTSNbVUV*#v(RxhX z*Ny@32kQ6#UVEvLHR}y2{GCXX$RCb#+C(>b`DW2@`n{WWTz|k)>Ohft$_lUrL@+0DI98z7nCK8Yt&wV z31^NHi7C)@=6?jX0A6cLcU$ixhwFUgie(~AGGfP|C*tf|n?>p*HK1X_{5J-D|<_$Uh98d!NrcW@}oI(HW6w+GNA!`O``nA$#t_)7ziwEre^ zaA6c4K~3X3DU31cqiC-n{WzMRh#WOH)h3#k*o+0i4V~pdCu|b+qJ~=vEa;`82B8J$ z5X3h*)cH-ic?W_2$YRQ>c|72>Ua$Ix`nH#5Cf>utxQ!AzZd% zj9i6II_8L>{fF+9jXLlvj5t_=Ht;FCS&dZ4P)x~dQrw>Wiat+dpp zDQpOMBhR@IzQ1tW#b&&*%2to#jQ5yat!OR$sdKWd?^IK7RK=mmut(abxBgv4&nxsi zZ)86$XgHym(!|o#Oick>LrK~yI*u!bnhk$9dw$-hzuUUMjiFjDYks&v%R5Rt7#ygS9esKh5}>Q~Kw;alF9UHG1dLbB zohH%y5p=ayIf zJgM#9YZ8KZasjTnJ~BN2!byHnWtsA%O;Kf$CSi-Ys7zC!T6PUN9N=a#prRp51(x(1 zro+##lSJ1A`0e%ilcU9S6^V7~kW*p@bWl*FcELzm@u1WYoL-{wPA{Q0Y6TQbUR+Yn zY`m7sjO?9-_Vw#5e>BYaY7)L0mVR}S_@omqyfMLUQSclkeJR~N2;q%QzK%{m zQy9BIQUd24t)YVS8)$iuUZxq1bjtl^$ckk)rRt`fT6DodTH&KO|KUsBu#39!7j@B> zbaO80I((-5qC``V-LGhuiWhZd_h%ce6W-(iw^8MoXyzf700Ha!Dr| zWi*@kPh7z)<13R5dKpYGzDA654}5zwCZ@Yvytlg|+?K6&TkwK1SL3{X>QyzMUZdv? z90q!X`l-mZf7Mm0_d~Gt6IbcUj718#_Esq2+y#qnO(X)$u=iHY?4>rPJ^DeKNYwYD zg-5TmE<@{rLA6SP-0S@nF&Jof>ehL0&X+uA2v@A$$R5hQ(LCCkRJZmynp3Mg$*U5G5IgTbR%m7C|HnF8*@geHB2nk{ zC<0t~6vd87*Qo3JeZyT8{o3rnJ8iY5mqgUUg{Ae0$jY)ajDDLtg~ifJ%ew+E;~*J2 z%?0gNq?j;^o1JmvA(M}0j>}Ql^IecEV*$7+LPo|^g){KN?VvSH2lEm3>p(K-BAr}?pyIXXG}D6^ zRUoQARO8{w6kjOrEdE?yM`~kNmDG=Xo9n#;MZ;ZS0o?3I!83Q3@uco0(BbzlXA*EL(6V>!#TTt)F_^sx%jI>h=Gw0v)|xof`0m)^Wp8YHM9u zF4gGoB!`*1?w)jwx=g*V8)IA5cRd~>44V*Y>TH;fJj3V^!>*T=l+E$c)KqXdc^K4| zI@e_&dv}|VZj(x$d4NpeX>193K+Pc!O+9B87(_N`h-|u$uiR>nA`0mr9uV@wXSuUY3>TKSFdm`+>uv5sv>*IfwQa_-4MECo1xcX{#9c$Rn2Gu;Q0+LV~sR z{G#CDn_%)IscV3+_+PO}^q?1Sap)Bz7!LM6ni(-8yHZ_GgkuOc*Gydb$B!d;W{1w^ zqk_Qh;~0HZ(BFRrGxaoie|I<21;DD9B?G+E@XeMoM3w#`p+fg=^nTd6OH(rFBej84tHp3&oUFWS_TGF=k$!GX9 zbaE57m9m?IiuFPax$hCsBVKXrop&N&vI;1PMh>^eD9cT_^+td7crnzQeJ^5WWNh_u zrV{A(G;D&mXq_z7Tq6{}f`|vAx;fiw9}4s% z!~QGrz!x2_j(cyOik&LJP|Gx9yxoCjexA~$>u|-g8Kty990uXDWLv+~N~(*^h7X^O z$B#kx!7$f3z^g0X9E#i9idZR*1h4bXBS3nn&Jq2hNr&DT2%n1`=u9f&K1^j*R`fyFqn)@{&cqkr*Zuv!4 zE_C@~DHwxC>fcfoMQ89KD!{`!(z?EXKq-^K%a?9b!2QLq= zDp92I8&uSyCb^657==54l`5CEzyFBG-87#~)~Qa3G3)|5wVwZKuTLAC_cF*sE1jmR zjC60V0#^WP5B9~I{gZWVxi9bIL1M=nv@?d;cBZG@`0Bu+FIYZt#D!WmyR>s-=+Dc+ zC`n*0$wDiG-*WyWNlOWL*WMsV?4dz$I z5c3~H+IZ}xGG~gEO-Va?@%X(QVB!tMN>J9{L*5d0Eoh7iX5h!yaSn<0WecJWn|5mK zXSXH2(Krj@{2N~mAKUR8jt}RP>}Mi&Iq)8%zvzZ99*$xBM}pb>4BKt|HL|>3Ps(qq znjIm)r`zK#ic|K#&kE-QcB=r7A48{SW42{0>ZrvUEVzBrr4gQ#?2CC?t!!HeVEuec zHA*;p!%5AKUFyaWo4)QC5a323zfyYOB-`MEPv9*`{J`FK!99aeD|m#!#?isa-o?R1 z=;C5Fi_AMq&1o&B>bVmd_7-$_i|`vbu|(AI#1)U_J7}G3sSb&Ns$N{y5$1`v5n|~4 zNx7aE96Zj|)y*|H+DjWV)fY6a%~uAw;+2GeV*m2SN89e^y<{Z^&ax3c_%^>;D|>IE z;+QKhIv8_x72&uDLln~Nh$_e^j@lyNsrw(6r1pDD*2ofGx;152R zMP8>Y739Hl&{Lo(n-EMXESAdD9W=W-*~0D!z{h)QMy0!h#p85x)8A1u(q?w;-4 zF)9dO=D^#r;yRljiI3oU`Tf~(Iueh-ZO3iyppveMI_{0erxHBv+*sB>3Lin(O=f3C z;bEeZc}DuhFbh@}IObLpzQ3H^AB9KpGFDfxjZt_S;qkiT-za<{9s&cBi|+hwdVlWU z(hsLB=sMj$ypOnP?73voj(3h*qd>LTqp4%rc-+Gkk7Ktc;sN-uj-o_7ny}G&xJCoE zXBO^d>pD#Zqh)0s4`$&@9TT)mZH}OO8cU+102`e3=#M2B_U=>ve^#!)Lt_>TwxkK& z*`qq%{UaM-(kqkgj#kOug=GN{Cekk6@HO;z3Iyz@i|~m&_YInk&llmBJVV&MO9IgU z=ljU!h$jO2U6_BJR$W677&dNpT^64ytMuJ{w4-D*{*w)Fnw^H-x&t4@6Yr?(sN8|4 zx!5;&EV>WpZu#G2z`o7JqxgXfJOLXj!;!79a`NNN`D_5dNYC<&efR^f5aC@HpN^pUw_%3V&i}+Z8Py2Ye`&UyR2N`)K+1UyJ3P#S^_c z%)-~$WHB8Jit%mAPTTXNWn|R(w%NpV#6@ccZFM6!z>Q=kPZ#myjx{y#4KH1NGO=4 zGT6O{J^WcIx)N%^hA=iIaRlfXe-+OY@b(0>vFC2!e~6k!tvarjS(+@YWpADL{^RV~ zn|O!kHqd1uEMg0=G<}SJiCx%d!LUadOWnfDcn9o?Iy}C{9|~I4FaKf4WY(xxDa>944{o)wVvF|55n#bF=sj8#- z7rf8G`%;X1(?tvR3~R#z(VrC6RFAO}KCs1ucrh<=Todd491j}S6d(j})^cA!zZ7D% z8e*6?V3VKYq>x=Ke$Gzuddlv4j!)-TtZ*o2&pyXzxrkQEY0D$*j%Igz*@5{*9dW9yB=gV5FkKU!T>7-$O1tK zhyf!YUO_zLQDduBQ7ay86}6^nf410~Z_b|sWDZrOy$c1XDV*YTCv#n~rL|S)l z5v?G_nd&~?8S1+Vs$BsiB7&~5T+mAXdyVbu=9AG!*}lHi7HV>cgqpmptVH?Oua}d5olz&u2MV0$j@x(^DTHfF)qM};WO27TBv*Flta?kfjNi^C z0tM-DneB4`vW4wzAsjmd96li@g_-Q(`*Jcp2j0cqmJr=+pIS~vcC)wSWR5I2Ft?dp z*v*oAA3F-2zOb>`a&lWsD4xrUSKwuD;81@_|I{fQG^V zHZZe|Qx5WaOk#$)-wW3$xXMl!E*luzfKKIT_mx-xEH889B^WEATbJ7Q~h+ z$g6*`eThnnfjj-cJ30CFteQC#m;u8$LHx8c>UUBy%{&QkB{FjRIk=h=It5V?I|#@S z(E{}F)&H2_eVHK&ihE8@j`*GJQjogh;6C4rC8RD3jVKzLlrx%xy9hYD^cbI2gw|X?<;ypBVeQ7yx zcW_>yw1j+p8UD=m;QfQ<%P3oP3I5B?6o1pPEpqaUj$MYPiT8wkC;RRl>q&LYmR^=k zd50#iguG6(2EjYo;chlHOGa+F#H^FQmXkkpvo#@y?j5d@3(?mjC6(lMnl%wAeZ!=v z@+vzTNT;;I-sy-*OIw*~YxB-2xxzdtIbc4BJrygF`L(i%h0KEQzMNw0?i{F-E$m`_ zD@(|}9z=2=Rh#51msNJEu?#thSEvIsq}C=kNmb~Gn=yH4mC|e)C?S76#-{Y`Ky;s` zS+(q53;Rk=2DidY>ktA1@PzdsV%b&ry>-~wm?sc7@+7jCG`pux7F5V4DrKj;)zh=7 zo61Cj640_kdi87BFH%;Zl9Lr}Y+9)-ybXri3>Qx;4o*aT{Nbwbuag{0}Kut5^}A&zmSFY04W zj#`Mo>n^nr7R-BFXDj$@HgW}zPxU1f$UIN6z8R`r3o;U~%FJb~_^6yjd*-!*+?=EC zi!7Gi?NswiI15H%C2PT|(}avV|N^)a8$P!S`hOx7b^<`(11dEhiUesiRmK zxlMX@#5%gLj3lILlVe}$uES-EN+Bqgsjskn#K_^7S-?pJW#o>ltclyVC{s>WJz-;| z&-RH|6$VP59i(DQ zizrEdj21w>D-sfKfjVB&VN5NcE9IU?@>-%m<Zk3gHjv%@ni<$u9MES>s*y;e#DZQ1SFBHbo~T z-Ie}nCCjKXAt^x}^|_(7I7gx$mPv_1&|3a*5%o6g8WQwAl)A5l*~V4m%gJ`2J{*A7 z(Dh7pg`9kzsa~X3kbADPeb*JjKf2X@6=jV-O0n}zKOU7f-Y?dtuR{9?18fL-1xdAk zq>VrA$dsNjx>42S&lGD!vtbd>C?6(~_I!U_dgBg;7{*B1zLwVt;TA;y^+ajo-9b}#= zU;({DA}6P{!Z?S;#Pb$d;ozB|m8tvAl}zQoe%;p>1E|;rYT}+8Dk(Ax&0~xDw47X8 zq81j*Zj`7;OB7@^>Ig%eIb5P%2IQ6x9Y(_bXo=b=Cv!_qIjd+$8?w1X|QPsn*DnDJ7CJ~tg58?!oD3%^4uSjKN`hG(vvT;0j;$-e#3rIWzq zpItg*F*)QqyV`!tRPRB{_s2}=?;IWGXj!@mzrGWqJ@>4F?Yku>?<;~Gq*5}O8F7N@ zbI7RWcbrm?d%IzV^Ay3457}Zl`S(Ni&eSctuE~oI#_zLCX$HWXE-b-4Lg`bc3-B+2*%wU>=;mq9_VUuvIVF z6tn>luqZmKUP6XHn%MRd-sX=a5-T9?5;}9_2bQanky-B!BrWOf)Hi#1R)ujG|Zl_D}5MSe4HpMen zcDkK)%a&^->4_v2wn37Led`*xt|jbNgv z9iV9H&gaW2Wb$_Q0H6=h%Pz}~pwA<*;roP5qpCdM)hNLbl_=qf;-#5`y;bg+^Q0i| zPdbNstCUb*l>n|F#K8|(qV-_?I5L6 znGN%wP6s9E9M}%j(cE;ZQ*`gm*o+8z883t-@Ny!}$j}{Os8sXsRU>p3bT14h{ z>XM?z;dly^P1r+VXLRNXJMclJ0c#a^n;p1DYi$&W1a{i-DCcUUK_o+3{S4(3{Rwdi z)K1)GpL&Wt*e~iyCKqb}#6xXdZxS6~(7~Ks+Gh}65 z>2zgXC2%4yma=K0__LETpwHw{oY6@SVbbIY#D@}H!DL4(;&>0NobK(UKd%OMmFYtqQy;MjQib8G(S{WCz`v%yhYxk zE1fkE- zB_(8Y#sBss^H_5YR_9=N%_-zaJTXHmhTs~^U}u4iFtMS8Bl(1-+A+l7>yCgI_2xC_ zS3B@Y>d<92+OgJkPM+WWd`#+8=cK|6>91dFqA=!LrP}VOT|?)MV@f%NDJ3eav0os6 z%olofi#+O0D%P~2h2ri8654NLt1Rk`opwtrMOez)Pog5O-E)${R)c9!nlz6%qJa04 z#=4{=iuKmlBk6Sr+90?V`YsqW^k?jafH^$u*l@|wJE#RB_&BD=4Uq=3kt3IhCpH9LA_Ny z*Z&@6T`!?*Y9*BbKiHGpb5>8cop0zC)Z&f$h6c7#aH`>8KQk@uuhQKk^QtAY&2=pL ztYhua^^!jfF@>KrK#m0n?lfqe5!5Cnie-ZNCMWcLt;%WsKTiRHR@v%Av35bC7`^A9 zMY!{aW)_a5s3lDj%7nIKGJ=0F^|FwI{q%GCiYzTHt#tk}1v=*QtVOi}%VFh0Z{kh^ z>|8j7nA!>dSvXF->Fn(k)J!udUh{jr=1u&0;3TB7G3D6yHcmo(BT|~k-#!l#ls3XR zPzg-#GJ(;xr#3$hm^l5wwjW>u-3fv2c#}wrI2~$Z@;2azm35ebK;R{2;2^LKH*k%3 zN+~(JwS;eSI3LyoXJwc4@(Vwo=SJ6uE8vAie#D%c@adwE*^_3zreaH{Tq+HkrN5nO zQ|BGZGudgxQl6$sY72OpZ038F51_bELP?qV#06@Gl1%B4&zOx7Oq9R0Bo_6LAFt1+ zT;Tl01H}|XEU7(2Ntn4lH|i67Zq#xq+KQ4U^OTb}Nn0&U9RH!o8e4=UG)pAHAX zf~*sQkIm$-8P{;&w_;GIXb| z7@SN_hH#UeA;M&h)&~K^)~WhPWHhd+B^}@UmAYdBZQa zqIJ=eoJ+4s6xU!Zvux=r7~%bMnc&q4z%>x6UH(7Up=E%I2m6~+YD2SSl9QP7V1@$q z*e!rLCAGMnT|+Az@K}2Nx^nj8P9v`sql3HBfn6)+xrqy-C9)TSgD@!jQMi!+&V~q- z+aivNtvau2(N5@k%Q(~LO;&HC-jHwK(xF}H79OdVUX`Lv(hRX)dd*Xrora)AK%v2b zy$0r;7bsgaL{GdH(cG9OSkM9oT^<7vvpE8T_WEn|mvTaTQhP?r!$L5VIRq0R_z*!$ zISQq#*Ka^^G$Z463-ltYvNN_tN*qi+3R5I5K7YEeS1{83VwKrKA)V zntPJtrPg%K7ws)QVij?!dkRX`nt2Mb_C@>lYKj=jPyL2P@W~J!y zCMws?u2KI;$I4$P>L2T1!irJErB+C-@FEhn!ip7xNqsBbmbVVbK3r_2*Mjp`t&x!3 zYHkV<;R3<94_BEW2l#x2FWIMK(P{WphX|_;R_C=)@i6jgD^8C}6w{*<#iZ3K=r8mk z3QoZo;R4sjAK0F(YLPY&MAExHrPsQTgRIbt7@q*o3KtNiZP0n;1o6nxzfyuGNdTxa zI);d}_&4z#0f=m|B6pr~6lt+=tK%|e~Q zn=99N&;6-7sDo8u3&gKqf3bd0)+@#ee+=or7CHpZSQRmLsoOo73(HZi3VBvlM2U)Q zvs>e}B#1<3dRzyq9SmPc*LNtb;z0EjbON9X175#lI&4}MK#YF}zh4zZ5JTXft7a1G z=fg>>gNTIraQ$kbtyd?SXisM4DtKeHfH)w6?^Z_y9y$}>!-MPRf=3+5FIbm@(NUZK zDcu&(D3{#By26wP=E2D+QgJOuS(=n_7V8oq89ov38iK%Byek}m2)ru-fe^ea5`h4` zYa9aJcvlnx1Msf#2sq$f7y?#!7q`%?A2P41o81M2x&G+ghckwPy^w67Wth|JGd84)kkX`FO z*H160!Vz1o1(kY9G2Rux)YyVtyo*GQ16!;GoqEY(yekmZ8}yQ0cvld@-smN1%-pQD zHF#GrDvs!qEXBJ*m{r-3ST{Jtw#zaLqfo`nE{O-457bk1i?v|9USf-PMWa#-Dt)^E z=dSZ56nZFH=PyXOKs$lzCafy~5w=)QTZ1cASl3+CHW9U5tcQ*3daQ?DILfTv4|7vV zBJuz{k?P~@l3$0X*a~RGS8V{ah7VH@j0mLfzK^8?Kc}Z4ibe4~T7-IsPHwco&@MWV zUIi2gr32yByo*$bQUayxWBpw8DYQMH$AG-4K%OF4+67mSL0if}yMVz)!x!t zM9Lgy3I*N~0UvrePw zbJ8>w#C(BPB6m++I2d zfR61FSs82X2)RMvDg1t;hd2<%g#*e%<+cY<=b2u{aTn+WHs@JKaw)?iNmJS7s1yJ= z6HwEc&AR{$oeAov#{qvZW(KGaZd9$K6gV=6ZIq8o4yK9Dv5vL#j{AerGk~-q9)3{9 z#Q}OIau>WUWJNH3255a|+4`Y;lMOmBr!yNp4g&e~PwAp6UR=GLz)bEx3 zfz!&czA}-L%(CXAC?g{kVG)BDdFpyn(?gw8O&KEi&U6w1H_sq|L2^T!`)2>l2yh=%xQO1(G zTmxlvV1hGfUWOEK;W>J44!!+M8D(@LJquZwaH;wz(ij}beW-9o<+A|LL%e}3%!Dha zEeF&@U78i;5B%2ycrXlHU5xzs`bAeijP8B||Q^0dit%QmU#Z7$eJ|v~M8V*u+xRyrsNga?9&G3%6S1sAZ zG0ZnQYlx=VPM~B7$B<}rQH~J8=b|v;pb$E4$tAwi!?Gva>FUz#AHAV(R80JT7;a5TtJbu2WV@; zG=nYO)nbM&O>h?Fc}-VXbihi7aXK z)?2}cM;bF-m?#E;$gFloX0_$9^1vNvw?p9I6ZCXlM(psX5mZD39J^!k#63P$5!B?- zPj!1nJ>3Yb=H9v!)oMenKlylmQe^~1ZptrR=L(dI63U_f(4rFwYb#5KJJenXu|29M z-R{GaJCGgcf7=6W%o-}$`LluiX|?Kk zP2&ul;QFUtu_ERGriVm)H<4FS#VL&!gN(=_vO*kmgmL`g$qiK1GMk2*Dk_mtd zWRiQ<&>7IXhXZEUaG(e>?$?Z-Bgv)aFcKNpz*T0+Mj7|lZrXx_2#IjBF6Uq!POMxC zBM$qFX{XdJ4&4GxKI1j|FSy1vo7!5wDfWa61@P))1q7hv7Ow>y8VbsQ(bBL;xhNE- zA6`CXnf)iJC~X2*)=xRsN=jE8enFW^(O!S0nq%81H`!_iDu>zjNj2`u3vhW%fnsZ_ zOHXobxMzV}<0~b!E{mY&k!Zqo7hH5?$y=g{I@{33kNYvet2m4#N z8XOa8XM;$@Inz)kX$ri5BtDE>@lP99n0(%+cOTZm6`IcZ&>=v%a^9Eb_(pxK#G>(f(+?PH;>cqCyx9!?bdc??`$Tp~Pw+DD41 zoE8=n70gzq(i4SR==4M}92x`Y1zLKcwiUgW zVo}Y8SlTKN*#LNWB?bL!eZ=4Qu-%a<+9IegU7gfM`vQ6;plX^Vw^`KT7%igA+u~7l z&?5T0>BT_F&|#D!>I14)705r-{K+C3sWy0lI)*$vYKs>vvsOZ7(I_#iPf?kwwWsoK z)!xplXsV}{iRR0rDN)!I1(GN=cr1G#X;@4vtpwGXk` z1edF!NBSp`_Ew_U$frYr9C@^y7$xM)lt511n1DUIs1n08kzgWKx-gMyvyC-OGmSRH znIa7{O~aHy^ZMb6y4jp%1OJAaIzP?`1aH&@a$@KA!;f{t9LBtm5jBoQ(_cPV_5uz& z=9@U+W$A=Tidg_@hv(E}bT;12KgR0E{=>fDlNH(6z`t4dzuDTq*~otOd_Q}kpVjxX zDPP$uUy%+MmsJ#jNfkmbjgiNA%=+gVZ^FN@{8*gL9P!t$v&CO^uaC{d9oG#-TIsrg+_qE6V!5Kn$7VgSHKHhRQUGBdxvp}Z7YM2pG(mE_r{2I9+Kh^M=u~Bex z#!T07y{vFu>5zF}mS%X9Hyh{1_rjwYvCggUSm4$z&>q$~Wy-qW>3+*t=VV>9BCz;U zE?iJF-RdreVVSVJXc=dVOSbOMq6*x4+;=(3RI!dJ#&KTh=3QrQx{kUD*^<3h@~7nE zKFHC`H>3x~1jcMY zSbBPupZKhfsIuX>2Z!dBReh_w?zssoJsi*`v%=mohYmykYQgI9j(JT%!T(Z&8@Jna zNGs@@6$Tvj?I(s@u!3KX$SBf!!P5PW}lZ{s| zoR+a}brzh17MAbk|6Q~fRkHTzaB?*IX={-u#O=3<6Rh&wU+^+lv5kt9 zCe-Fqfo~;n@h~XYtZ-0n-wp zk5m03?M)=MI1(7rJf5>)OFm3(UgLAVR88t2ii@@U$&yWl!Q_HwH460W$-(DgZ*z=T zY)4DAtD7)uN~)cwbhf4-mkVIDb%Bg9Su;!b=R@KCd>L*EW~L#0&jre-etv)Xt^ozo z?dSr@FnOs%O7UW_9C^&p8k#7>G&XXF0IlhBy3vljl&wZ8HNu1ZUD3Er19!gzhbQYDUl2FS~NKqU$_=DiST)CJWtEoM~|c1%;?Qu9!CkMgUpr@B-} zDO+W6$xxX#pRT_BF3n?tt=x%@m+ps9r=fdaG@y ztmdx*_7z_{m9s-2Wd5f3^h3FkX5WdGIm`v+d_eKw7a7gIR)$cFT3J`ev5=8Sv#(qj zdy1J#DW6eX`kW%3W`(XyE~C!d3d(q>;G&I#1(h{?noV)h&R`CJGEbUKb9$_IgyTwI23t^Eo`@}^%8(~p2+v}ng&p~J``ml?3F2a@}l3cX&5SD^^bk!yz zEDd$&s!c-J4%DG5@+TFP9Y7trB4?iq)yaP3YlUc38)fV+7wt+!tNf#jc9l{tbJebf zSyJtCI8B<@C4We>f6>3oz?A6Pk(qMD+fgX&-77{63PLKxYXm(IG+7u{`$nowR#hwh zqS*s3bS^y2{G@sy#R`=@GTR!SGGD4)q2f?-ej)o;{X9T<#t43ZQ`rSUU?NJV+7{a}!=qnO ze=}izub^vt>F`Zc?LZk)5=Gi8wf z@P2zVF;f9uI)1Soo?0Ls7|?`uLUV@?F{%^#o)!>uis7WwUIWs?|1Ccd)J%O}Dv>+6 zXdg3smcq@aV~G1Q*l^m<89$U?iAk@E>aH8zFU^a9_fGHfI$83zN!09W&nGnY28TlA z*_XT8i&R6$z}20Dh#~1v+!^f_JE4H$DkVX{I!TQ5T`89&bntd(lJj?iXz97WaxtvT zolSlyfy2)Pi))TD`(Dlky`b<{(F?Ck848#-$km8T)SQ_ZNn5je)E zmLbrKgb`;CMI20_Wi>HYm&z0utTcsORWY+O zs9GkOgk4qEhX+;H9*1?*Io&H8Fd(^F=`aF5IvXnfZiqyIOe0fR|A9mIq5Z-?VW98d zl&EH-)lKF4B@#*lM@gw^wNaxaG6Hz?Bymb>c@g=QR@&^3=^~AQiHOK=HO2MtkcLs0 z8yagG$BZ9IZOZDaP+uWi{PgcEuyCOMcLW73j(U>?7Fsoh^aIaa&rLi?oxA7ES$MtD zMuX$DXL!15A?8~aJpz@R|sz^sut(TPb zCDJ*y+Op=2weG6W`r{gRl}@9oDCt9p{+RY$T}q?7>H$h^jrssU{j6LCs9$un6mR-% z7SM8m{KwN2zz4TS^EIW&M-&-CAH9|?`VbKI z4tjmR(L34h3579aQ~{imUrhyQ*2^UU8nJSIY5^?&K5+SgWV);=tp>w#Ma-16r=1BW z)u|`d87I}5I(4~D-5y*aLz*VDyQ)njs6CZ>J=I{@>_&UIl`6sbJ8tm*ZuFrw1KLo? zop0g@R<|?XMYY})Y-xuccgQJjn}4n3ng-MvJU7{1s-<{zvvNfA+xp1pw?)AR6kDme z#|-)uoti(?U@~%lbpdgPKa5uBWiZLNN8HmDK)dMB7zeF{1o$8gqecnN11t7q&_ zrY~wH$cbs1({j!HZmK;PAUyoGm^Tu>CGMZ};RsiY5s2k^tuzrY~pI$2gVNe1ul~hw?0F z)qkjy1!ez3`TVmtA_;KjMI;lRq%5nu?j7nZy{@v}drvpyhYv*L&cMRDX-FHh)eirh z9?g(Jh0pc=mvAuCqO55xerLiYXm-L4hm2mzx#Q$8?tXwcY6-Z_N7hda3g{Sq}Q-Px>%0l zecsA}=>>*t6s`%e#F|k9fz{cA01v5mPcNV)RzQTx7N@htX*>k}azAiP(7}RBx;hk{ zwoY!aG*)gA&l(SY9FoCO(nEWYVh3;TxE3#3d zX_O&f^qSMk4uwDJJ6O4XYeC+byt8>HG`Y^fC^Cgoe_Fj@OTm>J$YpA)jkXL8WoZeA z&M>o)%aBR(d{gPDonU!Bfmt>HUic|=A*x%PR9G4@ru~{YnNx;1e{_g=4PZ(hX?h9|5tdMBc*ii+YNpr&ckJp+I%A4qfL!@6sr|tBSG))xEx0i-X?yY@~9> zM!Mt!>x*fBgh@pu(FQZtGMN!=eFO!My$EX@PIx?IR9qU6YR5C%mlseWOypt!iQNU% z@@q&hM`@EzQWUyL0S7KCP#j4<{*Zt@wULWp@#Dk%$!oq+X@?GEc_;tju^~6oUMG0+ zjYDv3p`bUEaN_Ca^h!DSD|q*%h(9=*sT3Ibz1?_=J)H2b0nU9jCDeAbysVB0#gLO; zIcCNC<{*yA{%mu;wSU)94BBOsT*izSn>>F^i-4zJjUt5E@cpY0+ru*pD1uqIRssk8 zvd`nN9XS8&P+qXf^>wd3R`|JF(4VH9wpG{kODrB*FzN#ny5!p*rYlG}YN*2m_JvZS z&IT0_)>vm1>WnpXD$}@T==R$UPSna`-Sgj$;IYWu6X*(=?F*SU9%c&BqCH`GMOgeL zc6L53%%W0ITz2*vS&0$1T$Weu-uyvh@;;AZsAlX6Yowv_&0x;d)Es#6&A`#MejHgz z2)gL1-Nnos{h-cO-}^aT;8jf5Fo$>MUsPX9KObqbl#g9YZ%X-QE{)#Y3vK&+hzVhE zNZ-2DQtybYri~Hh(mye{L{?&BxhwDnu8}sm&MoiM@I&Nw?s7MG`5<@sD|cFD1p+;4 z2;`B%JjIoYU{7(UBDg`HVhS#s?tcBc=FdO`Ya9xzd4kUnp@3gI!QBnO_kBJCMtiye z<=hOJv;J_YYkH2{S}+v)yq#$ikWfzPnayz1+mSc}E8d2<)OqM*O~EL*5*$*rGXfx= z;QhA|o;S~^dz4$-no)eC1?_zm%KEnh`{mI0UF6^uV+*C-kv@eZ4`eYDW?!OHqk(E+ z5>@7aIbwXwrQF9Y6K;QZ!>@eScQ>m8@nAdz$FO1LThfXZ;rJ+gJlu`^tZ?c3Ebpbx z_e=18RQqpf%;r-RpPfS{{5L<**R4!)126lBWUA7!cULjnGty+yKQ?SP9z4cNI zD?+yockaSYWXdryz-ltvu-rT>AH(DY7)BRjMFm9*mXw%NJyahKuPl%za_be;f+mTx zx|qUs2R_8%uH}NM?TQ8ghMg&=sm`107CnS_OaZP{igM2IoJw#RAX2dQPwON)t3RIM z0p7`axf6!joSieM>*jZd+8Hj9<4i4?QFzu`@MI}iJ`q}d67c+&myi0z9bKv#{%N!A z3AaR+@tK2s5UNl41b!9{|121X&I=MGH<&GV?8=sX<)?PCkKOA1(A>!bJ zxMZm-R=yO3_$to3;tL01825$s4DK?Ut=!e(jBa;o{KQjClMOz}*6Osh!S1)XpnsT8 zHh64!by6y3W5zIiA%hKWn|vX_of5YvsZ`>vfq?PxE>z0kjP=Kq+jo{V?zT5}tl{AX z9#^@3cNG)vf{*qIjPe0Xb2m+|?O5cfhAVA9!(`jf(%xW|D3DY*y2nOj&>n zUd|iFFu)rhZnGun1+!u3Mdp+@zSSpaUH9z~E-si0XVhTK#f6XKd<;QMB}`*teDM43 zTf`cv0Aqs1ucQGk9d2X1K~Xx7Wrq0TGh!Pz?K%CUPlU8)+n&?PrOB;rI8JbIoWrrQ zv9jSgGomAkllG&ID}5&3ts1wrLEhCR=>0w|;3w$^)g5BCALwZE#lwj~MdI}xC+ue^ z=wynTth`vXcF+Z8uXUE4wv{R*=``c)Od^qh`3e_Vs} zi#Ur;6>UyBB{l2eu3Tkh2PXhMb}i*>Jw;`d&)S?Le_)1YWSkY9@9Dk4`LpUz(brX|HA&k-VHEgwf^DX zH!=)=Bpyj@`-Pb{5>Mm|aA@r)8HtayeUC(B`I>)1xraI`#a}{% z0EFvc@aK_<2hf~F>?`q!JRCP537)V`^I2%O66Zdd}~!@)dYcIBWBbJ zxpYzagmDEOp(6aT6=&4;QpRQ{K9u9WxU^%;PCU`su4&4Wi?e{qgkua1@JLR;s`Jbx zfSasK$IkuX2w*xXJeEs;w4#`QDSWCG49^b&%ybDJ#)HGks6)ztGt2=AK7q4xWNAmc z1pn36`ogYAb|qkH^YJKG`VNhqEOR#xG!HOymCGZhf{x$w@ixLnIdP#M2+d(MH2&5K zH`|!aOj#iw!`%}!7IZu;#82UzRkMma=pvkldk^sFxgriRW2^1N*izywu!`k;Gv8On z+dS@Qg?Jp#TDfNbD8MjZmAEh0T{sjlUKO|x$A93Nj&T+EM^}Dn{K}J+Ru~T(fVs!2 zMpiP>TD+KJyY#n?yIMTMj#ut@K(0($T*jq`klWjnm4>7 z@*KX;KCC>}L3;5En)ZIHFDuQBm|3qko4*wK>lnW&Wm3JqH07kUA7kdtJKFK%H9W(b z6Md+fS^ho#-no(El2;}+H<=mp-db)sv*Zrm;ohk?6J~)Kn47-Ee!$M`FWRsd_yK0H z5icT+{N8ceh(G69myfc}v!xjJ5kActu3iaNQq1c|_;MnAF*CgfXF1$ic^$v@;Gu+l z>CpJ2GM4v+@jl++_Y@z+;mjYD*|D$}zhdvDpFi>Y^JeS~ro;TvPlQ%@9mcF3e}{>D zhvyMnmCS{Ac!1N{$=GAXvkyG1M!9z61Los9oaB{GJs3sO41pK(z+~1GkJHGFD_!&>-I*c9rnA%^PK^?AL9@P>5H`?LEBwr@$D}Itl cCOe}4!Q-rmlsOEA6MK0BcKv{R9d7FQKVSjX_W%F@ From 09cae6e640e2cd0509c9ddb77ece4406a02b9dff Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 3 Feb 2021 10:49:29 -0700 Subject: [PATCH 04/21] 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 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 From 1faf8c168c858d0c00c8464c199db95f507dcbf9 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 3 Feb 2021 16:29:14 -0700 Subject: [PATCH 05/21] Only print lobbies if shuffling doors Couple shopsanity bugs --- BaseClasses.py | 2 +- Fill.py | 7 ++++--- ItemList.py | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 65bb65d0..fa501b73 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1927,7 +1927,7 @@ class Spoiler(object): self.bosses = self.bosses["1"] for player in range(1, self.world.players + 1): - if self.world.intensity[player] >= 3: + if self.world.intensity[player] >= 3 and self.world.doorShuffle[player] != 'vanilla': for portal in self.world.dungeon_portals[player]: self.set_lobby(portal.name, portal.door.name, player) diff --git a/Fill.py b/Fill.py index e5866cfa..fcc9b68d 100644 --- a/Fill.py +++ b/Fill.py @@ -566,9 +566,10 @@ def balance_money_progression(world): 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) + if interesting_item(location, location.item, world, location.item.player): + 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 diff --git a/ItemList.py b/ItemList.py index 38fb83d8..5c42aa75 100644 --- a/ItemList.py +++ b/ItemList.py @@ -504,7 +504,7 @@ def set_up_shops(world, player): 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): + for shop in random.sample([s for s in world.shops[player] if not s.locked and s.region.player == player], 5): shop.custom = True shop.locked = True shop.add_inventory(0, 'Single Arrow', 80) @@ -528,7 +528,7 @@ def customize_shops(world, player): item = location.item max_repeat = 1 if shop_name not in retro_shops: - if item.name in repeatable_shop_items: + if item.name in repeatable_shop_items and item.player == player: max_repeat = 0 if item.name in ['Bomb Upgrade (+5)', 'Arrow Upgrade (+5)'] and item.player == player: if item.name == 'Bomb Upgrade (+5)': @@ -544,7 +544,7 @@ def customize_shops(world, player): price = 80 # 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: + if item.name in cap_replacements and shop_name not in retro_shops and item.player == player: possible_replacements.append((shop, idx, location, item)) # randomize shopkeeper if shop_name != 'Capacity Upgrade': From 7a22db5dd4a79117f81bea5017f3b12f1c67f32b Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 5 Feb 2021 15:05:16 -0700 Subject: [PATCH 06/21] -Disallowed Swamp Lobby in Hyrule Castle in Standard mode -Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage) -Fix for Ice Jelly room when going backward and enemizer is on -Fix for inverted - don't start as a bunny in Dark Sanctuary -Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now. --- BaseClasses.py | 1 + DoorShuffle.py | 38 +++++++++++++++++++------------------- Doors.py | 1 + Main.py | 2 +- RELEASENOTES.md | 6 ++++++ Rom.py | 13 ++++++++++--- RoomData.py | 7 ++++--- asm/dr_lobby.asm | 1 + asm/drhooks.asm | 3 +++ asm/overrides.asm | 7 +++++++ data/base2current.bps | Bin 132305 -> 132335 bytes 11 files changed, 53 insertions(+), 26 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index fa501b73..fd0d0ed9 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1215,6 +1215,7 @@ class Door(object): self.passage = True self.dungeonLink = None self.bk_shuffle_req = False + self.standard_restrict = False # flag if portal is not allowed in HC in standard # self.incognitoPos = -1 # self.sectorLink = False diff --git a/DoorShuffle.py b/DoorShuffle.py index 97e7d234..5c05698f 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -357,6 +357,7 @@ def choose_portals(world, player): if world.doorShuffle[player] in ['basic', 'crossed']: cross_flag = world.doorShuffle[player] == 'crossed' bk_shuffle = world.bigkeyshuffle[player] + std_flag = world.mode[player] == 'standard' # roast incognito doors world.get_room(0x60, player).delete(5) world.get_room(0x60, player).change(2, DoorKind.DungeonEntrance) @@ -369,13 +370,14 @@ def choose_portals(world, player): region_map = defaultdict(list) reachable_portals = [] inaccessible_portals = [] + hc_flag = std_flag and dungeon == 'Hyrule Castle' for portal in portal_list: placeholder = world.get_region(portal + ' Portal', player) portal_region = placeholder.exits[0].connected_region name = portal_region.name if portal_region.type == RegionType.LightWorld: world.get_portal(portal, player).light_world = True - if name in world.inaccessible_regions[player]: + if name in world.inaccessible_regions[player] or (hc_flag and portal != 'Hyrule Castle South'): name_key = 'Desert Ledge' if name == 'Desert Palace Entrance (North) Spot' else name region_map[name_key].append(portal) inaccessible_portals.append(portal) @@ -397,7 +399,8 @@ def choose_portals(world, player): portal_assignment = defaultdict(list) for dungeon, info in info_map.items(): outstanding_portals = list(dungeon_portals[dungeon]) - if dungeon == 'Hyrule Castle' and world.mode[player] == 'standard': + hc_flag = std_flag and dungeon == 'Hyrule Castle' + if hc_flag: sanc = world.get_portal('Sanctuary', player) sanc.destination = True clean_up_portal_assignment(portal_assignment, dungeon, sanc, master_door_list, outstanding_portals) @@ -425,7 +428,7 @@ def choose_portals(world, player): the_rest = info.total - len(portal_assignment[dungeon]) for i in range(0, the_rest): candidates = find_portal_candidates(master_door_list, dungeon, crossed=cross_flag, - bk_shuffle=bk_shuffle) + bk_shuffle=bk_shuffle, standard=hc_flag) choice, portal = assign_portal(candidates, outstanding_portals, world, player) clean_up_portal_assignment(portal_assignment, dungeon, portal, master_door_list, outstanding_portals) @@ -536,23 +539,20 @@ def disconnect_portal(portal, world, player): chosen_door.entranceFlag = False -def find_portal_candidates(door_list, dungeon, need_passage=False, dead_end_allowed=False, crossed=False, bk_shuffle=False): - filter_list = [x for x in door_list if bk_shuffle or not x.bk_shuffle_req] - if need_passage: - if crossed: - return [x for x in filter_list if x.passage and (x.dungeonLink is None or x.entrance.parent_region.dungeon.name == dungeon)] - else: - return [x for x in filter_list if x.passage and x.entrance.parent_region.dungeon.name == dungeon] - elif dead_end_allowed: - if crossed: - return [x for x in filter_list if x.dungeonLink is None or x.entrance.parent_region.dungeon.name == dungeon] - else: - return [x for x in filter_list if x.entrance.parent_region.dungeon.name == dungeon] +def find_portal_candidates(door_list, dungeon, need_passage=False, dead_end_allowed=False, crossed=False, + bk_shuffle=False, standard=False): + ret = [x for x in door_list if bk_shuffle or not x.bk_shuffle_req] + if crossed: + ret = [x for x in ret if not x.dungeonLink or x.entrance.parent_region.dungeon.name == dungeon] else: - if crossed: - return [x for x in filter_list if (not x.dungeonLink or x.entrance.parent_region.dungeon.name == dungeon) and not x.deadEnd] - else: - return [x for x in filter_list if x.entrance.parent_region.dungeon.name == dungeon and not x.deadEnd] + ret = [x for x in ret if x.entrance.parent_region.dungeon.name == dungeon] + if need_passage: + ret = [x for x in ret if x.passage] + if not dead_end_allowed: + ret = [x for x in ret if not x.deadEnd] + if standard: + ret = [x for x in ret if not x.standard_restrict] + return ret def assign_portal(candidates, possible_portals, world, player): diff --git a/Doors.py b/Doors.py index 3bc41766..c3cc969d 100644 --- a/Doors.py +++ b/Doors.py @@ -1306,6 +1306,7 @@ def create_doors(world, player): world.get_door("GT Bob\'s Room SE", player).passage = False world.get_door('PoD Mimics 2 SW', player).bk_shuffle_req = True world.get_door('Desert Tiles 2 SE', player).bk_shuffle_req = True # key-drop note (todo) + world.get_door('Swamp Lobby S', player).standard_restricted = True # key-drop note (todo) # can't unlink from boss right now world.get_door('Hera Lobby S', player).dungeonLink = 'Tower of Hera' diff --git a/Main.py b/Main.py index 8c079b6d..25b81153 100644 --- a/Main.py +++ b/Main.py @@ -26,7 +26,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names -__version__ = '0.3.1.0-u' +__version__ = '0.3.1.1-u' class EnemizerError(RuntimeError): pass diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 60cb59c8..5bac936d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -132,6 +132,12 @@ Big thanks to Catobat for doing all the hard work. # Bug Fixes +* 0.3.1.1-u + * Disallowed Swamp Lobby in Hyrule Castle in Standard mode + * Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage) + * Fix for Ice Jelly room when going backward and enemizer is on + * Fix for inverted - don't start as a bunny in Dark Sanctuary + * Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now. * 0.3.0.1-u * Problem with lobbies on re-rolls corrected * Potential playthrough problem addressed diff --git a/Rom.py b/Rom.py index 79fbbea7..290d9d01 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '932e67ddea0800d1415f34e7de3bc1af' +RANDOMIZERBASEHASH = '6a4096235f682b7e4e1a65f274c7037b' class JsonRom(object): @@ -711,6 +711,12 @@ def patch_rom(world, rom, player, team, enemized): if dr_flags & DROptions.Town_Portal and world.mode[player] == 'inverted': rom.write_byte(0x138006, 1) + # swap in non-ER Lobby Shuffle Inverted - but only then + if world.mode[player] == 'inverted' and world.intensity[player] >= 3 and world.doorShuffle[player] != 'vanilla' and world.shuffle[player] == 'vanilla': + aga_portal = world.get_portal('Agahnims Tower', player) + gt_portal = world.get_portal('Ganons Tower', player) + aga_portal.exit_offset, gt_portal.exit_offset = gt_portal.exit_offset, aga_portal.exit_offset + for portal in world.dungeon_portals[player]: if not portal.default: offset = portal.ent_offset @@ -2106,8 +2112,9 @@ def set_inverted_mode(world, player, rom): if world.shuffle[player] == 'vanilla': rom.write_byte(0xDBB73 + 0x23, 0x37) # switch AT and GT rom.write_byte(0xDBB73 + 0x36, 0x24) - write_int16(rom, 0x15AEE + 2*0x38, 0x00E0) - write_int16(rom, 0x15AEE + 2*0x25, 0x000C) + if world.doorShuffle[player] == 'vanilla' or world.intensity[player] < 3: + write_int16(rom, 0x15AEE + 2*0x38, 0x00E0) + write_int16(rom, 0x15AEE + 2*0x25, 0x000C) if world.shuffle[player] in ['vanilla', 'dungeonssimple', 'dungeonsfull']: rom.write_byte(0x15B8C, 0x6C) rom.write_byte(0xDBB73 + 0x00, 0x53) # switch bomb shop and links house diff --git a/RoomData.py b/RoomData.py index 3fe8d594..f3c82576 100644 --- a/RoomData.py +++ b/RoomData.py @@ -252,6 +252,7 @@ def create_rooms(world, player): world.get_room(0x77, player).swap(0, 1) # fixes Hera Lobby Key Stairs - entrance now at pos 0 if world.enemy_shuffle[player] != 'none': world.get_room(0xc0, player).change(0, DoorKind.Normal) # fix this kill room if enemizer is on + world.get_room(0x0e, player).change(1, DoorKind.TrapTriggerable) # fix this kill room if enemizer is on def reset_rooms(world, player): @@ -369,7 +370,7 @@ class DoorKind(Enum): IncognitoEntrance = 0x12 DungeonChanger = 0x14 ToggleFlag = 0x16 - Trap = 0x18 + Trap = 0x18 # both sides trapped UnknownD6 = 0x1A SmallKey = 0x1C BigKey = 0x1E @@ -382,8 +383,8 @@ class DoorKind(Enum): Bombable = 0x2E BlastWall = 0x30 Hidden = 0x32 - TrapTriggerable = 0x36 - Trap2 = 0x38 + TrapTriggerable = 0x36 # right side trap or south side trap + Trap2 = 0x38 # left side trap or north side trap NormalLow2 = 0x40 TrapTriggerableLow = 0x44 Warp = 0x46 diff --git a/asm/dr_lobby.asm b/asm/dr_lobby.asm index c2f08fa6..cf3ed694 100644 --- a/asm/dr_lobby.asm +++ b/asm/dr_lobby.asm @@ -1,5 +1,6 @@ CheckDarkWorldSanc: STA $A0 : STA $048E ; what we wrote over + LDA.l InvertedMode : BNE + LDA.l SancDarkWorldFlag : BEQ + SEP #$30 LDA $A0 : CMP #$12 : BNE ++ diff --git a/asm/drhooks.asm b/asm/drhooks.asm index 1aa62dde..c4939e9d 100644 --- a/asm/drhooks.asm +++ b/asm/drhooks.asm @@ -170,6 +170,9 @@ JSL CheckDarkWorldSanc : NOP org $01891e ; <- Bank 01.asm : 991 Dungeon_LoadType2Object (LDA $00 : XBA : AND.w #$00FF) JSL RainPrevention : NOP #2 +org $1edabf ; <- sprite_energy_ball.asm : 86-7 Sprite_EnergyBall (LDA.b #$10 : LDX.b #$00) +JSL StandardAgaDmg + ; These two, if enabled together, have implications for vanilla BK doors in IP/Hera/Mire ; IPBJ is common enough to consider not doing this. Mire is not a concern for vanilla - maybe glitched modes ; Hera BK door back can be seen with Pot clipping - likely useful for no logic seeds diff --git a/asm/overrides.asm b/asm/overrides.asm index d47d565f..28eb7f91 100644 --- a/asm/overrides.asm +++ b/asm/overrides.asm @@ -142,3 +142,10 @@ RainPrevention: PLA : LDA #$0008 : RTL .done PLA : RTL +; A should be how much dmg to do to Aga when leaving this function +StandardAgaDmg: + LDX.b #$00 ; part of what we wrote over + LDA.l $7EF3C6 : AND #$04 : BEQ + ; zelda's not been rescued + LDA.b #$10 ; hurt him! + + RTL ; A is zero if the AND results in zero and then Agahnim's invincible! + diff --git a/data/base2current.bps b/data/base2current.bps index 022cd3e457e9308bda6126dc8bc4a38456ba4162..4674a0635dce4700727220b4681a6fc78d7892e8 100644 GIT binary patch delta 826 zcmV-A1I7H&i3snB2(T{!1au&a-?K9TlmY?Ev&aLp0|8sJd~w6hgD<#Pd(v-_IP)|L_GMbCG}pAm@?4LKm%pgpY!az>pxh zlZch21BIZ32Ez}ylMd+?3IdQI|Ae0`u(KzVF6kYAG`H0ekfj44ScYIAAdsaXAS#e4 zKmZ_gkdqvMfg+EBfgqEDjtmiil6WnEnP4gZ0XXFVmj}3k1)5qzqxq`6@Wm@B^s;0hcCX_R)m| z;xJ&7%IOguKDmJikAkfQr34_ckm$Xc#f1x#qKyn-DG!?!A(Qy&A_iL&qYvux@R0Ww9CfE2(5k0yZ4Op|~L3WWfeN~om(fZbrg008hPkC%ZXmx7IH zlYkkQh?#zqfDa&4ldkJaDVvj*IW3FD2mtU{siY{6D#w1WBlLbCbeH!qLV%m5iLXBM zt88hB+jWy7>~j$@mye>CUTT2Bq{n`}Fz_HTlcwyZ0YZ~a?I0nwlqVQ}(Ud2szhLku znM4-I$f@-tnM4+&H8k*{2p|lXlaB2q6J#V5fSXN&i4VVgmR3KIjRqh?lf~^v2T@p> zfxnj;lN0VT0k4xr?rkm=y|D{Qs=u)Gej1;!^nUtpfGabJiCUllubzPbr?wq{dSHd1 zjgADbN`NrXBa_?iA_ya&7)yeeWhAo&?>R#UdtA4HM8{gUMKS@A6#)g8*GB;z0ZF&@ zM**}`7JFb>fGL0?cUAwN-&g z{}BHO{{jDo{{a90RsZV$!2g#UoB?_c|Daz4`SokuKzG$iqiRIE)K06DMMX92=&3QZ{;XEM_UHuaQ4Ke0YY~P( z!OK=gh*?3n4c;%TMQ;KrR9R9IbPGlGYQb-{rzF9hDUuiTNm2dnkDEqA6%XR$t-Hsl zX2rXrNdqzBf#?rZD<9}s7JaT`GhUE%xG{o17wfrl?tk=QL`PGRyl>TY{-hWTs}lYi z&Yo9{LbBWP-Df#iJG0WZC}P^3cxgm^5gKM(XV&B%m?XuB+j}^?Tv9N0N&amNJ}f~c z;oV}8#}Mqbmy+lgn@EiFQ&j(mk&oqg^T7V?m!D@xwQ)aX(h7tBj0y(Dsuw+F6|>*L zr0>KVzWK_4Z6Gj;T|QW`6f<#}F~cBv!w3J|7fip`aWFMg>hj#-SuuFste9|0dOR8% z7fN6#Z0G!r_-PF6tlP2&uOdPb>Sn7^CA7|ZQJdO1>qLQiAS=eq;s)|#BM_TSU@kQ4 zUr2!)V;IdR%6zpP48IFxwR|@AF%SoCg1djU_<9AGanmZ6ckutPSo@+ubRGTZ=iEi!PVtJZzpM0Ap zrrYTB^iOceP9C}oi?#$unQ6S>qzq*WG)p;}rWnv*wxx62MdYP8@|8i2lf;~qrHJ-G q>jikjO%4U+Ef>)#8+;OyS3CI|jZ?YNi>T%!cG Date: Tue, 9 Feb 2021 16:31:12 -0700 Subject: [PATCH 07/21] - Settings code added (prototype) - Mystery.py updates - Blind maiden sequence restored if Blind is shuffled to TT - Spoiler updated - Fix for standard in vanilla ER - Minor shopsanity discount --- BaseClasses.py | 115 ++++++++++++++++++++++++++++++++- CLI.py | 3 +- DoorShuffle.py | 2 +- ItemList.py | 2 +- Main.py | 58 +++-------------- Mystery.py | 6 ++ RELEASENOTES.md | 69 +++++++++----------- Rom.py | 10 ++- mystery_example.yml | 125 ++++++++++++++++++++++++++++++++++++ resources/app/cli/args.json | 3 +- 10 files changed, 297 insertions(+), 96 deletions(-) create mode 100644 mystery_example.yml diff --git a/BaseClasses.py b/BaseClasses.py index fd0d0ed9..11bccc67 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1,3 +1,4 @@ +import base64 import copy import json import logging @@ -134,7 +135,7 @@ class World(object): set_player_attr('keydropshuffle', False) set_player_attr('mixed_travel', 'prevent') set_player_attr('standardize_palettes', 'standardize') - set_player_attr('force_fix', {'gt': False, 'sw': False, 'pod': False, 'tr': False}); + set_player_attr('force_fix', {'gt': False, 'sw': False, 'pod': False, 'tr': False}) def get_name_string_for_object(self, obj): return obj.name if self.players == 1 else f'{obj.name} ({self.get_player_names(obj.player)})' @@ -1961,6 +1962,8 @@ class Spoiler(object): 'teams': self.world.teams, 'experimental': self.world.experimental, 'keydropshuffle': self.world.keydropshuffle, + 'shopsanity': self.world.shopsanity, + 'code': {p: Settings.make_code(self.world, p) for p in range(1, self.world.players + 1)} } def to_json(self): @@ -1997,6 +2000,7 @@ class Spoiler(object): if len(self.hashes) > 0: for team in range(self.world.teams): outfile.write('%s%s\n' % (f"Hash - {self.world.player_names[player][team]} (Team {team+1}): " if self.world.teams > 1 else 'Hash: ', self.hashes[player, team])) + outfile.write(f'Settings Code: {self.metadata["code"][player]}\n') outfile.write('Logic: %s\n' % self.metadata['logic'][player]) outfile.write('Mode: %s\n' % self.metadata['mode'][player]) outfile.write('Retro: %s\n' % ('Yes' if self.metadata['retro'][player] else 'No')) @@ -2024,6 +2028,7 @@ class Spoiler(object): outfile.write('Hints: %s\n' % ('Yes' if self.metadata['hints'][player] else 'No')) outfile.write('Experimental: %s\n' % ('Yes' if self.metadata['experimental'][player] else 'No')) outfile.write('Key Drops shuffled: %s\n' % ('Yes' if self.metadata['keydropshuffle'][player] else 'No')) + outfile.write(f"Shopsanity: {'Yes' if self.metadata['shopsanity'][player] else 'No'}\n") if self.doors: outfile.write('\n\nDoors:\n\n') outfile.write('\n'.join( @@ -2153,4 +2158,110 @@ class Pot(object): self.y = y self.item = item self.room = room - self.flags = flags \ No newline at end of file + self.flags = flags + + +# byte 0: DDDE EEEE (DR, ER) +dr_mode = {"basic": 1, "crossed": 2, "vanilla": 0} +er_mode = {"vanilla": 0, "simple": 1, "restricted": 2, "full": 3, "crossed": 4, "insanity": 5, "restricted_legacy": 8, + "full_legacy": 9, "madness_legacy": 10, "insanity_legacy": 11, "dungeonsfull": 7, "dungeonssimple": 6} + +# byte 1: LLLW WSSR (logic, mode, sword, retro) +logic_mode = {"noglitches": 0, "minorglitches": 1, "nologic": 2, "owg": 3, "majorglitches": 4} +world_mode = {"open": 0, "standard": 1, "inverted": 2} +sword_mode = {"random": 0, "assured": 1, "swordless": 2, "vanilla": 3} + +# byte 2: GGGD DFFH (goal, diff, item_func, hints) +goal_mode = {"ganon": 0, "pedestal": 1, "dungeons": 2, "triforcehunt": 3, "crystals": 4} +diff_mode = {"normal": 0, "hard": 1, "expert": 2} +func_mode = {"normal": 0, "hard": 1, "expert": 2} + +# byte 3: SKMM PIII (shop, keydrop, mixed, palettes, intensity) +mixed_travel_mode = {"prevent": 0, "allow": 1, "force": 2} +# intensity is 3 bits (reserves 4-7 levels) + +# byte 4: CCCC CTTX (crystals gt, ctr2, experimental) +counter_mode = {"default": 0, "off": 1, "on": 2, "pickup": 3} + +# byte 5: CCCC CPAA (crystals ganon, pyramid, access +access_mode = {"items": 0, "locations": 1, "none": 2} + +# byte 6: BSMC BBEE (big, small, maps, compass, bosses, enemies) +boss_mode = {"none": 0, "simple": 1, "full": 2, "random": 3} +enemy_mode = {"none": 0, "shuffled": 1, "random": 2} + +# byte 7: HHHD DP?? (enemy_health, enemy_dmg, potshuffle, ?) +e_health = {"default": 0, "easy": 1, "normal": 2, "hard": 3, "expert": 4} +e_dmg = {"default": 0, "shuffled": 1, "random": 2} + +class Settings(object): + + @staticmethod + def make_code(w, p): + code = bytes([ + (dr_mode[w.doorShuffle[p]] << 5) | er_mode[w.shuffle[p]], + + (logic_mode[w.logic[p]] << 5) | (world_mode[w.mode[p]] << 3) + | (sword_mode[w.swords[p]] << 1) | (1 if w.retro[p] else 0), + + (goal_mode[w.goal[p]] << 5) | (diff_mode[w.difficulty[p]] << 3) + | (func_mode[w.difficulty_adjustments[p]] << 1) | (1 if w.hints[p] else 0), + + (0x80 if w.shopsanity[p] else 0) | (0x40 if w.keydropshuffle[p] else 0) + | (mixed_travel_mode[w.mixed_travel[p]] << 4) | (0x8 if w.standardize_palettes[p] == "original" else 0) + | (0 if w.intensity[p] == "random" else w.intensity[p]), + + ((8 if w.crystals_gt_orig[p] == "random" else int(w.crystals_gt_orig[p])) << 3) + | (counter_mode[w.dungeon_counters[p]] << 1) | (1 if w.experimental[p] else 0), + + ((8 if w.crystals_ganon_orig[p] == "random" else int(w.crystals_ganon_orig[p])) << 3) + | (0x4 if w.open_pyramid[p] else 0) | access_mode[w.accessibility[p]], + + (0x80 if w.bigkeyshuffle[p] else 0) | (0x40 if w.keyshuffle[p] else 0) + | (0x20 if w.mapshuffle[p] else 0) | (0x10 if w.compassshuffle[p] else 0) + | (boss_mode[w.boss_shuffle[p]] << 2) | (enemy_mode[w.enemy_shuffle[p]]), + + (e_health[w.enemy_health[p]] << 5) | (e_dmg[w.enemy_damage[p]] << 3) | (0x4 if w.potshuffle[p] else 0)]) + return base64.b64encode(code, "+-".encode()).decode() + + @staticmethod + def adjust_args_from_code(code, player, args): + settings, p = base64.b64decode(code.encode(), "+-".encode()), player + + def r(d): + return {y: x for x, y in d.items()} + + args.shuffle[p] = r(er_mode)[settings[0] & 0x1F] + args.door_shuffle[p] = r(dr_mode)[(settings[0] & 0xE0) >> 5] + args.logic[p] = r(logic_mode)[(settings[1] & 0xE0) >> 5] + args.mode[p] = r(world_mode)[(settings[1] & 0x18) >> 3] + args.swords[p] = r(sword_mode)[(settings[1] & 0x6) >> 1] + args.difficulty[p] = r(diff_mode)[(settings[2] & 0x18) >> 3] + args.item_functionality[p] = r(func_mode)[(settings[2] & 0x6) >> 1] + args.goal[p] = r(goal_mode)[(settings[2] & 0xE0) >> 5] + args.accessibility[p] = r(access_mode)[settings[5] & 0x3] + args.retro[p] = True if settings[1] & 0x01 else False + args.hints[p] = True if settings[2] & 0x01 else False + args.retro[p] = True if settings[1] & 0x01 else False + args.shopsanity[p] = True if settings[3] & 0x80 else False + args.keydropshuffle[p] = True if settings[3] & 0x40 else False + args.mixed_travel[p] = r(mixed_travel_mode)[(settings[3] & 0x30) >> 4] + args.standardize_palettes[p] = "original" if settings[3] & 0x8 else "standardize" + intensity = settings[3] & 0x7 + args.intensity[p] = "random" if intensity == 0 else intensity + args.dungeon_counters[p] = r(counter_mode)[(settings[4] & 0x6) >> 1] + cgt = (settings[4] & 0xf8) >> 3 + args.crystals_gt[p] = "random" if cgt == 8 else cgt + args.experimental[p] = True if settings[4] & 0x1 else False + cgan = (settings[5] & 0xf8) >> 3 + args.crystals_ganon[p] = "random" if cgan == 8 else cgan + args.openpyramid[p] = True if settings[5] & 0x4 else False + args.bigkeyshuffle[p] = True if settings[6] & 0x80 else False + args.keyshuffle[p] = True if settings[6] & 0x40 else False + args.mapshuffle[p] = True if settings[6] & 0x20 else False + args.compassshuffle[p] = True if settings[6] & 0x10 else False + args.shufflebosses[p] = r(boss_mode)[(settings[6] & 0xc) >> 2] + args.shuffleenemies[p] = r(enemy_mode)[settings[6] & 0x3] + args.enemy_health[p] = r(e_health)[(settings[7] & 0xE0) >> 5] + args.enemy_damage[p] = r(e_dmg)[(settings[7] & 0x18) >> 3] + args.shufflepots[p] = True if settings[7] & 0x4 else False diff --git a/CLI.py b/CLI.py index bcfc2181..441375ed 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', 'shopsanity', 'keydropshuffle', 'mixed_travel', 'standardize_palettes']: + 'remote_items', 'shopsanity', 'keydropshuffle', 'mixed_travel', 'standardize_palettes', 'code']: value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name) if player == 1: setattr(ret, name, {1: value}) @@ -147,6 +147,7 @@ def parse_settings(): "mixed_travel": "prevent", "standardize_palettes": "standardize", + "code": "", "multi": 1, "names": "", diff --git a/DoorShuffle.py b/DoorShuffle.py index 5c05698f..c2085c50 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -89,7 +89,7 @@ def link_doors_main(world, player): world.get_portal('Desert East', player).destination = True if world.mode[player] == 'inverted': world.get_portal('Desert West', player).destination = True - if world.mode[player] == 'open': + else: world.get_portal('Skull 2 West', player).destination = True world.get_portal('Turtle Rock Lazy Eyes', player).destination = True world.get_portal('Turtle Rock Eye Bridge', player).destination = True diff --git a/ItemList.py b/ItemList.py index 5c42aa75..b1d44981 100644 --- a/ItemList.py +++ b/ItemList.py @@ -619,7 +619,7 @@ def todays_discounts(world, player): 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) + shop.inventory[slot]['price'] = randomize_price(orig // 5) repeatable_shop_items = ['Single Arrow', 'Arrows (10)', 'Bombs (3)', 'Bombs (10)', 'Red Potion', 'Small Heart', diff --git a/Main.py b/Main.py index 25b81153..0c1caa6f 100644 --- a/Main.py +++ b/Main.py @@ -8,7 +8,7 @@ import random import time import zlib -from BaseClasses import World, CollectionState, Item, Region, Location, Shop, Entrance +from BaseClasses import World, CollectionState, Item, Region, Location, Shop, Entrance, Settings from Items import ItemFactory from KeyDoorShuffle import validate_key_placement from PotShuffle import shuffle_pots @@ -28,6 +28,7 @@ from Utils import output_path, parse_player_names __version__ = '0.3.1.1-u' + class EnemizerError(RuntimeError): pass @@ -40,6 +41,10 @@ def main(args, seed=None, fish=None): start = time.perf_counter() # initialize the world + if args.code: + for player, code in args.code.items(): + if code: + Settings.adjust_args_from_code(code, player, args) world = World(args.multi, args.shuffle, args.door_shuffle, args.logic, args.mode, args.swords, args.difficulty, args.item_functionality, args.timer, args.progressive, args.goal, args.algorithm, args.accessibility, args.shuffleganon, args.retro, args.custom, args.customitemarray, args.hints) @@ -218,7 +223,7 @@ def main(args, seed=None, fish=None): customize_shops(world, player) balance_money_progression(world) - outfilebase = 'DR_%s' % (args.outputname if args.outputname else world.seed) + outfilebase = f'DR_{args.outputname if args.outputname else world.seed}' rom_names = [] jsonout = {} @@ -264,59 +269,12 @@ def main(args, seed=None, fish=None): if args.jsonout: jsonout[f'patch_t{team}_p{player}'] = rom.patches else: - mcsb_name = '' - if all([world.mapshuffle[player], world.compassshuffle[player], world.keyshuffle[player], world.bigkeyshuffle[player]]): - mcsb_name = '-keysanity' - elif [world.mapshuffle[player], world.compassshuffle[player], world.keyshuffle[player], world.bigkeyshuffle[player]].count(True) == 1: - mcsb_name = '-mapshuffle' if world.mapshuffle[player] else '-compassshuffle' if world.compassshuffle[player] else '-keyshuffle' if world.keyshuffle[player] else '-bigkeyshuffle' - elif any([world.mapshuffle[player], world.compassshuffle[player], world.keyshuffle[player], world.bigkeyshuffle[player]]): - mcsb_name = '-%s%s%s%sshuffle' % ( - 'M' if world.mapshuffle[player] else '', 'C' if world.compassshuffle[player] else '', - 'S' if world.keyshuffle[player] else '', 'B' if world.bigkeyshuffle[player] else '') - outfilepname = f'_T{team+1}' if world.teams > 1 else '' if world.players > 1: outfilepname += f'_P{player}' if world.players > 1 or world.teams > 1: outfilepname += f"_{world.player_names[player][team].replace(' ', '_')}" if world.player_names[player][team] != 'Player %d' % player else '' - outfilestuffs = { - "logic": world.logic[player], # 0 - "difficulty": world.difficulty[player], # 1 - "difficulty_adjustments": world.difficulty_adjustments[player], # 2 - "mode": world.mode[player], # 3 - "goal": world.goal[player], # 4 - "timer": str(world.timer), # 5 - "shuffle": world.shuffle[player], # 6 - "doorShuffle": world.doorShuffle[player], # 7 - "algorithm": world.algorithm, # 8 - "mscb": mcsb_name, # 9 - "retro": world.retro[player], # A - "progressive": world.progressive, # B - "hints": 'True' if world.hints[player] else 'False' # C - } - # 0 1 2 3 4 5 6 7 8 9 A B C - outfilesuffix = ('_%s_%s-%s-%s-%s%s_%s_%s-%s%s%s%s%s' % ( - # 0 1 2 3 4 5 6 7 8 9 A B C - # _noglitches_normal-normal-open-ganon-ohko_simple_basic-balanced-keysanity-retro-prog_swords-nohints - # _noglitches_normal-normal-open-ganon _simple_basic-balanced-keysanity-retro - # _noglitches_normal-normal-open-ganon _simple_basic-balanced-keysanity -prog_swords - # _noglitches_normal-normal-open-ganon _simple_basic-balanced-keysanity -nohints - outfilestuffs["logic"], # 0 - - outfilestuffs["difficulty"], # 1 - outfilestuffs["difficulty_adjustments"], # 2 - outfilestuffs["mode"], # 3 - outfilestuffs["goal"], # 4 - "" if outfilestuffs["timer"] in ['False', 'none', 'display'] else "-" + outfilestuffs["timer"], # 5 - - outfilestuffs["shuffle"], # 6 - outfilestuffs["doorShuffle"], # 7 - outfilestuffs["algorithm"], # 8 - outfilestuffs["mscb"], # 9 - - "-retro" if outfilestuffs["retro"] == "True" else "", # A - "-prog_" + outfilestuffs["progressive"] if outfilestuffs["progressive"] in ['off', 'random'] else "", # B - "-nohints" if not outfilestuffs["hints"] == "True" else "")) if not args.outputname else '' # C + outfilesuffix = f'_{Settings.make_code(world, player)}' if not args.outputname else '' rom.write_to_file(output_path(f'{outfilebase}{outfilepname}{outfilesuffix}.sfc')) if world.players > 1: diff --git a/Mystery.py b/Mystery.py index e0a19467..77ab630a 100644 --- a/Mystery.py +++ b/Mystery.py @@ -156,6 +156,11 @@ def roll_settings(weights): if ret.dungeon_counters == 'default': ret.dungeon_counters = 'pickup' if ret.door_shuffle != 'vanilla' or ret.compassshuffle == 'on' else 'off' + ret.shopsanity = get_choice('shopsanity') == 'on' + ret.keydropshuffle = get_choice('keydropshuffle') == 'on' + ret.mixed_travel = get_choice('mixed_travel') if 'mixed_travel' in weights else 'prevent' + ret.standardize_palettes = get_choice('standardize_palettes') if 'standardize_palettes' in weights else 'standardize' + goal = get_choice('goals') ret.goal = {'ganon': 'ganon', 'fast_ganon': 'crystals', @@ -173,6 +178,7 @@ def roll_settings(weights): if ret.mode == 'retro': ret.mode = 'open' ret.retro = True + ret.retro = get_choice('retro') == 'on' # this overrides world_state if used ret.hints = get_choice('hints') == 'on' diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 5bac936d..33db309a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -3,6 +3,7 @@ ## Shopsanity --shopsanity added. This adds 32 shop locations (9 more in retro) to the general and location pool. + Multi-world supported. Thanks go to Pepper and CaitSith2 for figuring out several items related to this major feature. Shop locations: @@ -32,35 +33,24 @@ Item Pool changes: To accommodate the new locations, new items are added to the * 1 - +5 Bomb Capacity * 1 - +5 Arrow Capacity -1. Initially, 1 of each type of potion refill is shuffled to the shops. (the Capacity Fairy is excluded from this). -This ensures that potions can be bought somewhere. +1. Initially, 1 of each type of potion refill is shuffled to the shops. (the Capacity Fairy is excluded from this, see step 4). This ensures that potions can be bought somewhere. 2. The rest of the shop pool is shuffled with the rest of the item pool. -3. At this time, only Ten Bombs, Ten Arrows, Capacity upgrades, and Small Hearts can appear outside of shops. Any other -shop items are replaced with rupees of various amounts. This is because of two reasons: First, potion refills and the -Bee are indistinguishable from Bottles with that item in them. Receiving those items without a bottle or empty bottle is -essentially a nothing item but looks like a bottle. Second, the non-progressive Shields interact fine with Progressive -Shields but are usually also a nothing item most of the time. -4. The Capacity Fairy cannot sell Potion Refills because the graphics are incompatible. 300 Rupees will replace any -potion refill that ends up there. -5. For capacity upgrades, if any shop sells capacity upgrades, then it will sell all seven. Otherwise, if plain bombs or -arrows are sold somewhere, then the other six capacity upgrades will be purchasable first at those locations and then -replaced by the underlying ammo. If no suitable spot is found, then no more capacity upgrades will not be available for -that seed. (There is always one somewhere in the pool.) -6. Any shop item that is originally sold by shops can be bought indefinitely but only the first purchase counts toward -total checks on the credits screen & item counter. All other items can be bought only once. +3. At this time, only Ten Bombs, Ten Arrows, Capacity upgrades, and Small Hearts can appear outside of shops. Any other shop items are replaced with rupees of various amounts. This is because of two reasons: First, potion refills and the Bee are indistinguishable from Bottles with that item in them. Receiving those items without a bottle or empty bottle is essentially a nothing item but looks like a bottle. Second, the non-progressive Shields interact fine with Progressive Shields but are usually also a nothing item most of the time. +4. The Capacity Fairy cannot sell Potion Refills because the graphics are incompatible. 300 Rupees will replace any potion refill that ends up there. +5. For capacity upgrades, if any shop sells capacity upgrades, then it will sell all seven of that type. Otherwise, if plain bombs or arrows are sold somewhere, then the other six capacity upgrades will be purchasable first at those locations and then replaced by the underlying ammo. If no suitable spot is found, then no more capacity upgrades will not be available for that seed. (There is always one somewhere in the pool.) +6. Any shop item that is originally sold by shops can be bought indefinitely but only the first purchase counts toward total checks on the credits screen & item counter. All other items can be bought only once. All items in the item pool may appear in shops. #### Pricing Guide -All prices range approx. from half the base price to the base price in increments of 5, the exact price is chosen -randomly within the range. +All prices range approx. from half the base price to the base price in increments of 5, the exact price is chosen randomly within the range. | Category | Items | Base Price | Typical Range | | ----------------- | ------- |:----------:|:-------------:| | Major Progression | Hammer, Hookshot, Mirror, Ocarina, Boots, Somaria, Fire Rod, Ice Rod | 250 | 125-250 | | Moon Pearl | 200 | 100-200 -| | Lamp, Progressive Bow, Glove, Sword | 150 | 75-150 +| | Lamp, Progressive Bows, Gloves, & Swords | 150 | 75-150 | Medallions | Bombos, Ether, Quake | 100 | 50-100 | Safety/Fetch | Cape, Mushroom, Shovel, Powder, Bug Net, Byrna, Progressive Armor & Shields, Half Magic | 50 | 25-50 | Bottles | Empty Bottle or Bee Bottle | 50 | 25-50 @@ -88,40 +78,27 @@ In addition, 4-7 items are steeply discounted at random. #### Rupee Balancing Algorithm -To prevent needed to grind for rupees to buy things in Sphere 1 and later, a money balancing algorithm has been -developed to counteract the need for rupees. Basic logic: it assumes you buy nothing until you are blocked by a shop, -a check that requires money or blocked by Kiki. Then you must have enough to make all purchases. If not, any free rupees -encountered may be swapped with higher denominations that have not been encountered. Ammo may also be swapped, -if necessary. +To prevent needed to grind for rupees to buy things in Sphere 1 and later, a money balancing algorithm has been developed to counteract the need for rupees. Basic logic: it assumes you buy nothing until you are blocked by a shop, a check that requires money, or blocked by Kiki. Then you must have enough to make all purchases. If not, any free rupees encountered may be swapped with higher denominations that have not been encountered. Ammo may also be swapped, if necessary. -(Checks that require money: Bottle Merchant, King Zora, Digging Game, Chest Game, Blacksmith, anything blocked by Kiki -e.g. all of Palace of Darkness when ER is vanilla) +(Checks that require money: Bottle Merchant, King Zora, Digging Game, Chest Game, Blacksmith, anything blocked by Kiki e.g. all of Palace of Darkness when ER is vanilla) -The Houlihan room is not in logic but the five dungeon rooms that provide rupees are. Pots with rupees, the arrow game, -and all other gambling games are not counted for determining income. +The Houlihan room is not in logic but the five dungeon rooms that provide rupees are. Pots with rupees, the arrow game, and all other gambling games are not counted for determining income. -Currently this is applied to seeds without shopsanity on so early money is slightly more likely if progression is on -a check that requires money. +Currently this is applied to seeds without shopsanity on so early money is slightly more likely if progression is on a check that requires money even if Shopsanity is not turned on. #### Retro and Shopsanity 9 new locations are added. -The four "Take Any" caves are converted into "Take Both" caves. Those and the old man cave are included in the shuffle. -The sword is returned to the pool, and the 4 heart containers and 4 blue potion refills are also added to the general -item pool. All items found in the retro caves are free to take once. Potion refills will disappear after use. +The four "Take Any" caves are converted into "Take Both" caves. Those and the old man cave are included in the shuffle. The sword is returned to the pool, and the 4 heart containers and 4 blue potion refills are also added to the general item pool. All items found in the retro caves are free to take once. Potion refills will disappear after use. Arrow Capacity upgrades are now replaced by Rupees wherever it might end up. -The Ten Arrows and 5 randomly selected Small Hearts or Blue Shields are replaced by the quiver item -(represented by the Single Arrow in game.) 5 Red Potion refills are replaced by the Universal small key. It is assured -that at least one shop sells Universal Small Keys. The quiver may thus not be found in shops. The quiver and small keys -retain their original base price, but may be discounted. +The Ten Arrows and 5 randomly selected Small Hearts or Blue Shields are replaced by the quiver item (represented by the Single Arrow in game.) 5 Red Potion refills are replaced by the Universal small key. It is assured that at least one shop sells Universal Small Keys. The quiver may thus not be found in shops. The quiver and small keys retain their original base price, but may be discounted. ##### Misc Notes -The location counter now - +The location counter both experimental and the credits now reflects the total and current checks made. Original retro for example is 221 while shopsanity by itself is 248. Keydropshuffle+sanity+retro can reach up to 290. ## In-Room Staircases/Ladders @@ -130,6 +107,21 @@ any N/S connections. (those that appear to go up one floor are North connection Big thanks to Catobat for doing all the hard work. +## Enemizer change + +The attic/maiden sequence is now active and required when Blind is the boss of Theives' Town even when bosses are shuffled. + +## Settings code + +File names have changed with a settings code instead of listing major settings chosen. Mystery games omit this for obvious reasons. Also found in the spoiler. + +Added to CLI only now. + +## Mystery fixes + +The Mystery.py file has been updated for those who like to use that for generating games. Supports keydropshuffle, +shopsanity, and other settings that have been included. + # Bug Fixes * 0.3.1.1-u @@ -138,6 +130,7 @@ Big thanks to Catobat for doing all the hard work. * Fix for Ice Jelly room when going backward and enemizer is on * Fix for inverted - don't start as a bunny in Dark Sanctuary * Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now. + * Minor fix to Standard generation * 0.3.0.1-u * Problem with lobbies on re-rolls corrected * Potential playthrough problem addressed diff --git a/Rom.py b/Rom.py index 290d9d01..0f998312 100644 --- a/Rom.py +++ b/Rom.py @@ -310,6 +310,13 @@ def patch_enemizer(world, player, rom, baserom_path, enemizercli, random_sprite_ for patch in json.load(f): rom.write_bytes(patch["address"], patch["patchData"]) + if world.get_dungeon("Thieves Town", player).boss.enemizer_name == "Blind": + rom.write_byte(0x04DE81, 0x6) # maiden spawn + # restore blind spawn code + rom.write_bytes(0xEA081, [0xaf, 0xcc, 0xf3, 0x7e, 0xc9, 0x6, 0xf0, 0x24, + 0xad, 0x3, 0x4, 0x29, 0x20, 0xf0, 0x1d]) + rom.write_byte(0x200101, 0) # Do not close boss room door on entry. + if random_sprite_on_hit: _populate_sprite_table() sprites = list(_sprite_table.values()) @@ -1537,8 +1544,7 @@ def write_custom_shops(rom, world, player): if item is None: break 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) + rom.write_byte(0x186560 + shop.sram_address + index, 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 diff --git a/mystery_example.yml b/mystery_example.yml new file mode 100644 index 00000000..cb075090 --- /dev/null +++ b/mystery_example.yml @@ -0,0 +1,125 @@ + description: Example door rando weights + door_shuffle: + vanilla: 2 + basic: 1 + crossed: 1 + intensity: + 1: 1 + 2: 1 + 3: 4 + keydropshuffle: + on: 1 + off: 1 + shopsanity: + on: 1 + off: 1 + pot_shuffle: + on: 1 + off: 3 + entrance_shuffle: + none: 15 + dungeonssimple: 3 + dungeonsfull: 2 + simple: 2 + restricted: 2 + full: 2 + crossed: 3 + insanity: 1 + world_state: + standard: 1 + open: 1 + inverted: 1 + retro: 0 + retro: + on: 1 + off: 4 + goals: + ganon: 2 + fast_ganon: 2 + dungeons: 1 + pedestal: 2 + triforce-hunt: 0 + dungeon_items: + standard: 10 + mc: 3 + mcs: 2 + full: 5 + experimental: + on: 1 + off: 0 + glitches_required: + none: 1 + no_logic: 0 + accessibility: + items: 1 + locations: 0 + none: 0 + tower_open: + "0": 1 + "1": 2 + "2": 3 + "3": 4 + "4": 4 + "5": 3 + "6": 2 + "7": 1 + random: 1 + ganon_open: + "0": 1 + "1": 2 + "2": 3 + "3": 4 + "4": 4 + "5": 3 + "6": 2 + "7": 1 + random: 1 + boss_shuffle: + none: 3 + simple: 1 + full: 1 + random: 1 + enemy_shuffle: + none: 3 + shuffled: 1 + random: 0 + hints: + on: 1 + off: 0 + weapons: + randomized: 2 + assured: 1 + vanilla: 1 + swordless: 0 + item_pool: + normal: 1 + hard: 0 + expert: 0 + item_functionality: + normal: 1 + hard: 0 + expert: 0 + enemy_damage: + default: 3 + shuffled: 1 + random: 0 + enemy_health: + default: 6 + easy: 1 + hard: 1 + expert: 0 + rom: + quickswap: + on: 1 + off: 0 + heartcolor: + red: 1 + blue: 1 + green: 1 + yellow: 1 + heartbeep: + double: 0 + normal: 0 + half: 0 + quarter: 1 + off: 0 diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 44bf9fc7..7859a9e4 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -359,5 +359,6 @@ "never" ] }, - "outputname": {} + "outputname": {}, + "code": {} } From 74a8ec6486b96203b292501044d4350152b0d1ec Mon Sep 17 00:00:00 2001 From: Catobat <69204835+Catobat@users.noreply.github.com> Date: Fri, 12 Feb 2021 23:01:50 +0100 Subject: [PATCH 08/21] Minor fixes for in-room stairs --- DoorShuffle.py | 2 +- Rom.py | 2 +- asm/asm_investigations.txt | 11 +++++++++++ asm/spiral.asm | 37 +++++++++++++++++++++++++------------ data/base2current.bps | Bin 131841 -> 131877 bytes 5 files changed, 38 insertions(+), 14 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 97e7d234..58d84688 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -89,7 +89,7 @@ def link_doors_main(world, player): world.get_portal('Desert East', player).destination = True if world.mode[player] == 'inverted': world.get_portal('Desert West', player).destination = True - if world.mode[player] == 'open': + else: world.get_portal('Skull 2 West', player).destination = True world.get_portal('Turtle Rock Lazy Eyes', player).destination = True world.get_portal('Turtle Rock Eye Bridge', player).destination = True diff --git a/Rom.py b/Rom.py index 4b97fc4e..4b9680da 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'bffd4e834049ca5f5295601436fc6009' +RANDOMIZERBASEHASH = '3a77558175cf8b2233f87c60329baa5d' class JsonRom(object): diff --git a/asm/asm_investigations.txt b/asm/asm_investigations.txt index feb5e09b..9d0cce24 100644 --- a/asm/asm_investigations.txt +++ b/asm/asm_investigations.txt @@ -200,3 +200,14 @@ $bc - TT 188 idx 1 ; called by 10CE2, (Dungeon_SpiralStaircase_3) ;122f0 + +Link's position after screen transition and auto-walk (from $02C034): + +0C 20 30 38 48 ; down +D4 D8 C0 C0 A8 ; up +0C 18 28 30 40 ; right +E4 D8 C8 C0 B0 ; left + +Effectively indexed by $0418*#$05+$4E. +Row ($0418) is the direction and column ($4E) determines how far to auto-walk (depends on tile attribute at edge of screen). +From left to right: edge, inside high door, outside high door, inside low door and outside low door. diff --git a/asm/spiral.asm b/asm/spiral.asm index 0d13c4e7..2dd2ab8b 100644 --- a/asm/spiral.asm +++ b/asm/spiral.asm @@ -170,10 +170,10 @@ InroomStairsWarp: { ; should be the same as lda $0462 : and #$04 : lsr #2 : eor #$01 : sta $07 lda $01 : and #$80 : beq .notEdge lda $07 : sta $03 : beq + - lda $01 : jsr LoadSouthMidpoint : sta $22 : lda #$e0 + lda $01 : jsr LoadSouthMidpoint : sta $22 : lda #$f4 bra ++ + - lda $01 : jsr LoadNorthMidpoint : sta $22 : lda #$1b + lda $01 : jsr LoadNorthMidpoint : sta $22 : dec $21 : lda #$f7 ++ sta $20 lda $01 : and #$20 : beq + @@ -185,26 +185,36 @@ InroomStairsWarp: { brl .layer .notEdge lda $01 : and #$03 : cmp #$03 : bne .normal + txa : and #$06 : sta $07 lda $01 : and #$30 : lsr #3 : tay - lda.w InroomStairsX,y : sta $22 lda.w InroomStairsX+1,y : sta $02 lda.w InroomStairsY+1,y : sta $03 - lda.w InroomStairsY,y - ldy $07 : beq + - !add #$07 - + - sta $20 + cpy $07 : beq .vanillaTransition + lda.w InroomStairsX,y : sta $22 + lda.w InroomStairsY,y + ldy $07 : beq + + !add #$07 + + + sta $20 + inc $07 + bra ++ + .vanillaTransition + lda #$c0 : sta $07 ; leave camera + ++ %StonewallCheck($1b) - inc $07 lda $01 : and #$04 : lsr #2 bra .layer .normal lda $01 : sta $fe ; trap door lda $07 : sta $03 : beq + + ldy $a0 : cpy #$51 : beq .specialFix ; throne room + cpy #$02 : beq .specialFix ; sewers pull switch + cpy #$71 : beq .specialFix ; castle armory lda #$e0 - ldy $a0 : cpy #$51 : bne ++ ; special fix for throne room - !sub #$18 - bra ++ + bra ++ + .specialFix + lda #$c8 + bra ++ + %StonewallCheck($43) lda #$1b @@ -235,12 +245,15 @@ InroomStairsWarp: { ldy #$01 : jsr ShiftQuadSimple .skipYQuad + lda $07 : bmi .skipCamera ldy #$00 : jsr SetCamera ; horizontal camera ldy #$01 : sty $07 : jsr SetCamera ; vertical camera lda $20 : cmp #$e0 : bcc + lda $e8 : bne + lda #$10 : sta $e8 ; adjust vertical camera at bottom + + .skipCamera + jsr StairCleanup ply : plx : plb ; pull the stuff we pushed rts diff --git a/data/base2current.bps b/data/base2current.bps index 71800df832f4178ed90683aa6572c4bcb9765874..970df14e576c2923e6564beaed7c30e523d35e04 100644 GIT binary patch delta 1418 zcmW-fdrVVz6vyxH_Q^xQf~E4}Y7oB?EN)#)%A9aCY5P^PF=VVkc^;#iz<_-o}N z1xg>saxIDXfxaz%#ik2p`ID{OK-X*NPxq)KOv`Kh`TdcschzvhGJwKqLj_l^~PN< zeX!90^X?4nDa1q{L)^(_xF!uMM2sx5iG>-wj1dVjk^4PXhW0+iuW>wrKV^8w7^)0jo6Y~axrryw=Jhe6UYRh-0ypThxqY27L8RIw zW2hk+7JGw?tUCoyWuq~J%PsvNb^f93*V>!5TsA{R=C-{aDdm+wsbq%23dL zH+}M_jZU7_-uDWzE-Coz2GNy9lPos{R>IZ0C6iWoo+MrR(yG*s>}13TqE(y3UDUTQ z{T?kV@fbudssmQv%R{ALzNgJ2_9*Z-MLe_W7Ua7hZ?Lz=uqP7J71(mfL77{IPHk~z zcG{{=4V~QLeoL&t>^%7UUY1mzHW5Q9(D%QOixnS%loqBy@J%(t3>doKhN|JKp{}J{ z?Hq|k)EWDwu%K#R6K8)B3=0x!f-NEoZPb2?RHNngW7itdNEcw8dzkz}Ol)5!-i8!%n>>jI{R&R&%B`|1rC*eEf-U zQ4=PP@&qLYhU8_DAwpfeM3WRx96jq=l@LBiQrW-|d@P%q1}Vdt>H4zS0bFMXsPBHuBtHPMz&{JKYD zsZpNj;*$#--plc`x+pYNv?FF9z(k>cvt+Z^1PqJ%RDs4^)H(?*WRn-8bTVdnVCG^} zj^gZd#7*|79YMpSj{MYMpnVBiP$6}dE_pDofxYcUZiy&Ngb9}6&~nlI{Gq@v9Lh(c zgpKC{(H^9t^L@pN5mQ(Ayf1FSH7`Mg!{--;BcXF`D0A|-D;!QLlgr6h?rn@s^&si) YKc2O}2g-U;=Y094DOLN>ox`I40G6d!sQ>@~ delta 1366 zcmW-fYfMvT7{~jb(;L@fg|-Tq*8`)V+XOM%vB^-Gr~|xUD0477hcoKXu?jF{CGFJEL`8~h<^W^#P=k#K& zUfi<@#d8%$=x;`?)Q|N_uU8X8Td70!N*aOly&bgKOZ`-*%+uSb={iuO@-0^k%BU(U zbkQNhP!sFr8|syXm9^CJqcGYk@s*G9y?mXS>IWmSfJnGRW}|xd zeXx>XxR&FVVc=vTP<#|bn8lE-UgFO7)q#f->-@XO2iVNKbq zE;vm?>fvqb1oA@bxhI$ew=)bkqmB2J7Ciiu+;*)juUjP&cbWv zWfHV@dw0H8OBr={h`yu|hU`lmafy7S;-rYd17S2XD`Ep_hR!mMg3#6*(lP0B3?3Yl ztL7E7bfBcoSl0G*R#ZrIlrj_yPDMmSHrY5rHPhh>ZWcn9MN5vbudEad>(%H zf=Q;DFJ<`O2P#hTJFy84Pg9}@rakMERjfYRb{GZX=iahnn z&)A~ef1msAB&_h-IUb(1Fa#&^FMjIe1PKyedtdXqu$3zW4g`kB1+zyZVf$QcbZnni zY}DNlaD0CY=K5`Sm>_T(f;9<}=8G80=P2PJET@@CxH=buqTt?~5~ z0%IKg%li=GT^o`Q^cuFtRt&TRXTTQkhY9t-zHyZ874v-Y-7$;hufN&GzDV0wXUx}Y zHO)Fm{i0So247c0yZ4xMvC-&cFBR9_c8!$xC;ISWBSbwpNbHlq*(a$5AEz`iOFYP} zwTgISq;4KQWxDp{HT89b#Tx=;hH#l-oy;&TGuj1otlUZPI(R%qMQMXlQPI$#Y#-40 zl(ux)=xE1MtbaO#O|4@5u+finSX=RW2waF>eJUoLZqBN#l?+^Jl$O^RgjfhE3mGD{ zx=B00VyIczjJ|?f3q>dr5}xiAZ))9Ks%Hf`?y{#ZA_LmaCywsY$MG82vH-M^RKMHe zX%9gE#ED7@Jlgb;!=A20R3CvV*p%HUn%JM|`Di!FMWL|gjN9@-QLi?lO%Sx?>CZqr z@`O!N`S^uOmhV7z0qni{mX>XIpe$nV6VFQrN=D?W Date: Sat, 13 Feb 2021 20:58:59 -0700 Subject: [PATCH 09/21] Update item counter for mystery Fixed bug with door restart Made retro keys more lenient with door shuffle --- DoorShuffle.py | 3 ++- ItemList.py | 5 +++++ Main.py | 2 +- Rom.py | 8 ++++++-- Rules.py | 6 ++++++ asm/hudadditions.asm | 13 ++++++++----- 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index c2085c50..2d2b218e 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -35,7 +35,7 @@ def link_doors(world, player): door.dest = None door.entranceFlag = False ent = door.entrance - if door.type != DoorType.Logical and ent.connected_region is not None: + if (door.type != DoorType.Logical or door.controller) and ent.connected_region is not None: ent.connected_region.entrances = [x for x in ent.connected_region.entrances if x != ent] ent.connected_region = None for portal in world.dungeon_portals[player]: @@ -2012,6 +2012,7 @@ class DROptions(Flag): OriginalPalettes = 0x20 Open_PoD_Wall = 0x40 # If on, pre opens the PoD wall, no bow required Open_Desert_Wall = 0x80 # If on, pre opens the desert wall, no fire required + Hide_Total = 0x100 # DATA GOES DOWN HERE diff --git a/ItemList.py b/ItemList.py index b1d44981..147527b90 100644 --- a/ItemList.py +++ b/ItemList.py @@ -753,6 +753,11 @@ def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, swords, r pool = [item.replace('Arrow Upgrade (+5)','Rupees (5)') for item in pool] pool = [item.replace('Arrow Upgrade (+10)','Rupees (5)') for item in pool] pool.extend(diff.retro) + if door_shuffle != 'vanilla': # door shuffle needs more keys for retro + replace = 'Rupees (20)' if difficulty == 'normal' else 'Rupees (5)' + indices = [i for i, x in enumerate(pool) if x == replace] + for i in range(0, min(10, len(indices))): + pool[indices[i]] = 'Small Key (Universal)' if mode == 'standard': if door_shuffle == 'vanilla': key_location = random.choice(['Secret Passage', 'Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest', 'Sewers - Dark Cross']) diff --git a/Main.py b/Main.py index 0c1caa6f..21cbabeb 100644 --- a/Main.py +++ b/Main.py @@ -256,7 +256,7 @@ def main(args, seed=None, fish=None): logging.warning(enemizerMsg) raise EnemizerError(enemizerMsg) - patch_rom(world, rom, player, team, enemized) + patch_rom(world, rom, player, team, enemized, bool(args.outputname)) if args.race: patch_race_rom(rom) diff --git a/Rom.py b/Rom.py index 0f998312..0c359a57 100644 --- a/Rom.py +++ b/Rom.py @@ -525,7 +525,8 @@ class Sprite(object): # split into palettes of 15 colors return array_chunk(palette_as_colors, 15) -def patch_rom(world, rom, player, team, enemized): + +def patch_rom(world, rom, player, team, enemized, is_mystery=False): random.seed(world.rom_seeds[player]) # progressive bow silver arrow hint hack @@ -714,7 +715,10 @@ def patch_rom(world, rom, player, team, enemized): rom.write_byte(0x13f000+dungeon_id, opposite_door.roomIndex) elif not opposite_door: rom.write_byte(0x13f000+dungeon_id, 0) # no supertile preceeding boss - rom.write_byte(0x138004, dr_flags.value) + if is_mystery: + dr_flags |= DROptions.Hide_Total + rom.write_byte(0x138004, dr_flags.value & 0xff) + rom.write_byte(0x138005, (dr_flags.value & 0xff00) >> 8) if dr_flags & DROptions.Town_Portal and world.mode[player] == 'inverted': rom.write_byte(0x138006, 1) diff --git a/Rules.py b/Rules.py index 3049dd5b..dd00644f 100644 --- a/Rules.py +++ b/Rules.py @@ -1592,6 +1592,7 @@ def add_key_logic_rules(world, player): if keys.opposite: rule = or_rule(rule, create_advanced_key_rule(d_logic, player, keys.opposite)) add_rule(spot, rule) + for location in d_logic.bk_restricted: if not location.forced_item: forbid_item(location, d_logic.bk_name, player) @@ -1601,6 +1602,11 @@ def add_key_logic_rules(world, player): add_rule(world.get_entrance(door.name, player), create_rule(d_logic.bk_name, player)) for chest in d_logic.bk_chests: add_rule(world.get_location(chest.name, player), create_rule(d_logic.bk_name, player)) + if world.retro[player]: + for d_name, layout in world.key_layout[player].items(): + for door in layout.flat_prop: + if world.mode[player] != 'standard' or not retro_in_hc(door.entrance): + add_rule(door.entrance, create_key_rule('Small Key (Universal)', player, 1)) def retro_in_hc(spot): diff --git a/asm/hudadditions.asm b/asm/hudadditions.asm index 059f1c2f..4568b12e 100644 --- a/asm/hudadditions.asm +++ b/asm/hudadditions.asm @@ -15,11 +15,14 @@ HudAdditions: LDX.b $06 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+4 ; draw 10's digit LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+6 ; draw 1's digit LDA.w #$2830 : STA !GOAL_DRAW_ADDRESS+8 ; draw slash - lda $7EF33E - 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 - LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+14 ; draw 1's digit + LDA.l DRFlags : AND #$0100 : BNE + + lda $7EF33E + 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 + LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+14 ; draw 1's digit + BRA ++ + + LDA.w #$2405 : STA !GOAL_DRAW_ADDRESS+10 : STA !GOAL_DRAW_ADDRESS+12 : STA !GOAL_DRAW_ADDRESS+14 ++ LDX $1B : BNE + : RTS : + ; Skip if outdoors From 8083c8c179a75bdfb2ee07c51b34dc77ed0b7db7 Mon Sep 17 00:00:00 2001 From: aerinon Date: Sat, 13 Feb 2021 20:59:40 -0700 Subject: [PATCH 10/21] Minor fix to ensure the key logic is correct when selling keys --- Fill.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Fill.py b/Fill.py index fcc9b68d..1999fea8 100644 --- a/Fill.py +++ b/Fill.py @@ -394,14 +394,14 @@ def sell_potions(world, player): 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) + shop_names = {shop.region.name: shop for shop in world.shops[player] if shop.region.name in shop_to_location_table} + choices = [(world.get_location(loc, player), shop) for shop in shop_names for loc in shop_to_location_table[shop]] + locations = [(loc, shop) for loc, shop in choices if not loc.item] + location, shop = 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 + idx = shop_to_location_table[shop_names[shop].region.name].index(location.name) + shop_names[shop].add_inventory(idx, 'Small Key (Universal)', 100) world.itempool.remove(universal_key) From f83b28adb670e2805a68bc0be1d670ed9bc6dd6d Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 5 Feb 2021 15:05:16 -0700 Subject: [PATCH 11/21] -Disallowed Swamp Lobby in Hyrule Castle in Standard mode -Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage) -Fix for Ice Jelly room when going backward and enemizer is on -Fix for inverted - don't start as a bunny in Dark Sanctuary -Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now. --- BaseClasses.py | 1 + DoorShuffle.py | 38 +++++++++++++++++++------------------- Doors.py | 1 + RELEASENOTES.md | 6 ++++++ Rom.py | 11 +++++++++-- RoomData.py | 7 ++++--- asm/dr_lobby.asm | 1 + asm/drhooks.asm | 3 +++ asm/overrides.asm | 7 +++++++ data/base2current.bps | Bin 131877 -> 132335 bytes 10 files changed, 51 insertions(+), 24 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 6be6174b..9ac6377b 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1214,6 +1214,7 @@ class Door(object): self.passage = True self.dungeonLink = None self.bk_shuffle_req = False + self.standard_restrict = False # flag if portal is not allowed in HC in standard # self.incognitoPos = -1 # self.sectorLink = False diff --git a/DoorShuffle.py b/DoorShuffle.py index 58d84688..c2085c50 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -357,6 +357,7 @@ def choose_portals(world, player): if world.doorShuffle[player] in ['basic', 'crossed']: cross_flag = world.doorShuffle[player] == 'crossed' bk_shuffle = world.bigkeyshuffle[player] + std_flag = world.mode[player] == 'standard' # roast incognito doors world.get_room(0x60, player).delete(5) world.get_room(0x60, player).change(2, DoorKind.DungeonEntrance) @@ -369,13 +370,14 @@ def choose_portals(world, player): region_map = defaultdict(list) reachable_portals = [] inaccessible_portals = [] + hc_flag = std_flag and dungeon == 'Hyrule Castle' for portal in portal_list: placeholder = world.get_region(portal + ' Portal', player) portal_region = placeholder.exits[0].connected_region name = portal_region.name if portal_region.type == RegionType.LightWorld: world.get_portal(portal, player).light_world = True - if name in world.inaccessible_regions[player]: + if name in world.inaccessible_regions[player] or (hc_flag and portal != 'Hyrule Castle South'): name_key = 'Desert Ledge' if name == 'Desert Palace Entrance (North) Spot' else name region_map[name_key].append(portal) inaccessible_portals.append(portal) @@ -397,7 +399,8 @@ def choose_portals(world, player): portal_assignment = defaultdict(list) for dungeon, info in info_map.items(): outstanding_portals = list(dungeon_portals[dungeon]) - if dungeon == 'Hyrule Castle' and world.mode[player] == 'standard': + hc_flag = std_flag and dungeon == 'Hyrule Castle' + if hc_flag: sanc = world.get_portal('Sanctuary', player) sanc.destination = True clean_up_portal_assignment(portal_assignment, dungeon, sanc, master_door_list, outstanding_portals) @@ -425,7 +428,7 @@ def choose_portals(world, player): the_rest = info.total - len(portal_assignment[dungeon]) for i in range(0, the_rest): candidates = find_portal_candidates(master_door_list, dungeon, crossed=cross_flag, - bk_shuffle=bk_shuffle) + bk_shuffle=bk_shuffle, standard=hc_flag) choice, portal = assign_portal(candidates, outstanding_portals, world, player) clean_up_portal_assignment(portal_assignment, dungeon, portal, master_door_list, outstanding_portals) @@ -536,23 +539,20 @@ def disconnect_portal(portal, world, player): chosen_door.entranceFlag = False -def find_portal_candidates(door_list, dungeon, need_passage=False, dead_end_allowed=False, crossed=False, bk_shuffle=False): - filter_list = [x for x in door_list if bk_shuffle or not x.bk_shuffle_req] - if need_passage: - if crossed: - return [x for x in filter_list if x.passage and (x.dungeonLink is None or x.entrance.parent_region.dungeon.name == dungeon)] - else: - return [x for x in filter_list if x.passage and x.entrance.parent_region.dungeon.name == dungeon] - elif dead_end_allowed: - if crossed: - return [x for x in filter_list if x.dungeonLink is None or x.entrance.parent_region.dungeon.name == dungeon] - else: - return [x for x in filter_list if x.entrance.parent_region.dungeon.name == dungeon] +def find_portal_candidates(door_list, dungeon, need_passage=False, dead_end_allowed=False, crossed=False, + bk_shuffle=False, standard=False): + ret = [x for x in door_list if bk_shuffle or not x.bk_shuffle_req] + if crossed: + ret = [x for x in ret if not x.dungeonLink or x.entrance.parent_region.dungeon.name == dungeon] else: - if crossed: - return [x for x in filter_list if (not x.dungeonLink or x.entrance.parent_region.dungeon.name == dungeon) and not x.deadEnd] - else: - return [x for x in filter_list if x.entrance.parent_region.dungeon.name == dungeon and not x.deadEnd] + ret = [x for x in ret if x.entrance.parent_region.dungeon.name == dungeon] + if need_passage: + ret = [x for x in ret if x.passage] + if not dead_end_allowed: + ret = [x for x in ret if not x.deadEnd] + if standard: + ret = [x for x in ret if not x.standard_restrict] + return ret def assign_portal(candidates, possible_portals, world, player): diff --git a/Doors.py b/Doors.py index 3bc41766..c3cc969d 100644 --- a/Doors.py +++ b/Doors.py @@ -1306,6 +1306,7 @@ def create_doors(world, player): world.get_door("GT Bob\'s Room SE", player).passage = False world.get_door('PoD Mimics 2 SW', player).bk_shuffle_req = True world.get_door('Desert Tiles 2 SE', player).bk_shuffle_req = True # key-drop note (todo) + world.get_door('Swamp Lobby S', player).standard_restricted = True # key-drop note (todo) # can't unlink from boss right now world.get_door('Hera Lobby S', player).dungeonLink = 'Tower of Hera' diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 460d34ad..339ed2f8 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -9,6 +9,12 @@ Big thanks to Catobat for doing all the hard work. # Bug Fixes +* 0.3.0.2-u + * Disallowed Swamp Lobby in Hyrule Castle in Standard mode + * Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage) + * Fix for Ice Jelly room when going backward and enemizer is on + * Fix for inverted - don't start as a bunny in Dark Sanctuary + * Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now. * 0.3.0.1-u * Problem with lobbies on re-rolls corrected * Potential playthrough problem addressed diff --git a/Rom.py b/Rom.py index 4b9680da..a356fb08 100644 --- a/Rom.py +++ b/Rom.py @@ -711,6 +711,12 @@ def patch_rom(world, rom, player, team, enemized): if dr_flags & DROptions.Town_Portal and world.mode[player] == 'inverted': rom.write_byte(0x138006, 1) + # swap in non-ER Lobby Shuffle Inverted - but only then + if world.mode[player] == 'inverted' and world.intensity[player] >= 3 and world.doorShuffle[player] != 'vanilla' and world.shuffle[player] == 'vanilla': + aga_portal = world.get_portal('Agahnims Tower', player) + gt_portal = world.get_portal('Ganons Tower', player) + aga_portal.exit_offset, gt_portal.exit_offset = gt_portal.exit_offset, aga_portal.exit_offset + for portal in world.dungeon_portals[player]: if not portal.default: offset = portal.ent_offset @@ -2093,8 +2099,9 @@ def set_inverted_mode(world, player, rom): if world.shuffle[player] == 'vanilla': rom.write_byte(0xDBB73 + 0x23, 0x37) # switch AT and GT rom.write_byte(0xDBB73 + 0x36, 0x24) - write_int16(rom, 0x15AEE + 2*0x38, 0x00E0) - write_int16(rom, 0x15AEE + 2*0x25, 0x000C) + if world.doorShuffle[player] == 'vanilla' or world.intensity[player] < 3: + write_int16(rom, 0x15AEE + 2*0x38, 0x00E0) + write_int16(rom, 0x15AEE + 2*0x25, 0x000C) if world.shuffle[player] in ['vanilla', 'dungeonssimple', 'dungeonsfull']: rom.write_byte(0x15B8C, 0x6C) rom.write_byte(0xDBB73 + 0x00, 0x53) # switch bomb shop and links house diff --git a/RoomData.py b/RoomData.py index 3fe8d594..f3c82576 100644 --- a/RoomData.py +++ b/RoomData.py @@ -252,6 +252,7 @@ def create_rooms(world, player): world.get_room(0x77, player).swap(0, 1) # fixes Hera Lobby Key Stairs - entrance now at pos 0 if world.enemy_shuffle[player] != 'none': world.get_room(0xc0, player).change(0, DoorKind.Normal) # fix this kill room if enemizer is on + world.get_room(0x0e, player).change(1, DoorKind.TrapTriggerable) # fix this kill room if enemizer is on def reset_rooms(world, player): @@ -369,7 +370,7 @@ class DoorKind(Enum): IncognitoEntrance = 0x12 DungeonChanger = 0x14 ToggleFlag = 0x16 - Trap = 0x18 + Trap = 0x18 # both sides trapped UnknownD6 = 0x1A SmallKey = 0x1C BigKey = 0x1E @@ -382,8 +383,8 @@ class DoorKind(Enum): Bombable = 0x2E BlastWall = 0x30 Hidden = 0x32 - TrapTriggerable = 0x36 - Trap2 = 0x38 + TrapTriggerable = 0x36 # right side trap or south side trap + Trap2 = 0x38 # left side trap or north side trap NormalLow2 = 0x40 TrapTriggerableLow = 0x44 Warp = 0x46 diff --git a/asm/dr_lobby.asm b/asm/dr_lobby.asm index c2f08fa6..cf3ed694 100644 --- a/asm/dr_lobby.asm +++ b/asm/dr_lobby.asm @@ -1,5 +1,6 @@ CheckDarkWorldSanc: STA $A0 : STA $048E ; what we wrote over + LDA.l InvertedMode : BNE + LDA.l SancDarkWorldFlag : BEQ + SEP #$30 LDA $A0 : CMP #$12 : BNE ++ diff --git a/asm/drhooks.asm b/asm/drhooks.asm index 1aa62dde..c4939e9d 100644 --- a/asm/drhooks.asm +++ b/asm/drhooks.asm @@ -170,6 +170,9 @@ JSL CheckDarkWorldSanc : NOP org $01891e ; <- Bank 01.asm : 991 Dungeon_LoadType2Object (LDA $00 : XBA : AND.w #$00FF) JSL RainPrevention : NOP #2 +org $1edabf ; <- sprite_energy_ball.asm : 86-7 Sprite_EnergyBall (LDA.b #$10 : LDX.b #$00) +JSL StandardAgaDmg + ; These two, if enabled together, have implications for vanilla BK doors in IP/Hera/Mire ; IPBJ is common enough to consider not doing this. Mire is not a concern for vanilla - maybe glitched modes ; Hera BK door back can be seen with Pot clipping - likely useful for no logic seeds diff --git a/asm/overrides.asm b/asm/overrides.asm index d47d565f..28eb7f91 100644 --- a/asm/overrides.asm +++ b/asm/overrides.asm @@ -142,3 +142,10 @@ RainPrevention: PLA : LDA #$0008 : RTL .done PLA : RTL +; A should be how much dmg to do to Aga when leaving this function +StandardAgaDmg: + LDX.b #$00 ; part of what we wrote over + LDA.l $7EF3C6 : AND #$04 : BEQ + ; zelda's not been rescued + LDA.b #$10 ; hurt him! + + RTL ; A is zero if the AND results in zero and then Agahnim's invincible! + diff --git a/data/base2current.bps b/data/base2current.bps index 970df14e576c2923e6564beaed7c30e523d35e04..4674a0635dce4700727220b4681a6fc78d7892e8 100644 GIT binary patch delta 17234 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 DK#F>= delta 16883 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 Date: Wed, 10 Feb 2021 15:19:09 -0700 Subject: [PATCH 12/21] Key logic error with odd_counter and child doors Fix the Lone Pot doors (E/W) swapped --- DoorShuffle.py | 2 +- Doors.py | 4 ++-- KeyDoorShuffle.py | 9 ++++++--- Regions.py | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index c2085c50..3a07ff1a 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -2417,7 +2417,7 @@ interior_doors = [ ('Skull Pull Switch S', 'Skull Big Chest N'), ('Skull Left Drop ES', 'Skull Compass Room WS'), ('Skull 2 East Lobby NW', 'Skull Big Key SW'), - ('Skull Big Key WN', 'Skull Lone Pot EN'), + ('Skull Big Key EN', 'Skull Lone Pot WN'), ('Skull Small Hall WS', 'Skull 2 West Lobby ES'), ('Skull 2 West Lobby NW', 'Skull X Room SW'), ('Skull 3 Lobby EN', 'Skull East Bridge WN'), diff --git a/Doors.py b/Doors.py index c3cc969d..af585bad 100644 --- a/Doors.py +++ b/Doors.py @@ -541,8 +541,8 @@ def create_doors(world, player): create_door(player, 'Skull 2 East Lobby WS', Nrml).dir(We, 0x57, Bot, High).pos(4), create_door(player, 'Skull 2 East Lobby NW', Intr).dir(No, 0x57, Left, High).pos(1), create_door(player, 'Skull Big Key SW', Intr).dir(So, 0x57, Left, High).pos(1), - create_door(player, 'Skull Big Key WN', Intr).dir(We, 0x57, Top, High).pos(0), - create_door(player, 'Skull Lone Pot EN', Intr).dir(Ea, 0x57, Top, High).pos(0), + create_door(player, 'Skull Big Key EN', Intr).dir(Ea, 0x57, Top, High).pos(0), + create_door(player, 'Skull Lone Pot WN', Intr).dir(We, 0x57, Top, High).pos(0), create_door(player, 'Skull Small Hall ES', Nrml).dir(Ea, 0x56, Bot, High).pos(3), create_door(player, 'Skull Small Hall WS', Intr).dir(We, 0x56, Bot, High).pos(2), create_door(player, 'Skull 2 West Lobby S', Nrml).dir(So, 0x56, Left, High).pos(1).portal(Z, 0x00), diff --git a/KeyDoorShuffle.py b/KeyDoorShuffle.py index becf6bf8..1a4e1469 100644 --- a/KeyDoorShuffle.py +++ b/KeyDoorShuffle.py @@ -579,7 +579,7 @@ def progressive_ctr(new_counter, last_counter): def unique_child_door(child, key_counter): if child in key_counter.child_doors or child.dest in key_counter.child_doors: return False - if child in key_counter.open_doors or child.dest in key_counter.child_doors: + if child in key_counter.open_doors or child.dest in key_counter.open_doors: return False if child.bigKey and key_counter.big_key_opened: return False @@ -589,7 +589,7 @@ def unique_child_door(child, key_counter): def unique_child_door_2(child, key_counter): if child in key_counter.child_doors or child.dest in key_counter.child_doors: return False - if child in key_counter.open_doors or child.dest in key_counter.child_doors: + if child in key_counter.open_doors or child.dest in key_counter.open_doors: return False return True @@ -1463,7 +1463,10 @@ def create_odd_key_counter(door, parent_counter, key_layout, world, player): next_counter = find_next_counter(door, parent_counter, key_layout) odd_counter.free_locations = dict_difference(next_counter.free_locations, parent_counter.free_locations) odd_counter.key_only_locations = dict_difference(next_counter.key_only_locations, parent_counter.key_only_locations) - odd_counter.child_doors = dict_difference(next_counter.child_doors, parent_counter.child_doors) + odd_counter.child_doors = {} + for d in next_counter.child_doors: + if d not in parent_counter.child_doors and (d.type == DoorType.SpiralStairs or d.dest not in parent_counter.child_doors): + odd_counter.child_doors[d] = None odd_counter.other_locations = dict_difference(next_counter.other_locations, parent_counter.other_locations) odd_counter.important_locations = dict_difference(next_counter.important_locations, parent_counter.important_locations) for loc in odd_counter.other_locations: diff --git a/Regions.py b/Regions.py index 5d8a1769..87451e6b 100644 --- a/Regions.py +++ b/Regions.py @@ -472,8 +472,8 @@ def create_dungeon_regions(world, player): create_dungeon_region(player, 'Skull Compass Room', 'Skull Woods', ['Skull Woods - Compass Chest'], ['Skull Compass Room NE', 'Skull Compass Room ES', 'Skull Compass Room WS']), create_dungeon_region(player, 'Skull Left Drop', 'Skull Woods', None, ['Skull Left Drop ES']), create_dungeon_region(player, 'Skull 2 East Lobby', 'Skull Woods', None, ['Skull 2 East Lobby NW', 'Skull 2 East Lobby WS', 'Skull 2 East Lobby SW']), - create_dungeon_region(player, 'Skull Big Key', 'Skull Woods', ['Skull Woods - Big Key Chest'], ['Skull Big Key SW', 'Skull Big Key WN']), - create_dungeon_region(player, 'Skull Lone Pot', 'Skull Woods', None, ['Skull Lone Pot EN']), + create_dungeon_region(player, 'Skull Big Key', 'Skull Woods', ['Skull Woods - Big Key Chest'], ['Skull Big Key SW', 'Skull Big Key EN']), + create_dungeon_region(player, 'Skull Lone Pot', 'Skull Woods', None, ['Skull Lone Pot WN']), create_dungeon_region(player, 'Skull Small Hall', 'Skull Woods', None, ['Skull Small Hall ES', 'Skull Small Hall WS']), create_dungeon_region(player, 'Skull Back Drop', 'Skull Woods', None, ['Skull Back Drop Star Path', ]), create_dungeon_region(player, 'Skull 2 West Lobby', 'Skull Woods', ['Skull Woods - West Lobby Pot Key'], ['Skull 2 West Lobby ES', 'Skull 2 West Lobby NW', 'Skull 2 West Lobby S']), From 3b8773ea33a38864b0983d346760da619c5482da Mon Sep 17 00:00:00 2001 From: aerinon Date: Sat, 13 Feb 2021 20:58:59 -0700 Subject: [PATCH 13/21] Update item counter for mystery Fixed bug with door restart Made retro keys more lenient with door shuffle --- DoorShuffle.py | 3 ++- ItemList.py | 5 +++++ Main.py | 2 +- Rom.py | 8 ++++++-- Rules.py | 6 ++++++ asm/hudadditions.asm | 18 ++++++++++++++---- 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 3a07ff1a..d2cf35f8 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -35,7 +35,7 @@ def link_doors(world, player): door.dest = None door.entranceFlag = False ent = door.entrance - if door.type != DoorType.Logical and ent.connected_region is not None: + if (door.type != DoorType.Logical or door.controller) and ent.connected_region is not None: ent.connected_region.entrances = [x for x in ent.connected_region.entrances if x != ent] ent.connected_region = None for portal in world.dungeon_portals[player]: @@ -2012,6 +2012,7 @@ class DROptions(Flag): OriginalPalettes = 0x20 Open_PoD_Wall = 0x40 # If on, pre opens the PoD wall, no bow required Open_Desert_Wall = 0x80 # If on, pre opens the desert wall, no fire required + Hide_Total = 0x100 # DATA GOES DOWN HERE diff --git a/ItemList.py b/ItemList.py index ddb629ab..9b2de617 100644 --- a/ItemList.py +++ b/ItemList.py @@ -596,6 +596,11 @@ def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, swords, r pool = [item.replace('Arrow Upgrade (+5)','Rupees (5)') for item in pool] pool = [item.replace('Arrow Upgrade (+10)','Rupees (5)') for item in pool] pool.extend(diff.retro) + if door_shuffle != 'vanilla': # door shuffle needs more keys for retro + replace = 'Rupees (20)' if difficulty == 'normal' else 'Rupees (5)' + indices = [i for i, x in enumerate(pool) if x == replace] + for i in range(0, min(10, len(indices))): + pool[indices[i]] = 'Small Key (Universal)' if mode == 'standard': if door_shuffle == 'vanilla': key_location = random.choice(['Secret Passage', 'Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest', 'Sewers - Dark Cross']) diff --git a/Main.py b/Main.py index 42a45fdd..a11a6dc2 100644 --- a/Main.py +++ b/Main.py @@ -238,7 +238,7 @@ def main(args, seed=None, fish=None): logging.warning(enemizerMsg) raise EnemizerError(enemizerMsg) - patch_rom(world, rom, player, team, enemized) + patch_rom(world, rom, player, team, enemized, bool(args.outputname)) if args.race: patch_race_rom(rom) diff --git a/Rom.py b/Rom.py index a356fb08..27961b5d 100644 --- a/Rom.py +++ b/Rom.py @@ -518,7 +518,8 @@ class Sprite(object): # split into palettes of 15 colors return array_chunk(palette_as_colors, 15) -def patch_rom(world, rom, player, team, enemized): + +def patch_rom(world, rom, player, team, enemized, is_mystery=False): random.seed(world.rom_seeds[player]) # progressive bow silver arrow hint hack @@ -707,7 +708,10 @@ def patch_rom(world, rom, player, team, enemized): rom.write_byte(0x13f000+dungeon_id, opposite_door.roomIndex) elif not opposite_door: rom.write_byte(0x13f000+dungeon_id, 0) # no supertile preceeding boss - rom.write_byte(0x138004, dr_flags.value) + if is_mystery: + dr_flags |= DROptions.Hide_Total + rom.write_byte(0x138004, dr_flags.value & 0xff) + rom.write_byte(0x138005, (dr_flags.value & 0xff00) >> 8) if dr_flags & DROptions.Town_Portal and world.mode[player] == 'inverted': rom.write_byte(0x138006, 1) diff --git a/Rules.py b/Rules.py index 3049dd5b..dd00644f 100644 --- a/Rules.py +++ b/Rules.py @@ -1592,6 +1592,7 @@ def add_key_logic_rules(world, player): if keys.opposite: rule = or_rule(rule, create_advanced_key_rule(d_logic, player, keys.opposite)) add_rule(spot, rule) + for location in d_logic.bk_restricted: if not location.forced_item: forbid_item(location, d_logic.bk_name, player) @@ -1601,6 +1602,11 @@ def add_key_logic_rules(world, player): add_rule(world.get_entrance(door.name, player), create_rule(d_logic.bk_name, player)) for chest in d_logic.bk_chests: add_rule(world.get_location(chest.name, player), create_rule(d_logic.bk_name, player)) + if world.retro[player]: + for d_name, layout in world.key_layout[player].items(): + for door in layout.flat_prop: + if world.mode[player] != 'standard' or not retro_in_hc(door.entrance): + add_rule(door.entrance, create_key_rule('Small Key (Universal)', player, 1)) def retro_in_hc(spot): diff --git a/asm/hudadditions.asm b/asm/hudadditions.asm index 9b78a0a4..4568b12e 100644 --- a/asm/hudadditions.asm +++ b/asm/hudadditions.asm @@ -8,11 +8,21 @@ DrHudOverride: HudAdditions: { lda.l DRFlags : and #$0008 : beq ++ - lda $7EF423 : and #$00ff + LDA.w #$28A4 : STA !GOAL_DRAW_ADDRESS + 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 - LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+14 ; draw 1's digit + LDX.b $05 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+2 ; draw 100's digit + LDX.b $06 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+4 ; draw 10's digit + LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+6 ; draw 1's digit + LDA.w #$2830 : STA !GOAL_DRAW_ADDRESS+8 ; draw slash + LDA.l DRFlags : AND #$0100 : BNE + + lda $7EF33E + 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 + LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+14 ; draw 1's digit + BRA ++ + + LDA.w #$2405 : STA !GOAL_DRAW_ADDRESS+10 : STA !GOAL_DRAW_ADDRESS+12 : STA !GOAL_DRAW_ADDRESS+14 ++ LDX $1B : BNE + : RTS : + ; Skip if outdoors From 26f7b1c993253d92cc9af65fcf2c4c7a446d87d6 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 15 Feb 2021 13:36:34 -0700 Subject: [PATCH 14/21] Notes/version Baserom update --- Main.py | 2 +- RELEASENOTES.md | 10 +++++++++- Rom.py | 2 +- data/base2current.bps | Bin 132335 -> 132008 bytes 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Main.py b/Main.py index a11a6dc2..4d429679 100644 --- a/Main.py +++ b/Main.py @@ -25,7 +25,7 @@ from Fill import distribute_items_cutoff, distribute_items_staleness, distribute from ItemList import generate_itempool, difficulties, fill_prizes, fill_specific_items from Utils import output_path, parse_player_names -__version__ = '0.3.0.2-u' +__version__ = '0.3.0.3-u' class EnemizerError(RuntimeError): pass diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 339ed2f8..a63ece84 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -7,14 +7,22 @@ any N/S connections. (those that appear to go up one floor are North connection Big thanks to Catobat for doing all the hard work. +## Experimental Item Counter + +New item counter modified to show total? + # Bug Fixes -* 0.3.0.2-u +* 0.3.0.3-u * Disallowed Swamp Lobby in Hyrule Castle in Standard mode * Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage) * Fix for Ice Jelly room when going backward and enemizer is on * Fix for inverted - don't start as a bunny in Dark Sanctuary * Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now. + * Fix for In-Room Stairs with Trap Doors + * Key logic fix + * Fix for door gen re-start + * More lenient keys in DR+Retro * 0.3.0.1-u * Problem with lobbies on re-rolls corrected * Potential playthrough problem addressed diff --git a/Rom.py b/Rom.py index 27961b5d..20ffe6c2 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '3a77558175cf8b2233f87c60329baa5d' +RANDOMIZERBASEHASH = '795290cfff38c1b0b0dca6498e5d107b' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 4674a0635dce4700727220b4681a6fc78d7892e8..97f3e55e8343ea77cd3d23e9cd16da70df54b32a 100644 GIT binary patch delta 17218 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
k&4(LBGD$Z_U9~X(EM^oS_B#hR4ntr%Zj44? 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 From f13dba3512a33af61ec7eb97b151caae56fe0de4 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Mon, 15 Feb 2021 19:36:20 -0800 Subject: [PATCH 15/21] QoL Improvements Update SpriteSomething collections page for Z3Link sprites Add Diagnostics button to the GUI --- source/classes/SpriteSelector.py | 2 +- source/gui/randomize/generation.py | 46 +++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/source/classes/SpriteSelector.py b/source/classes/SpriteSelector.py index 1ab073ad..1c869301 100644 --- a/source/classes/SpriteSelector.py +++ b/source/classes/SpriteSelector.py @@ -38,7 +38,7 @@ class SpriteSelector(object): # Open SpriteSomething directory for Link sprites def open_spritesomething_listing(_evt): - webbrowser.open("https://artheau.github.io/SpriteSomething/resources/app/snes/zelda3/link/sprites.html") + webbrowser.open("https://miketrethewey.github.io/SpriteSomething-collections/snes/zelda3/link/") official_frametitle = Frame(self.window) official_title_text = Label(official_frametitle, text="Official Sprites") diff --git a/source/gui/randomize/generation.py b/source/gui/randomize/generation.py index f358c864..4bcb868c 100644 --- a/source/gui/randomize/generation.py +++ b/source/gui/randomize/generation.py @@ -1,8 +1,11 @@ -from tkinter import ttk, filedialog, StringVar, Button, Entry, Frame, Label, E, W, LEFT, X +from tkinter import ttk, filedialog, StringVar, Button, Entry, Frame, Label, E, W, LEFT, X, Text, Tk, INSERT +import source.classes.diags as diagnostics import source.gui.widgets as widgets import json import os +from functools import partial from source.classes.Empty import Empty +from Main import __version__ def generation_page(parent,settings): # Generation Setup @@ -76,4 +79,45 @@ def generation_page(parent,settings): # frame: pack self.widgets[widget].pieces["frame"].pack(fill=X) + ## Run Diagnostics + # This one's more-complicated, build it and stuff it + # widget ID + widget = "diags" + + # Empty object + self.widgets[widget] = Empty() + # pieces + self.widgets[widget].pieces = {} + + # frame + self.frames["diags"] = Frame(self) + self.frames["diags"].pack() + self.widgets[widget].pieces["frame"] = Frame(self.frames["diags"]) + + + def diags(): + # Debugging purposes + dims = { + "window": { + "width": 800, + "height": 500 + }, + "textarea.characters": { + "width": 120, + "height": 50 + } + } + diag = Tk() + diag.title("Door Shuffle " + __version__) + diag.geometry(str(dims["window"]["width"]) + 'x' + str(dims["window"]["height"])) + text = Text(diag, width=dims["textarea.characters"]["width"], height=dims["textarea.characters"]["height"]) + text.pack() + text.insert(INSERT,"\n".join(diagnostics.output(__version__))) + # dialog button + self.widgets[widget].pieces["button"] = Button(self.widgets[widget].pieces["frame"], text='Run Diagnostics', command=partial(diags)) + + # button: pack + self.widgets[widget].pieces["button"].pack(side=LEFT) + # frame: pack + self.widgets[widget].pieces["frame"].pack(fill=X) return self,settings From 5a8139258dba6d7c32cbfaf29e91974551a9c0b7 Mon Sep 17 00:00:00 2001 From: Catobat <69204835+Catobat@users.noreply.github.com> Date: Tue, 16 Feb 2021 20:00:21 +0100 Subject: [PATCH 16/21] PoD Mimics 2 portal flexibility --- Doors.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Doors.py b/Doors.py index 3bc41766..c65346d1 100644 --- a/Doors.py +++ b/Doors.py @@ -1304,7 +1304,6 @@ def create_doors(world, player): world.get_door('GT Petting Zoo SE', player).dead_end() world.get_door('GT DMs Room SW', player).dead_end() world.get_door("GT Bob\'s Room SE", player).passage = False - world.get_door('PoD Mimics 2 SW', player).bk_shuffle_req = True world.get_door('Desert Tiles 2 SE', player).bk_shuffle_req = True # key-drop note (todo) # can't unlink from boss right now From b36c03a8b406b95a7bf217a938882fc1548dc5f7 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 16 Feb 2021 13:34:00 -0700 Subject: [PATCH 17/21] Pot shuffle repair --- BaseClasses.py | 4 +++- Main.py | 3 ++- RELEASENOTES.md | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 9ac6377b..6c77eb3c 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -146,7 +146,9 @@ class World(object): region.world = self self._region_cache[region.player][region.name] = region for exit in region.exits: - self._entrance_cache[(exit.name, exit.player)] = exit + self._entrance_cache[exit.name, exit.player] = exit + for r_location in region.locations: + self._location_cache[r_location.name, r_location.player] = r_location def initialize_doors(self, doors): for door in doors: diff --git a/Main.py b/Main.py index 4d429679..00de5e19 100644 --- a/Main.py +++ b/Main.py @@ -428,12 +428,13 @@ def copy_world(world): copied_shop.inventory = copy.copy(shop.inventory) # connect copied world + copied_locations = {(loc.name, loc.player): loc for loc in ret.get_locations()} # caches all locations for region in world.regions: copied_region = ret.get_region(region.name, region.player) copied_region.is_light_world = region.is_light_world copied_region.is_dark_world = region.is_dark_world copied_region.dungeon = region.dungeon - copied_region.locations = [ret.get_location(location.name, location.player) for location in region.locations] + copied_region.locations = [copied_locations[(location.name, location.player)] for location in region.locations] for entrance in region.entrances: ret.get_entrance(entrance.name, entrance.player).connect(copied_region) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a63ece84..00956f23 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -9,7 +9,7 @@ Big thanks to Catobat for doing all the hard work. ## Experimental Item Counter -New item counter modified to show total? +New item counter modified to show total # Bug Fixes @@ -22,7 +22,10 @@ New item counter modified to show total? * Fix for In-Room Stairs with Trap Doors * Key logic fix * Fix for door gen re-start - * More lenient keys in DR+Retro + * More lenient keys in DR+Retro + * Fix for shufflepots option +* 0.3.0.2-u + * Introduced in-room staircases/ladders * 0.3.0.1-u * Problem with lobbies on re-rolls corrected * Potential playthrough problem addressed From 2af9ffbda446b691131cdf144191a895b10cc85b Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 17 Feb 2021 15:23:46 -0700 Subject: [PATCH 18/21] Notes and version update Fix hera double count --- Main.py | 2 +- RELEASENOTES.md | 4 ++++ Rom.py | 2 +- data/base2current.bps | Bin 132008 -> 132014 bytes 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Main.py b/Main.py index 00de5e19..b9880969 100644 --- a/Main.py +++ b/Main.py @@ -25,7 +25,7 @@ from Fill import distribute_items_cutoff, distribute_items_staleness, distribute from ItemList import generate_itempool, difficulties, fill_prizes, fill_specific_items from Utils import output_path, parse_player_names -__version__ = '0.3.0.3-u' +__version__ = '0.3.0.4-u' class EnemizerError(RuntimeError): pass diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 00956f23..ee589f45 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -13,6 +13,10 @@ New item counter modified to show total # Bug Fixes +* 0.3.0.4-u + * QoL fixes from Mike + * Allow PoD Mimics 2 as a lobby in non-keysanity seeds (Thanks @Catobat) + * Fix for double-counting Hera key in keydropshuffle * 0.3.0.3-u * Disallowed Swamp Lobby in Hyrule Castle in Standard mode * Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage) diff --git a/Rom.py b/Rom.py index 20ffe6c2..421ee3a0 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '795290cfff38c1b0b0dca6498e5d107b' +RANDOMIZERBASEHASH = '0a34dc667a29125f09b10aeb1e06b83c' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 97f3e55e8343ea77cd3d23e9cd16da70df54b32a..fabbaa269805540d0624e7b29399fdd2e85c4c18 100644 GIT binary patch delta 818 zcmV-21I_%XhX}5R2(T{!1WyaF^pi6ISRM+yq)bnMkpT!60S6e8kz8(;r0Up>BC5iq zD2j>Ylc@oa0d|u*0`~zClQIK20fm!n1LFbolTZYj0lTy71QP-e&cdWbhk@anPy&G< zkBO0!4F{S5{*$N&x&bS*V+a%h0h5z>2_OMDlbH!*0SA-*35W-!!=&o!1jCb%3LulM z3OX2&yQC0;g$M|n11XJgfq^TqnIfcyq#}5;{|a^k0Zg-Y4*e=H+ z4b{D*fC?fMzNCNzB2%-uL`4(dVm2ar!IbukAek&Yakbs!qhtf7nA1l|uA>8jnJ+afE?FkAkZPg@Fy1XMT=>I+ucxXlo*2xSJY&j*%Zo+OH>@Wo?d& zx{JGuuBnO-C-i=gC-i>$Xr~~Pd(|5OeUq2fc@jQ3j-@8_ei&~zP=6^8lZKNMlOooK z2P|NafnJkeld#q%25caJQGhIy+}4y(XE6tW)m+W+1&d3osRx}<4}a+Pj}vz<&DZ=*Y-` z>bt)(lOWnBGI3~tg|9i6Z&{9kD3?%HfRhe#j)7Unf`Mqqf`MtXf|4m|k&_`;j*)#@ ztk?pR+M_&^dD?vsYhn9=XnS~u8d~u`Wr|$01>5l&0TYw=^(7e-yQKPPYss(h@yR6c w?fRbvR_=*tI%}5#lQs5L3O8Sp6bY|$8=FLfl=ioj_5lnH2=6VpA;FO-#|B4hRR910 delta 773 zcmV+g1N!`~hX|;L2(T{!1hEcI@sl$FSRMqsq)bnMkpT!60S6e8kz8(;r0Up>BBa8k zD2j>Slc@oa0dSK#0`~z6lQIK20e_Qh1LFbilTZYj0kyO11QP-e$ik#Vhk@IhPy&G< zkBN(u4F{S5_>-syx&bA#V+a%h0gaP*2_OM7lbH!*0RfZ#35W-u!=&o!1jCb%3LulM z3OX2yyQC0;g$M|n11XJgfq^TqnIfcyq#|;&{|a^k0Y=H+ z4bQ!#fC?fGzNCNzB2BZoL`4(q=G#G$#2jHB22S% zY%~QBf4ror0gdSbuaki=@C71_v$%0%5&>ge)?#q6qA9~8v${Xoz-~~GC7W=CiH$7Z#PhXDG!r|lLwP1)`tfmV32`c zlT(wn)+PpEAb?STCX?dUlsQ{52Y}UF&F}?_ORK2|olp-TslOuU^d2DTzn?ra?VmYl zz>&#?2&uomZY%JUGz`6_5irAn_@ii(uh$j)1Xpfcepd0|N)00t>l{(4) z0I)xo3zG`k8v!PhCfX-5WoUqfuQ``*S&o4ymrz!KlLB&%fmz3bfoR8qfoZdXk|}AC zlNDEvk$qaM*aDN Date: Thu, 18 Feb 2021 10:01:52 -0700 Subject: [PATCH 19/21] Silvers issue in swordless --- Rom.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Rom.py b/Rom.py index 421ee3a0..07d8c0b8 100644 --- a/Rom.py +++ b/Rom.py @@ -925,8 +925,6 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): if difficulty.progressive_bow_limit < 2 and world.swords == 'swordless': rom.write_bytes(0x180098, [2, overflow_replacement]) - rom.write_byte(0x180181, 0x01) # Make silver arrows work only on ganon - rom.write_byte(0x180182, 0x00) # Don't auto equip silvers on pickup # set up game internal RNG seed for i in range(1024): From 9d32a85b89af929173fd97533886edfd4ee7113f Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 18 Feb 2021 13:39:03 -0700 Subject: [PATCH 20/21] Progressive limits ignored for shop items (multiworld) Multi Client improvements to reporting --- Main.py | 2 +- MultiClient.py | 35 +++++++++++++++++++++++++++++++---- Rom.py | 5 ++++- asm/keydropshuffle.asm | 2 +- data/base2current.bps | Bin 132014 -> 132414 bytes 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Main.py b/Main.py index 61934050..92a4128e 100644 --- a/Main.py +++ b/Main.py @@ -26,7 +26,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names -__version__ = '0.3.1.1-u' +__version__ = '0.3.1.0-u' class EnemizerError(RuntimeError): diff --git a/MultiClient.py b/MultiClient.py index 66c66e82..bf64a2d7 100644 --- a/MultiClient.py +++ b/MultiClient.py @@ -53,6 +53,11 @@ class Context: self.rom = None self.auth = None self.total_locations = None + self.mode_flags = None + self.key_drop_mode = False + self.shop_mode = False + self.retro_mode = False + self.ignore_count = 0 def color_code(*args): codes = {'reset': 0, 'bold': 1, 'underline': 4, 'black': 30, 'red': 31, 'green': 32, 'yellow': 33, 'blue': 34, @@ -88,7 +93,8 @@ 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 +DYNAMIC_TOTAL_ADDR = SAVEDATA_START + 0x33E # 2 bytes +MODE_FLAGS = SAVEDATA_START + 0x33D # 1 byte SHOP_SRAM_LEN = 0x29 # 41 tracked items location_shop_order = [Regions.shop_to_location_table.keys()] + [Regions.retro_shops.keys()] @@ -776,7 +782,8 @@ async def console_loop(ctx : Context): get_location_name_from_address(item.location), index, len(ctx.items_received))) if command[0] == '/missing': - for location in [k for k, v in Regions.lookup_name_to_id.items() if type(v) is int]: + for location in [k for k, v in Regions.lookup_name_to_id.items() + if type(v) is int and not filter_location(ctx, k)]: if location not in ctx.locations_checked: logging.info('Missing: ' + location) if command[0] == '/getitem' and len(command) > 1: @@ -804,6 +811,16 @@ def get_location_name_from_address(address): return Regions.lookup_id_to_name.get(address, f'Unknown location (ID:{address})') +def filter_location(ctx, location): + if not ctx.key_drop_mode and ('Key Drop' in location or 'Pot Key' in location): + return True + if not ctx.shop_mode and location in Regions.flat_normal_shops: + return True + if not ctx.retro_mode and location in Regions.flat_retro_shops: + return True + return False + + async def track_locations(ctx : Context, roomid, roomdata): new_locations = [] @@ -813,10 +830,20 @@ async def track_locations(ctx : Context, roomid, roomdata): if ttl > 0: ctx.total_locations = ttl + if ctx.mode_flags is None: + flags = await snes_read(ctx, MODE_FLAGS, 1) + ctx.key_drop_mode = flags[0] & 0x1 + ctx.shop_mode = flags[0] & 0x2 + ctx.retro_mode = flags[0] & 0x4 + def new_check(location): ctx.locations_checked.add(location) - logging.info(f"New check: {location} ({len(ctx.locations_checked)}/{ctx.total_locations})") - new_locations.append(Regions.lookup_name_to_id[location]) + ignored = filter_location(ctx, location) + if ignored: + ctx.ignore_count += 1 + else: + logging.info(f"New check: {location} ({len(ctx.locations_checked)-ctx.ignore_count}/{ctx.total_locations})") + new_locations.append(Regions.lookup_name_to_id[location]) try: if roomid in location_shop_ids: diff --git a/Rom.py b/Rom.py index cefe7313..1430aec5 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '0a34dc667a29125f09b10aeb1e06b83c' +RANDOMIZERBASEHASH = '0de33d06fdb9c8cac765047037b39363' class JsonRom(object): @@ -774,6 +774,9 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): if world.keydropshuffle[player]: rom.write_byte(0x140000, 1) + multiClientFlags = ((0x1 if world.keydropshuffle[player] else 0) | (0x2 if world.shopsanity[player] else 0) + | (0x4 if world.retro[player] else 0)) + rom.write_byte(0x140001, multiClientFlags) write_int16(rom, 0x187010, credits_total) # dynamic credits if credits_total != 216: diff --git a/asm/keydropshuffle.asm b/asm/keydropshuffle.asm index a150774f..70e80047 100644 --- a/asm/keydropshuffle.asm +++ b/asm/keydropshuffle.asm @@ -26,7 +26,7 @@ Sprite_LoadProperties: org $288000 ;140000 ShuffleKeyDrops: db 0 -ShuffleKeyDropsReserved: +MultiClientFlags: ; 140001 -> stored in SRAM at 7ef33d db 0 LootTable: ;PC: 140002 diff --git a/data/base2current.bps b/data/base2current.bps index fabbaa269805540d0624e7b29399fdd2e85c4c18..f30bfa99fe9d109ea2432a33917619687f187ddb 100644 GIT binary patch delta 15322 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 Date: Thu, 18 Feb 2021 16:09:46 -0700 Subject: [PATCH 21/21] Documentation clean up and including the non-progressive shields. --- ItemList.py | 5 ++++- RELEASENOTES.md | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ItemList.py b/ItemList.py index 147527b90..07d6730d 100644 --- a/ItemList.py +++ b/ItemList.py @@ -632,7 +632,10 @@ 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)', 'Green Potion': 'Rupees (50)'} + 'Green Potion': 'Rupees (50)', + # money seems a bit too generous with these on + # '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/RELEASENOTES.md b/RELEASENOTES.md index 9cfcd9b6..dd5ec356 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -2,7 +2,7 @@ ## Shopsanity ---shopsanity added. This adds 32 shop locations (9 more in retro) to the general and location pool. +--shopsanity added. This adds 32 shop locations (9 more in retro) to the general location pool. Multi-world supported. Thanks go to Pepper and CaitSith2 for figuring out several items related to this major feature. @@ -35,12 +35,12 @@ Item Pool changes: To accommodate the new locations, new items are added to the 1. Initially, 1 of each type of potion refill is shuffled to the shops. (the Capacity Fairy is excluded from this, see step 4). This ensures that potions can be bought somewhere. 2. The rest of the shop pool is shuffled with the rest of the item pool. -3. At this time, only Ten Bombs, Ten Arrows, Capacity upgrades, and Small Hearts can appear outside of shops. Any other shop items are replaced with rupees of various amounts. This is because of two reasons: First, potion refills and the Bee are indistinguishable from Bottles with that item in them. Receiving those items without a bottle or empty bottle is essentially a nothing item but looks like a bottle. Second, the non-progressive Shields interact fine with Progressive Shields but are usually also a nothing item most of the time. +3. At this time, only Ten Bombs, Ten Arrows, Capacity upgrades, Small Hearts, and the non-progressive shields can appear outside of shops. Any other shop items are replaced with rupees of various amounts. This is because of one reason: potion refills and the Bee are indistinguishable from Bottles with that item in them. Receiving those items without a bottle or empty bottle is essentially a nothing item but looks like a bottle. Note, the non-progressive Shields interact fine with Progressive Shields (you never get downgraded) but are usually also a nothing item most of the time. 4. The Capacity Fairy cannot sell Potion Refills because the graphics are incompatible. 300 Rupees will replace any potion refill that ends up there. -5. For capacity upgrades, if any shop sells capacity upgrades, then it will sell all seven of that type. Otherwise, if plain bombs or arrows are sold somewhere, then the other six capacity upgrades will be purchasable first at those locations and then replaced by the underlying ammo. If no suitable spot is found, then no more capacity upgrades will not be available for that seed. (There is always one somewhere in the pool.) -6. Any shop item that is originally sold by shops can be bought indefinitely but only the first purchase counts toward total checks on the credits screen & item counter. All other items can be bought only once. +5. For capacity upgrades, if any shop sells capacity upgrades, then it will sell all seven of that type. Otherwise, if plain bombs or arrows are sold somewhere, then the other six capacity upgrades will be purchasable first at those locations and then replaced by the underlying ammo. If no suitable spot is found, then no more capacity upgrades will be available for that seed. (There is always one somewhere in the pool.) +6. Any shop item that is originally sold by shops can be bought indefinitely, but only the first purchase counts toward total checks on the credits screen & item counter. All other items can be bought only once. -All items in the item pool may appear in shops. +All items in the general item pool may appear in shops. This includes normal progression items and dungeon items in the appropriate keysanity settings. #### Pricing Guide @@ -115,21 +115,23 @@ The attic/maiden sequence is now active and required when Blind is the boss of T File names have changed with a settings code instead of listing major settings chosen. Mystery games omit this for obvious reasons. Also found in the spoiler. -Added to CLI only now. +Added to CLI only now. With more testing, this will be added to the GUI to be able to save use settings codes for generation. ## Mystery fixes The Mystery.py file has been updated for those who like to use that for generating games. Supports keydropshuffle, -shopsanity, and other settings that have been included. +shopsanity, and other settings that have been added. ## Experimental Item Counter New item counter modified to show total -# Bug Fixes +# Bug Fixes and Notes. * 0.3.1.0-u * Shopsanity introduced + * Blind sequence restored when Blind is in Theives Town in boss shuffle + * Settings code added to file name * Minor fix to Standard generation * 0.3.0.4-u * QoL fixes from Mike