From 0ee88618a72cf720862d8db0f77b563db0438366 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 1 Aug 2023 11:31:59 -0600 Subject: [PATCH 01/11] Paired dungeon shuffle --- BaseClasses.py | 3 +- DoorShuffle.py | 57 +++++++++++++--------------------- resources/app/cli/args.json | 1 + resources/app/cli/lang/en.json | 1 + resources/app/gui/lang/en.json | 1 + 5 files changed, 26 insertions(+), 37 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index c9d4be13..3663a962 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -80,6 +80,7 @@ class World(object): self.rooms = [] self._room_cache = {} self.dungeon_layouts = {} + self.dungeon_pool = {} self.inaccessible_regions = {} self.enabled_entrances = {} self.key_logic = {} @@ -2922,7 +2923,7 @@ class Pot(object): # byte 0: DDDE EEEE (DR, ER) -dr_mode = {"basic": 1, "crossed": 2, "vanilla": 0, "partitioned": 3} +dr_mode = {"basic": 1, "crossed": 2, "vanilla": 0, "partitioned": 3, 'paired': 4} er_mode = {"vanilla": 0, "simple": 1, "restricted": 2, "full": 3, "crossed": 4, "insanity": 5, 'lite': 8, 'lean': 9, "dungeonsfull": 7, "dungeonssimple": 6} diff --git a/DoorShuffle.py b/DoorShuffle.py index 462eb406..abf1def8 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -88,7 +88,9 @@ def link_doors_prep(world, player): find_inaccessible_regions(world, player) - if world.intensity[player] >= 3 and world.doorShuffle[player] != 'vanilla': + if world.doorShuffle[player] != 'vanilla': + create_dungeon_pool(world, player) + if world.intensity[player] >= 3 and world.doorShuffle[player] != 'vanilla': choose_portals(world, player) else: if world.shuffle[player] == 'vanilla': @@ -132,6 +134,20 @@ def create_dungeon_pool(world, player): pool = None if world.doorShuffle[player] == 'basic': pool = [([name], regions) for name, regions in dungeon_regions.items()] + elif world.doorShuffle[player] == 'paired': + dungeon_pool = list(dungeon_regions.keys()) + groups = [] + while dungeon_pool: + if len(dungeon_pool) == 3: + groups.append(list(dungeon_pool)) + dungeon_pool.clear() + else: + choice_a = random.choice(dungeon_pool) + dungeon_pool.remove(choice_a) + choice_b = random.choice(dungeon_pool) + dungeon_pool.remove(choice_b) + groups.append([choice_a, choice_b]) + pool = [(group, list(chain.from_iterable([dungeon_regions[d] for d in group]))) for group in groups] elif world.doorShuffle[player] == 'partitioned': groups = [['Hyrule Castle', 'Eastern Palace', 'Desert Palace', 'Tower of Hera', 'Agahnims Tower'], ['Palace of Darkness', 'Swamp Palace', 'Skull Woods', 'Thieves Town'], @@ -142,38 +158,17 @@ def create_dungeon_pool(world, player): elif world.doorShuffle[player] != 'vanilla': logging.getLogger('').error('Invalid door shuffle setting: %s' % world.doorShuffle[player]) raise Exception('Invalid door shuffle setting: %s' % world.doorShuffle[player]) - return pool + world.dungeon_pool[player] = pool def link_doors_main(world, player): - pool = create_dungeon_pool(world, player) + pool = world.dungeon_pool[player] if pool: main_dungeon_pool(pool, world, player) if world.doorShuffle[player] != 'vanilla': create_door_spoiler(world, player) -# todo: I think this function is not necessary -def mark_regions(world, player): - # traverse dungeons and make sure dungeon property is assigned - player_dungeons = [dungeon for dungeon in world.dungeons if dungeon.player == player] - for dungeon in player_dungeons: - queue = deque(dungeon.regions) - while len(queue) > 0: - region = world.get_region(queue.popleft(), player) - if region.name not in dungeon.regions: - dungeon.regions.append(region.name) - region.dungeon = dungeon - for ext in region.exits: - d = world.check_for_door(ext.name, player) - connected = ext.connected_region - if d is not None and connected is not None: - if d.dest is not None and connected.name not in dungeon.regions and connected.type == RegionType.Dungeon and connected.name not in queue: - queue.append(connected) # needs to be added - elif connected is not None and connected.name not in dungeon.regions and connected.type == RegionType.Dungeon and connected.name not in queue: - queue.append(connected) # needs to be added - - def create_door_spoiler(world, player): logger = logging.getLogger('') shuffled_door_types = [DoorType.Normal, DoorType.SpiralStairs] @@ -437,17 +432,7 @@ def pair_existing_key_doors(world, player, door_a, door_b): def choose_portals(world, player): if world.doorShuffle[player] != ['vanilla']: shuffle_flag = world.doorShuffle[player] != 'basic' - allowed = {} - if world.doorShuffle[player] == 'basic': - allowed = {name: {name} for name in dungeon_regions} - elif world.doorShuffle[player] == 'partitioned': - groups = [['Hyrule Castle', 'Eastern Palace', 'Desert Palace', 'Tower of Hera', 'Agahnims Tower'], - ['Palace of Darkness', 'Swamp Palace', 'Skull Woods', 'Thieves Town'], - ['Ice Palace', 'Misery Mire', 'Turtle Rock', 'Ganons Tower']] - allowed = {name: set(group) for group in groups for name in group} - elif world.doorShuffle[player] == 'crossed': - all_dungeons = set(dungeon_regions.keys()) - allowed = {name: all_dungeons for name in dungeon_regions} + allowed = {name: set(group[0]) for group in world.dungeon_pool[player] for name in group[0]} # key drops allow the big key in the right place in Desert Tiles 2 bk_shuffle = world.bigkeyshuffle[player] or world.pottery[player] not in ['none', 'cave'] @@ -592,7 +577,7 @@ def customizer_portals(master_door_list, world, player): assigned_doors.add(door) # restricts connected doors to the customized portals if assigned_doors: - pool = create_dungeon_pool(world, player) + pool = world.dungeon_pool[player] if pool: pool_map = {} for pool, region_list in pool: diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 2eaf847e..9aff422a 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -175,6 +175,7 @@ "door_shuffle": { "choices": [ "basic", + "paired", "partitioned", "crossed", "vanilla" diff --git a/resources/app/cli/lang/en.json b/resources/app/cli/lang/en.json index 4d5fb151..49bd891a 100644 --- a/resources/app/cli/lang/en.json +++ b/resources/app/cli/lang/en.json @@ -220,6 +220,7 @@ "door_shuffle": [ "Select Door Shuffling Algorithm. (default: %(default)s)", "Basic: Doors are mixed within a single dungeon.", + "Paired Dungeon are paired (with one trio) and only mixed in those groups", "Partitioned Doors are mixed in 3 partitions: L1-3+HC+AT, D1-4, D5-8", "Crossed: Doors are mixed between all dungeons.", "Vanilla: All doors are connected the same way they were in the", diff --git a/resources/app/gui/lang/en.json b/resources/app/gui/lang/en.json index 9d56137c..fb81c391 100644 --- a/resources/app/gui/lang/en.json +++ b/resources/app/gui/lang/en.json @@ -62,6 +62,7 @@ "randomizer.dungeon.dungeondoorshuffle": "Dungeon Door Shuffle", "randomizer.dungeon.dungeondoorshuffle.vanilla": "Vanilla", "randomizer.dungeon.dungeondoorshuffle.basic": "Basic", + "randomizer.dungeon.dungeondoorshuffle.paired": "Paired", "randomizer.dungeon.dungeondoorshuffle.partitioned": "Partitioned", "randomizer.dungeon.dungeondoorshuffle.crossed": "Crossed", From 1817cf38242e6ba14a05bab682b5461fa3970edb Mon Sep 17 00:00:00 2001 From: Catobat <69204835+Catobat@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:00:58 +0200 Subject: [PATCH 02/11] Fix byte 12 in settings code --- BaseClasses.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index c9d4be13..122d6de4 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -3028,8 +3028,8 @@ class Settings(object): (flute_mode[w.flute_mode[p]] << 7 | bow_mode[w.bow_mode[p]] << 4 | take_any_mode[w.take_any[p]] << 2 | keyshuffle_mode[w.keyshuffle[p]]), - ((0x80 if w.pseudoboots[p] else 0) | overworld_map_mode[w.overworld_map[p]] << 6 - | trap_door_mode[w.trap_door_mode[p]] << 4 | key_logic_algo[w.key_logic_algorithm[p]]), + ((0x80 if w.pseudoboots[p] else 0) | overworld_map_mode[w.overworld_map[p]] << 5 + | trap_door_mode[w.trap_door_mode[p]] << 3 | key_logic_algo[w.key_logic_algorithm[p]]), ]) return base64.b64encode(code, "+-".encode()).decode() @@ -3099,8 +3099,8 @@ class Settings(object): args.keyshuffle[p] = r(keyshuffle_mode)[settings[11] & 0x3] if len(settings) > 12: args.pseudoboots[p] = True if settings[12] & 0x80 else False - args.overworld_map[p] = r(overworld_map_mode)[(settings[12] & 0x60) >> 6] - args.trap_door_mode[p] = r(trap_door_mode)[(settings[12] & 0x14) >> 4] + args.overworld_map[p] = r(overworld_map_mode)[(settings[12] & 0x60) >> 5] + args.trap_door_mode[p] = r(trap_door_mode)[(settings[12] & 0x18) >> 3] args.key_logic_algorithm[p] = r(key_logic_algo)[settings[12] & 0x07] From 7197a23b4520a67c9005d60b2859de060c585c51 Mon Sep 17 00:00:00 2001 From: Catobat <69204835+Catobat@users.noreply.github.com> Date: Wed, 2 Aug 2023 02:23:19 +0200 Subject: [PATCH 03/11] Add setting for self-looping doors --- BaseClasses.py | 15 ++++++++++----- CLI.py | 3 ++- Main.py | 2 ++ README.md | 8 +++++++- mystery_example.yml | 3 +++ mystery_testsuite.yml | 3 +++ resources/app/cli/args.json | 4 ++++ resources/app/cli/lang/en.json | 1 + resources/app/gui/lang/en.json | 1 + resources/app/gui/randomize/dungeon/widgets.json | 6 ++++++ source/classes/CustomSettings.py | 2 ++ source/classes/constants.py | 1 + source/dungeon/DungeonStitcher.py | 14 +++++++++++--- source/tools/MysteryUtils.py | 1 + 14 files changed, 54 insertions(+), 10 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 122d6de4..89b39a43 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -145,6 +145,7 @@ class World(object): set_player_attr('colorizepots', True) set_player_attr('pot_pool', {}) set_player_attr('decoupledoors', False) + set_player_attr('door_self_loops', False) set_player_attr('door_type_mode', 'original') set_player_attr('trap_door_mode', 'optional') set_player_attr('key_logic_algorithm', 'default') @@ -2472,6 +2473,7 @@ class Spoiler(object): 'trap_door_mode': self.world.trap_door_mode, 'key_logic': self.world.key_logic_algorithm, 'decoupledoors': self.world.decoupledoors, + 'door_self_loops': self.world.door_self_loops, 'dungeon_counters': self.world.dungeon_counters, 'item_pool': self.world.difficulty, 'item_functionality': self.world.difficulty_adjustments, @@ -2682,6 +2684,7 @@ class Spoiler(object): outfile.write(f"Trap Door Mode: {self.metadata['trap_door_mode'][player]}\n") outfile.write(f"Key Logic Algorithm: {self.metadata['key_logic'][player]}\n") outfile.write(f"Decouple Doors: {yn(self.metadata['decoupledoors'][player])}\n") + outfile.write(f"Spiral Stairs can self-loop: {yn(self.metadata['door_self_loops'][player])}\n") outfile.write(f"Experimental: {yn(self.metadata['experimental'][player])}\n") outfile.write(f"Dungeon Counters: {self.metadata['dungeon_counters'][player]}\n") outfile.write(f"Drop Shuffle: {yn(self.metadata['dropshuffle'][player])}\n") @@ -2947,10 +2950,10 @@ mixed_travel_mode = {"prevent": 0, "allow": 1, "force": 2} pottery_mode = {'none': 0, 'keys': 2, 'lottery': 3, 'dungeon': 4, 'cave': 5, 'cavekeys': 6, 'reduced': 7, 'clustered': 8, 'nonempty': 9} -# byte 5: CCCC CTTX (crystals gt, ctr2, experimental) +# byte 5: SCCC CTTX (self-loop doors, crystals gt, ctr2, experimental) counter_mode = {"default": 0, "off": 1, "on": 2, "pickup": 3} -# byte 6: CCCC CPAA (crystals ganon, pyramid, access +# byte 6: ?CCC CPAA (crystals ganon, pyramid, access access_mode = {"items": 0, "locations": 1, "none": 2} # byte 7: B?MC DDEE (big, ?, maps, compass, door_type, enemies) @@ -3008,7 +3011,8 @@ class Settings(object): (0x80 if w.shuffletavern[p] else 0) | (0x10 if w.dropshuffle[p] else 0) | (pottery_mode[w.pottery[p]]), - ((8 if w.crystals_gt_orig[p] == "random" else int(w.crystals_gt_orig[p])) << 3) + (0x80 if w.door_self_loops[p] else 0) + | ((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) @@ -3067,12 +3071,13 @@ class Settings(object): args.dropshuffle[p] = True if settings[4] & 0x10 else False args.pottery[p] = r(pottery_mode)[settings[4] & 0x0F] + args.door_self_loops[p] = True if settings[5] & 0x80 else False args.dungeon_counters[p] = r(counter_mode)[(settings[5] & 0x6) >> 1] - cgt = (settings[5] & 0xf8) >> 3 + cgt = (settings[5] & 0x78) >> 3 args.crystals_gt[p] = "random" if cgt == 8 else cgt args.experimental[p] = True if settings[5] & 0x1 else False - cgan = (settings[6] & 0xf8) >> 3 + cgan = (settings[6] & 0x78) >> 3 args.crystals_ganon[p] = "random" if cgan == 8 else cgan args.openpyramid[p] = True if settings[6] & 0x4 else False diff --git a/CLI.py b/CLI.py index 2c925c6c..ec7ce8c9 100644 --- a/CLI.py +++ b/CLI.py @@ -141,7 +141,7 @@ def parse_cli(argv, no_defaults=False): 'heartbeep', 'remote_items', 'shopsanity', 'dropshuffle', 'pottery', 'keydropshuffle', 'mixed_travel', 'standardize_palettes', 'code', 'reduce_flashing', 'shuffle_sfx', 'msu_resume', 'collection_rate', 'colorizepots', 'decoupledoors', 'door_type_mode', - 'trap_door_mode', 'key_logic_algorithm']: + 'trap_door_mode', 'key_logic_algorithm', 'door_self_loops']: value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name) if player == 1: setattr(ret, name, {1: value}) @@ -218,6 +218,7 @@ def parse_settings(): 'trap_door_mode': 'optional', 'key_logic_algorithm': 'default', 'decoupledoors': False, + 'door_self_loops': False, 'experimental': False, 'dungeon_counters': 'default', 'mixed_travel': 'prevent', diff --git a/Main.py b/Main.py index dd5ebc3e..d1dca6af 100644 --- a/Main.py +++ b/Main.py @@ -115,6 +115,7 @@ def main(args, seed=None, fish=None): world.trap_door_mode = args.trap_door_mode.copy() world.key_logic_algorithm = args.key_logic_algorithm.copy() world.decoupledoors = args.decoupledoors.copy() + world.door_self_loops = args.door_self_loops.copy() world.experimental = args.experimental.copy() world.dungeon_counters = args.dungeon_counters.copy() world.fish = fish @@ -487,6 +488,7 @@ def copy_world(world): ret.beemizer = world.beemizer.copy() ret.intensity = world.intensity.copy() ret.decoupledoors = world.decoupledoors.copy() + ret.door_self_loops = world.door_self_loops.copy() ret.experimental = world.experimental.copy() ret.shopsanity = world.shopsanity.copy() ret.dropshuffle = world.dropshuffle.copy() diff --git a/README.md b/README.md index df21ad17..24e79807 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,13 @@ CLI: `--key_logic [default|partial|strict]` This is similar to insanity mode in ER where door entrances and exits are not paired anymore. Tends to remove more logic from dungeons as many rooms will not be required to traverse to explore. Hope you like transitions. -CLI `--decoupledoors` +CLI: `--decoupledoors` + +### Self-Looping Spiral Stairs + +If enabled, spiral stairs are allowed to lead to themselves. + +CLI: `--door_self_loops` ### Pottery diff --git a/mystery_example.yml b/mystery_example.yml index 92abd726..bd8cbbe2 100644 --- a/mystery_example.yml +++ b/mystery_example.yml @@ -31,6 +31,9 @@ partial: 0 strict: 0 decoupledoors: off + door_self_loops: + on: 1 + off: 1 dropshuffle: on: 1 off: 1 diff --git a/mystery_testsuite.yml b/mystery_testsuite.yml index d6e46832..c7250d2b 100644 --- a/mystery_testsuite.yml +++ b/mystery_testsuite.yml @@ -31,6 +31,9 @@ key_logic_algorithm: decoupledoors: off: 9 # more strict on: 1 +door_self_loops: + on: 1 + off: 1 dropshuffle: on: 1 off: 1 diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 2eaf847e..626a3b72 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -212,6 +212,10 @@ "action": "store_true", "type": "bool" }, + "door_self_loops": { + "action": "store_true", + "type": "bool" + }, "experimental": { "action": "store_true", "type": "bool" diff --git a/resources/app/cli/lang/en.json b/resources/app/cli/lang/en.json index 4d5fb151..031a1061 100644 --- a/resources/app/cli/lang/en.json +++ b/resources/app/cli/lang/en.json @@ -253,6 +253,7 @@ "strict: Ensure small keys are available" ], "decoupledoors" : [ "Door entrances and exits are decoupled" ], + "door_self_loops" : [ "Spiral stairs are allowed to self-loop" ], "experimental": [ "Enable experimental features. (default: %(default)s)" ], "dungeon_counters": [ "Enable dungeon chest counters. (default: %(default)s)" ], "crystals_ganon": [ diff --git a/resources/app/gui/lang/en.json b/resources/app/gui/lang/en.json index 9d56137c..87bf4e03 100644 --- a/resources/app/gui/lang/en.json +++ b/resources/app/gui/lang/en.json @@ -58,6 +58,7 @@ "randomizer.dungeon.smallkeyshuffle.universal": "Universal", "randomizer.dungeon.bigkeyshuffle": "Big Keys", "randomizer.dungeon.decoupledoors": "Decouple Doors", + "randomizer.dungeon.door_self_loops": "Allow Self-Looping Spiral Stairs", "randomizer.dungeon.dungeondoorshuffle": "Dungeon Door Shuffle", "randomizer.dungeon.dungeondoorshuffle.vanilla": "Vanilla", diff --git a/resources/app/gui/randomize/dungeon/widgets.json b/resources/app/gui/randomize/dungeon/widgets.json index bcf7232a..4be6a385 100644 --- a/resources/app/gui/randomize/dungeon/widgets.json +++ b/resources/app/gui/randomize/dungeon/widgets.json @@ -66,6 +66,12 @@ } }, "decoupledoors": { + "type": "checkbox", + "config": { + "padx": [20,0] + } + }, + "door_self_loops": { "type": "checkbox", "config": { "padx": [20,0], diff --git a/source/classes/CustomSettings.py b/source/classes/CustomSettings.py index a0cea069..2ddc1747 100644 --- a/source/classes/CustomSettings.py +++ b/source/classes/CustomSettings.py @@ -113,6 +113,7 @@ class CustomSettings(object): args.trap_door_mode[p] = get_setting(settings['trap_door_mode'], args.trap_door_mode[p]) args.key_logic_algorithm[p] = get_setting(settings['key_logic_algorithm'], args.key_logic_algorithm[p]) args.decoupledoors[p] = get_setting(settings['decoupledoors'], args.decoupledoors[p]) + args.door_self_loops[p] = get_setting(settings['door_self_loops'], args.door_self_loops[p]) args.dungeon_counters[p] = get_setting(settings['dungeon_counters'], args.dungeon_counters[p]) args.crystals_gt[p] = get_setting(settings['crystals_gt'], args.crystals_gt[p]) args.crystals_ganon[p] = get_setting(settings['crystals_ganon'], args.crystals_ganon[p]) @@ -232,6 +233,7 @@ class CustomSettings(object): settings_dict[p]['trap_door_mode'] = world.trap_door_mode[p] settings_dict[p]['key_logic_algorithm'] = world.key_logic_algorithm[p] settings_dict[p]['decoupledoors'] = world.decoupledoors[p] + settings_dict[p]['door_self_loops'] = world.door_self_loops[p] settings_dict[p]['logic'] = world.logic[p] settings_dict[p]['mode'] = world.mode[p] settings_dict[p]['swords'] = world.swords[p] diff --git a/source/classes/constants.py b/source/classes/constants.py index 812042b8..1ca3c08e 100644 --- a/source/classes/constants.py +++ b/source/classes/constants.py @@ -106,6 +106,7 @@ SETTINGSTOPROCESS = { "door_type_mode": "door_type_mode", "trap_door_mode": "trap_door_mode", "decoupledoors": "decoupledoors", + "door_self_loops": "door_self_loops", "experimental": "experimental", "dungeon_counters": "dungeon_counters", "mixed_travel": "mixed_travel", diff --git a/source/dungeon/DungeonStitcher.py b/source/dungeon/DungeonStitcher.py index 1eac3fb1..ec61b829 100644 --- a/source/dungeon/DungeonStitcher.py +++ b/source/dungeon/DungeonStitcher.py @@ -22,7 +22,7 @@ def generate_dungeon(builder, entrance_region_names, split_dungeon, world, playe queue = collections.deque(proposed_map.items()) while len(queue) > 0: a, b = queue.popleft() - if world.decoupledoors[player]: + if a == b or world.decoupledoors[player]: connect_doors_one_way(a, b) else: connect_doors(a, b) @@ -128,14 +128,14 @@ def create_random_proposal(doors_to_connect, world, player): next_hook = random.choice(hooks_left) primary_door = random.choice(primary_bucket[next_hook]) opp_hook, secondary_door = type_map[next_hook], None - while (secondary_door is None or secondary_door == primary_door + while (secondary_door is None or (secondary_door == primary_door and not world.door_self_loops[player]) or decouple_check(primary_bucket[next_hook], secondary_bucket[opp_hook], primary_door, secondary_door, world, player)): secondary_door = random.choice(secondary_bucket[opp_hook]) proposal[primary_door] = secondary_door primary_bucket[next_hook].remove(primary_door) secondary_bucket[opp_hook].remove(secondary_door) - if not world.decoupledoors[player]: + if primary_door != secondary_door and not world.decoupledoors[player]: proposal[secondary_door] = primary_door primary_bucket[opp_hook].remove(secondary_door) secondary_bucket[next_hook].remove(primary_door) @@ -205,6 +205,14 @@ def modify_proposal(proposed_map, explored_state, doors_to_connect, hash_code_se old_attempt = proposed_map[new_door] else: old_attempt = next(x for x in proposed_map if proposed_map[x] == new_door) + # ensure nothing gets messed up when something loops with itself + if attempt == old_target and old_attempt == new_door: + old_attempt = new_door + old_target = attempt + elif attempt == old_target: + old_target = old_attempt + elif old_attempt == new_door: + old_attempt = old_target proposed_map[old_attempt] = old_target if not world.decoupledoors[player]: proposed_map[old_target] = old_attempt diff --git a/source/tools/MysteryUtils.py b/source/tools/MysteryUtils.py index 0405efff..5000f670 100644 --- a/source/tools/MysteryUtils.py +++ b/source/tools/MysteryUtils.py @@ -87,6 +87,7 @@ def roll_settings(weights): ret.trap_door_mode = get_choice('trap_door_mode') ret.key_logic_algorithm = get_choice('key_logic_algorithm') ret.decoupledoors = get_choice('decoupledoors') == 'on' + ret.door_self_loops = get_choice('door_self_loops') == 'on' ret.experimental = get_choice('experimental') == 'on' ret.collection_rate = get_choice('collection_rate') == 'on' From 9497ef36ad17867ab6a3d435719c49ef26e1698b Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 2 Aug 2023 08:05:54 -0600 Subject: [PATCH 04/11] Paired needs a bunch of generation work apparently. Disabling it. Minor generation improvements. --- DungeonGenerator.py | 32 ++++++++++++++++++++++---------- resources/app/cli/args.json | 1 - 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/DungeonGenerator.py b/DungeonGenerator.py index f97f8ecf..d96b654a 100644 --- a/DungeonGenerator.py +++ b/DungeonGenerator.py @@ -1677,10 +1677,24 @@ def assign_location_sectors_minimal(dungeon_map, free_location_sectors, global_p random.shuffle(sector_list) orig_location_set = build_orig_location_set(dungeon_map) num_dungeon_items = requested_dungeon_items(world, player) + locations_to_distribute = sum(sector.chest_locations for sector in free_location_sectors.keys()) + reserved_per_dungeon = {d_name: count_reserved_locations(world, player, orig_location_set[d_name]) + for d_name in dungeon_map.keys()} + base_free, found_enough = 2, False + while not found_enough: + needed = sum(max(0, max(base_free, reserved_per_dungeon[d]) + num_dungeon_items - len(orig_location_set[d])) + for d in dungeon_map.keys()) + if needed > locations_to_distribute: + if base_free == 0: + raise Exception('Unable to meet minimum requirements, check for customizer problems') + base_free -= 1 + else: + found_enough = True d_idx = {builder.name: i for i, builder in enumerate(dungeon_map.values())} next_sector = sector_list.pop() while not valid: - choice, totals, location_set = weighted_random_location(dungeon_map, choices, orig_location_set, world, player) + choice, totals, location_set = weighted_random_location(dungeon_map, choices, orig_location_set, + base_free, world, player) if not choice: break choices[choice].append(next_sector) @@ -1691,7 +1705,7 @@ def assign_location_sectors_minimal(dungeon_map, free_location_sectors, global_p valid = True for d_name, idx in d_idx.items(): free_items = count_reserved_locations(world, player, location_set[d_name]) - target = max(free_items, 2) + num_dungeon_items + target = max(free_items, base_free) + num_dungeon_items if totals[idx] < target: valid = False break @@ -1699,8 +1713,7 @@ def assign_location_sectors_minimal(dungeon_map, free_location_sectors, global_p if len(sector_list) == 0: choices = defaultdict(list) sector_list = list(free_location_sectors) - else: - next_sector = sector_list.pop() + next_sector = sector_list.pop() else: choices[choice].remove(next_sector) for builder, choice_list in choices.items(): @@ -1709,7 +1722,7 @@ def assign_location_sectors_minimal(dungeon_map, free_location_sectors, global_p return free_location_sectors -def weighted_random_location(dungeon_map, choices, orig_location_set, world, player): +def weighted_random_location(dungeon_map, choices, orig_location_set, base_free, world, player): population = [] totals = [] location_set = {x: set(y) for x, y in orig_location_set.items()} @@ -1720,7 +1733,7 @@ def weighted_random_location(dungeon_map, choices, orig_location_set, world, pla builder_set = location_set[dungeon_builder.name] builder_set.update(set().union(*(s.chest_location_set for s in choices[dungeon_builder]))) free_items = count_reserved_locations(world, player, builder_set) - target = max(free_items, 2) + num_dungeon_items + target = max(free_items, base_free) + num_dungeon_items if ttl < target: population.append(dungeon_builder) choice = random.choice(population) if len(population) > 0 else None @@ -1775,7 +1788,7 @@ def count_reserved_locations(world, player, proposed_set): return 2 -def assign_crystal_switch_sectors(dungeon_map, crystal_switches, crystal_barriers, global_pole, assign_one=False): +def assign_crystal_switch_sectors(dungeon_map, crystal_switches, crystal_barriers, global_pole): population = [] some_c_switches_present = False for name, builder in dungeon_map.items(): @@ -1784,7 +1797,7 @@ def assign_crystal_switch_sectors(dungeon_map, crystal_switches, crystal_barrier if builder.c_switch_present and not builder.c_locked: some_c_switches_present = True if len(population) == 0: # nothing needs a switch - if assign_one and not some_c_switches_present: # something should have one + if len(crystal_barriers) > 0 and not some_c_switches_present: # something should have one if len(crystal_switches) == 0: raise GenerationException('No crystal switches to assign. Ref %s' % next(iter(dungeon_map.keys()))) valid, builder_choice, switch_choice = False, None, None @@ -3139,8 +3152,7 @@ def balance_split(candidate_sectors, dungeon_map, global_pole, builder_info): check_for_forced_assignments(dungeon_map, candidate_sectors, global_pole) check_for_forced_crystal(dungeon_map, candidate_sectors, global_pole) crystal_switches, crystal_barriers, neutral_sectors, polarized_sectors = categorize_sectors(candidate_sectors) - leftover = assign_crystal_switch_sectors(dungeon_map, crystal_switches, crystal_barriers, - global_pole, len(crystal_barriers) > 0) + leftover = assign_crystal_switch_sectors(dungeon_map, crystal_switches, crystal_barriers, global_pole) ensure_crystal_switches_reachable(dungeon_map, leftover, polarized_sectors, crystal_barriers, global_pole) for sector in leftover: if sector.polarity().is_neutral(): diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 9aff422a..2eaf847e 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -175,7 +175,6 @@ "door_shuffle": { "choices": [ "basic", - "paired", "partitioned", "crossed", "vanilla" From f2b8c840a25a5c433534d9fdde1345e7f1f6babb Mon Sep 17 00:00:00 2001 From: Catobat <69204835+Catobat@users.noreply.github.com> Date: Wed, 2 Aug 2023 17:02:15 +0200 Subject: [PATCH 05/11] Fix potential bug with re-linking decoupled doors --- source/dungeon/DungeonStitcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dungeon/DungeonStitcher.py b/source/dungeon/DungeonStitcher.py index ec61b829..504fc03b 100644 --- a/source/dungeon/DungeonStitcher.py +++ b/source/dungeon/DungeonStitcher.py @@ -200,7 +200,6 @@ def modify_proposal(proposed_map, explored_state, doors_to_connect, hash_code_se unvisted_bucket[opp_hook].sort(key=lambda d: d.name) new_door = random.choice(unvisted_bucket[opp_hook]) old_target = proposed_map[attempt] - proposed_map[attempt] = new_door if not world.decoupledoors[player]: old_attempt = proposed_map[new_door] else: @@ -213,6 +212,7 @@ def modify_proposal(proposed_map, explored_state, doors_to_connect, hash_code_se old_target = old_attempt elif old_attempt == new_door: old_attempt = old_target + proposed_map[attempt] = new_door proposed_map[old_attempt] = old_target if not world.decoupledoors[player]: proposed_map[old_target] = old_attempt From c0c3204fd50953f6f580b998d5fdbb026af5d205 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 29 Jul 2023 05:10:47 -0500 Subject: [PATCH 06/11] Notes field --- BaseClasses.py | 6 +++++- CLI.py | 3 ++- Main.py | 2 +- docs/customizer_example.yaml | 1 + resources/app/cli/args.json | 1 + source/classes/CustomSettings.py | 6 ++++-- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 3663a962..3d97414b 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -2501,7 +2501,9 @@ class Spoiler(object): 'triforcegoal': self.world.treasure_hunt_count, 'triforcepool': self.world.treasure_hunt_total, 'race': self.world.settings.world_rep['meta']['race'], - 'code': {p: Settings.make_code(self.world, p) for p in range(1, self.world.players + 1)} + 'user_notes': self.world.settings.world_rep['meta']['user_notes'], + 'code': {p: Settings.make_code(self.world, p) for p in range(1, self.world.players + 1)}, + 'seed': self.world.seed } for p in range(1, self.world.players + 1): @@ -2642,6 +2644,8 @@ class Spoiler(object): self.parse_meta() with open(filename, 'w') as outfile: outfile.write('ALttP Dungeon Randomizer Version %s - Seed: %s\n\n' % (self.metadata['version'], self.world.seed)) + if self.metadata['user_notes']: + outfile.write('User Notes: %s\n' % self.metadata['user_notes']) outfile.write('Filling Algorithm: %s\n' % self.world.algorithm) outfile.write('Players: %d\n' % self.world.players) outfile.write('Teams: %d\n' % self.world.teams) diff --git a/CLI.py b/CLI.py index 2c925c6c..8f790ed8 100644 --- a/CLI.py +++ b/CLI.py @@ -346,7 +346,8 @@ def parse_settings(): "outputpath": os.path.join("."), "saveonexit": "ask", "outputname": "", - "startinventoryarray": {} + "startinventoryarray": {}, + "notes": "" } if sys.platform.lower().find("windows"): diff --git a/Main.py b/Main.py index dd5ebc3e..7c124808 100644 --- a/Main.py +++ b/Main.py @@ -172,7 +172,7 @@ def main(args, seed=None, fish=None): world.player_names[player].append(name) logger.info('') world.settings = CustomSettings() - world.settings.create_from_world(world, args.race) + world.settings.create_from_world(world, args) outfilebase = f'DR_{args.outputname if args.outputname else world.seed}' diff --git a/docs/customizer_example.yaml b/docs/customizer_example.yaml index 76514990..acdf5188 100644 --- a/docs/customizer_example.yaml +++ b/docs/customizer_example.yaml @@ -3,6 +3,7 @@ meta: players: 1 seed: 41 # note to self: seed 42 had an interesting Swamp Palace problem names: Lonk + notes: "Some notes specified by the user" settings: 1: door_shuffle: basic diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 2eaf847e..bdc6b4db 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -513,5 +513,6 @@ ] }, "outputname": {}, + "notes": {}, "code": {} } diff --git a/source/classes/CustomSettings.py b/source/classes/CustomSettings.py index a0cea069..c0e82eed 100644 --- a/source/classes/CustomSettings.py +++ b/source/classes/CustomSettings.py @@ -63,6 +63,7 @@ class CustomSettings(object): args.suppress_rom = get_setting(meta['suppress_rom'], args.suppress_rom) args.names = get_setting(meta['names'], args.names) args.race = get_setting(meta['race'], args.race) + args.notes = get_setting(meta['user_notes'], args.notes) self.player_range = range(1, args.multi + 1) if 'settings' in self.file_source: for p in self.player_range: @@ -214,14 +215,15 @@ class CustomSettings(object): return self.file_source['drops'] return None - def create_from_world(self, world, race): + def create_from_world(self, world, settings): self.player_range = range(1, world.players + 1) settings_dict, meta_dict = {}, {} self.world_rep['meta'] = meta_dict meta_dict['players'] = world.players meta_dict['algorithm'] = world.algorithm meta_dict['seed'] = world.seed - meta_dict['race'] = race + meta_dict['race'] = settings.race + meta_dict['user_notes'] = settings.notes self.world_rep['settings'] = settings_dict for p in self.player_range: settings_dict[p] = {} From f442cff06119c12b18cbac68f9c18529ded2da09 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 3 Aug 2023 15:06:54 -0600 Subject: [PATCH 07/11] Logic added for openable trap doors --- BaseClasses.py | 3 +- DoorShuffle.py | 52 ++++++++++++--- Main.py | 2 +- RELEASENOTES.md | 3 + Rules.py | 101 +++++++++++++++++++++++++++- test/dungeons/trap_test.yaml | 125 +++++++++++++++++++++++++++++++++++ 6 files changed, 271 insertions(+), 15 deletions(-) create mode 100644 test/dungeons/trap_test.yaml diff --git a/BaseClasses.py b/BaseClasses.py index 3d97414b..a62ca101 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1760,6 +1760,7 @@ class Door(object): self.dest = None self.blocked = False # Indicates if the door is normally blocked off as an exit. (Sanc door or always closed) self.blocked_orig = False + self.trapped = False self.stonewall = False # Indicate that the door cannot be enter until exited (Desert Torches, PoD Eye Statue) self.smallKey = False # There's a small key door on this side self.bigKey = False # There's a big key door on this side @@ -1870,7 +1871,7 @@ class Door(object): return self def no_exit(self): - self.blocked = self.blocked_orig = True + self.blocked = self.blocked_orig = self.trapped = True return self def no_entrance(self): diff --git a/DoorShuffle.py b/DoorShuffle.py index abf1def8..7a78246b 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -88,8 +88,7 @@ def link_doors_prep(world, player): find_inaccessible_regions(world, player) - if world.doorShuffle[player] != 'vanilla': - create_dungeon_pool(world, player) + create_dungeon_pool(world, player) if world.intensity[player] >= 3 and world.doorShuffle[player] != 'vanilla': choose_portals(world, player) else: @@ -1844,12 +1843,12 @@ def shuffle_trap_doors(door_type_pools, paths, start_regions_map, all_custom, wo builder.candidates.trap = filter_key_door_pool(builder.candidates.trap, all_custom[dungeon]) remaining -= len(custom_trap_doors[dungeon]) ttl += len(builder.candidates.trap) - if ttl == 0: + if ttl == 0 and all(len(custom_trap_doors[dungeon]) == 0 for dungeon in pool): continue for dungeon in pool: builder = world.dungeon_layouts[player][dungeon] proportion = len(builder.candidates.trap) - calc = int(round(proportion * door_type_pool.traps/ttl)) + calc = 0 if ttl == 0 else int(round(proportion * door_type_pool.traps/ttl)) suggested = min(proportion, calc) remaining -= suggested suggestion_map[dungeon] = suggested @@ -1981,7 +1980,10 @@ def shuffle_small_key_doors(door_type_pools, used_doors, start_regions_map, all_ remaining = max(0, remaining) for dungeon in pool: builder = world.dungeon_layouts[player][dungeon] - calculated = int(round(builder.key_doors_num*total_keys/ttl)) + if ttl == 0: + calculated = 0 + else: + calculated = int(round(builder.key_doors_num*total_keys/ttl)) max_keys = max(0, builder.location_cnt - calc_used_dungeon_items(builder, world, player)) cand_len = max(0, len(builder.candidates.small) - builder.key_drop_cnt) limit = min(max_keys, cand_len, max_computation) @@ -2211,9 +2213,10 @@ def find_valid_trap_combination(builder, suggested, start_regions, paths, world, sample_list = build_sample_list(combinations, 1000) proposal = kth_combination(sample_list[itr], trap_door_pool, trap_doors_needed) proposal.extend(custom_trap_doors) + filtered_proposal = [x for x in proposal if x.name not in trap_door_exceptions] start_regions, event_starts = filter_start_regions(builder, start_regions, world, player) - while not validate_trap_layout(proposal, builder, start_regions, paths, world, player): + while not validate_trap_layout(filtered_proposal, builder, start_regions, paths, world, player): itr += 1 if itr >= len(sample_list): if not drop: @@ -2248,6 +2251,12 @@ def filter_start_regions(builder, start_regions, world, player): portal_entrance_region = portal.door.entrance.parent_region.name if portal_entrance_region not in builder.path_entrances: excluded[region] = None + if not portal: + drop_region = next((x.parent_region for x in region.entrances + if x.parent_region.type in [RegionType.LightWorld, RegionType.DarkWorld] + or x.parent_region.name == 'Sewer Drop'), None) + if drop_region and drop_region.name in world.inaccessible_regions[player]: + excluded[region] = None if std_flag and (not portal or portal.find_portal_entrance().parent_region.name != 'Hyrule Castle Courtyard'): excluded[region] = None if portal is None: @@ -2343,10 +2352,12 @@ def reassign_trap_doors(trap_map, world, player): elif kind in [DoorKind.Trap2, DoorKind.TrapTriggerable]: room.change(d.doorListPos, DoorKind.Normal) d.blocked = False + d.trapped = False # connect_one_way(world, d.name, d.dest.name, player) elif d.type is DoorType.Normal and d not in traps: world.get_room(d.roomIndex, player).change(d.doorListPos, DoorKind.Normal) d.blocked = False + d.trapped = False for d in traps: change_door_to_trap(d, world, player) world.spoiler.set_door_type(f'{d.name} ({d.dungeon_name()})', 'Trap Door', player) @@ -2384,24 +2395,45 @@ def change_door_to_trap(d, world, player): elif d.direction in [Direction.North, Direction.West]: new_kind = DoorKind.TrapTriggerable if new_kind: - d.blocked = True + d.blocked = is_trap_door_blocked(d) + d.trapped = True pos = 3 if d.type == DoorType.Normal else 4 verify_door_list_pos(d, room, world, player, pos) d.trapFlag = {0: 0x4, 1: 0x2, 2: 0x1, 3: 0x8}[d.doorListPos] room.change(d.doorListPos, new_kind) - if d.entrance.connected_region is not None: + if d.entrance.connected_region is not None and d.blocked: d.entrance.connected_region.entrances.remove(d.entrance) d.entrance.connected_region = None elif d.type is DoorType.Normal: - d.blocked = True + d.blocked = is_trap_door_blocked(d) + d.trapped = True verify_door_list_pos(d, room, world, player, pos=3) d.trapFlag = {0: 0x4, 1: 0x2, 2: 0x1}[d.doorListPos] room.change(d.doorListPos, DoorKind.Trap) - if d.entrance.connected_region is not None: + if d.entrance.connected_region is not None and d.blocked: d.entrance.connected_region.entrances.remove(d.entrance) d.entrance.connected_region = None +trap_door_exceptions = { + 'PoD Mimics 2 SW', 'TR Twin Pokeys NW', 'Thieves Blocked Entry SW', 'Hyrule Dungeon Armory Interior Key Door N', + 'Desert Compass Key Door WN', 'TR Tile Room SE', 'Mire Cross SW', 'Tower Circle of Pots ES', + 'Eastern Single Eyegore ES', 'Eastern Duo Eyegores SE', 'Swamp Push Statue S', + 'Skull 2 East Lobby WS', 'GT Hope Room WN', 'Eastern Courtyard Ledge S', 'Ice Lobby SE', 'GT Speed Torch WN', + 'Ice Switch Room ES', 'Ice Switch Room NE', 'Skull Torch Room WS', 'GT Speed Torch NE', 'GT Speed Torch WS', + 'GT Torch Cross WN', 'Mire Tile Room SW', 'Mire Tile Room ES', 'TR Torches WN', 'PoD Lobby N', 'PoD Middle Cage S', + 'Ice Bomb Jump NW', 'GT Hidden Spikes SE', 'Ice Tall Hint EN', 'GT Conveyor Cross EN', 'Eastern Pot Switch WN', + 'Thieves Conveyor Maze WN', 'Thieves Conveyor Maze SW', 'Eastern Dark Square Key Door WN', 'Eastern Lobby NW', + 'Eastern Lobby NE', 'Ice Cross Bottom SE', 'Desert Back Lobby S', 'Desert West S', + 'Desert West Lobby ES', 'Mire Hidden Shooters SE', 'Mire Hidden Shooters ES', 'Mire Hidden Shooters WS', + 'Tower Dark Pits EN', 'Tower Dark Maze ES', 'TR Tongue Pull WS', +} + + +def is_trap_door_blocked(door): + return door.name not in trap_door_exceptions + + def find_big_key_candidates(builder, start_regions, used, world, player): if world.door_type_mode[player] != 'original': # big, all, chaos # traverse dungeon and find candidates diff --git a/Main.py b/Main.py index 7c124808..be6266e2 100644 --- a/Main.py +++ b/Main.py @@ -34,7 +34,7 @@ from source.overworld.EntranceShuffle2 import link_entrances_new from source.tools.BPS import create_bps_from_data from source.classes.CustomSettings import CustomSettings -version_number = '1.2.0.19' +version_number = '1.2.0.20' version_branch = '-u' __version__ = f'{version_number}{version_branch}' diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3231157f..59f1e778 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -109,6 +109,9 @@ These are now independent of retro mode and have three options: None, Random, an # Bug Fixes and Notes +* 1.2.0.20u + * Added logic for trap doors that could be opened using existing room triggers + * Added a notes field for user added notes either via CLI or Customizer * 1.2.0.19u * Added min/max for triforce pool, goal, and difference for CLI and Customizer. (Thanks Catobat) * Fixed a bug with dungeon generation diff --git a/Rules.py b/Rules.py index 26e70f5f..0b390f3d 100644 --- a/Rules.py +++ b/Rules.py @@ -276,11 +276,18 @@ def global_rules(world, player): # Start of door rando rules # TODO: Do these need to flag off when door rando is off? - some of them, yes + def is_trapped(entrance): + return world.get_entrance(entrance, player).door.trapped + # Eastern Palace # Eyegore room needs a bow set_rule(world.get_entrance('Eastern Duo Eyegores NE', player), lambda state: state.can_shoot_arrows(player)) set_rule(world.get_entrance('Eastern Single Eyegore NE', player), lambda state: state.can_shoot_arrows(player)) set_rule(world.get_entrance('Eastern Map Balcony Hook Path', player), lambda state: state.has('Hookshot', player)) + if is_trapped('Eastern Single Eyegore ES'): + set_rule(world.get_entrance('Eastern Single Eyegore ES', player), lambda state: state.can_shoot_arrows(player)) + if is_trapped('Eastern Duo Eyegores SE'): + set_rule(world.get_entrance('Eastern Duo Eyegores SE', player), lambda state: state.can_shoot_arrows(player)) # Boss rules. Same as below but no BK or arrow requirement. set_defeat_dungeon_boss_rule(world.get_location('Eastern Palace - Prize', player)) @@ -305,13 +312,18 @@ def global_rules(world, player): set_rule(world.get_entrance('Tower Red Spears WN', player), lambda state: state.can_kill_most_things(player)) set_rule(world.get_entrance('Tower Red Guards EN', player), lambda state: state.can_kill_most_things(player)) set_rule(world.get_entrance('Tower Red Guards SW', player), lambda state: state.can_kill_most_things(player)) + set_rule(world.get_entrance('Tower Circle of Pots NW', player), lambda state: state.can_kill_most_things(player)) + if is_trapped('Tower Circle of Pots ES'): + set_rule(world.get_entrance('Tower Circle of Pots ES', player), + lambda state: state.can_kill_most_things(player)) set_rule(world.get_entrance('Tower Altar NW', player), lambda state: state.has_sword(player)) set_defeat_dungeon_boss_rule(world.get_location('Agahnim 1', player)) - set_rule(world.get_entrance('PoD Arena Landing Bonk Path', player), lambda state: state.has_Boots(player)) set_rule(world.get_entrance('PoD Mimics 1 NW', player), lambda state: state.can_shoot_arrows(player)) set_rule(world.get_entrance('PoD Mimics 2 NW', player), lambda state: state.can_shoot_arrows(player)) + if is_trapped('PoD Mimics 2 SW'): + set_rule(world.get_entrance('PoD Mimics 2 SW', player), lambda state: state.can_shoot_arrows(player)) set_rule(world.get_entrance('PoD Bow Statue Down Ladder', player), lambda state: state.can_shoot_arrows(player)) set_rule(world.get_entrance('PoD Map Balcony Drop Down', player), lambda state: state.has('Hammer', player)) set_rule(world.get_entrance('PoD Dark Pegs Landing to Right', player), lambda state: state.has('Hammer', player)) @@ -360,6 +372,8 @@ def global_rules(world, player): set_rule(world.get_entrance('Skull Big Chest Hookpath', player), lambda state: state.has('Hookshot', player)) set_rule(world.get_entrance('Skull Torch Room WN', player), lambda state: state.has('Fire Rod', player)) + if is_trapped('Skull Torch Room WS'): + set_rule(world.get_entrance('Skull Torch Room WS', player), lambda state: state.has('Fire Rod', player)) set_rule(world.get_entrance('Skull Vines NW', player), lambda state: state.has_sword(player)) hidden_pits_door = world.get_door('Skull Small Hall WS', player) @@ -397,6 +411,8 @@ def global_rules(world, player): set_rule(world.get_location('Thieves\' Town - Prize', player), lambda state: state.has('Maiden Unmasked', player) and world.get_location('Thieves\' Town - Prize', player).parent_region.dungeon.boss.can_defeat(state)) set_rule(world.get_entrance('Ice Lobby WS', player), lambda state: state.can_melt_things(player)) + if is_trapped('Ice Lobby SE'): + set_rule(world.get_entrance('Ice Lobby SE', player), lambda state: state.can_melt_things(player)) set_rule(world.get_entrance('Ice Hammer Block ES', player), lambda state: state.can_lift_rocks(player) and state.has('Hammer', player)) set_rule(world.get_location('Ice Palace - Hammer Block Key Drop', player), lambda state: state.can_lift_rocks(player) and state.has('Hammer', player)) set_rule(world.get_location('Ice Palace - Map Chest', player), lambda state: state.can_lift_rocks(player) and state.has('Hammer', player)) @@ -411,6 +427,12 @@ def global_rules(world, player): set_rule(world.get_entrance('Ice Hookshot Balcony Path', player), lambda state: state.has('Hookshot', player)) if not world.get_door('Ice Switch Room SE', player).entranceFlag: set_rule(world.get_entrance('Ice Switch Room SE', player), lambda state: state.has('Cane of Somaria', player) or state.has('Convenient Block', player)) + if is_trapped('Ice Switch Room ES'): + set_rule(world.get_entrance('Ice Switch Room ES', player), + lambda state: state.has('Cane of Somaria', player) or state.has('Convenient Block', player)) + if is_trapped('Ice Switch Room NE'): + set_rule(world.get_entrance('Ice Switch Room NE', player), + lambda state: state.has('Cane of Somaria', player) or state.has('Convenient Block', player)) set_defeat_dungeon_boss_rule(world.get_location('Ice Palace - Boss', player)) set_defeat_dungeon_boss_rule(world.get_location('Ice Palace - Prize', player)) @@ -431,8 +453,15 @@ def global_rules(world, player): or state.has('Cane of Byrna', player) or state.has('Cape', player)) set_rule(world.get_entrance('Mire Left Bridge Hook Path', player), lambda state: state.has('Hookshot', player)) set_rule(world.get_entrance('Mire Tile Room NW', player), lambda state: state.has_fire_source(player)) + if is_trapped('Mire Tile Room SW'): + set_rule(world.get_entrance('Mire Tile Room SW', player), lambda state: state.has_fire_source(player)) + if is_trapped('Mire Tile Room ES'): + set_rule(world.get_entrance('Mire Tile Room ES', player), lambda state: state.has_fire_source(player)) set_rule(world.get_entrance('Mire Attic Hint Hole', player), lambda state: state.has_fire_source(player)) set_rule(world.get_entrance('Mire Dark Shooters SW', player), lambda state: state.has('Cane of Somaria', player)) + if is_trapped('Mire Dark Shooters SE'): + set_rule(world.get_entrance('Mire Dark Shooters SE', player), + lambda state: state.has('Cane of Somaria', player)) set_defeat_dungeon_boss_rule(world.get_location('Misery Mire - Boss', player)) set_defeat_dungeon_boss_rule(world.get_location('Misery Mire - Prize', player)) @@ -448,6 +477,9 @@ def global_rules(world, player): set_rule(world.get_entrance('TR Hub Path', player), lambda state: state.has('Cane of Somaria', player)) set_rule(world.get_entrance('TR Hub Ledges Path', player), lambda state: state.has('Cane of Somaria', player)) set_rule(world.get_entrance('TR Torches NW', player), lambda state: state.has('Cane of Somaria', player) and state.has('Fire Rod', player)) + if is_trapped('TR Torches WN'): + set_rule(world.get_entrance('TR Torches WN', player), + lambda state: state.has('Cane of Somaria', player) and state.has('Fire Rod', player)) set_rule(world.get_entrance('TR Big Chest Entrance Gap', player), lambda state: state.has('Cane of Somaria', player) or state.has('Hookshot', player)) set_rule(world.get_entrance('TR Big Chest Gap', player), lambda state: state.has('Cane of Somaria', player) or state.has_Boots(player)) set_rule(world.get_entrance('TR Dark Ride Up Stairs', player), lambda state: state.has('Cane of Somaria', player)) @@ -467,10 +499,20 @@ def global_rules(world, player): set_rule(world.get_location('Ganons Tower - Bob\'s Torch', player), lambda state: state.has_Boots(player)) set_rule(world.get_entrance('GT Hope Room EN', player), lambda state: state.has('Cane of Somaria', player)) + if is_trapped('GT Hope Room WN'): + set_rule(world.get_entrance('GT Hope Room WN', player), lambda state: state.has('Cane of Somaria', player)) set_rule(world.get_entrance('GT Conveyor Cross Hammer Path', player), lambda state: state.has('Hammer', player)) set_rule(world.get_entrance('GT Conveyor Cross Hookshot Path', player), lambda state: state.has('Hookshot', player)) + if is_trapped('GT Conveyor Cross EN'): + set_rule(world.get_entrance('GT Conveyor Cross EN', player), lambda state: state.has('Hammer', player)) if not world.get_door('GT Speed Torch SE', player).entranceFlag: set_rule(world.get_entrance('GT Speed Torch SE', player), lambda state: state.has('Fire Rod', player)) + if is_trapped('GT Speed Torch NE'): + set_rule(world.get_entrance('GT Speed Torch NE', player), lambda state: state.has('Fire Rod', player)) + if is_trapped('GT Speed Torch WS'): + set_rule(world.get_entrance('GT Speed Torch WS', player), lambda state: state.has('Fire Rod', player)) + if is_trapped('GT Speed Torch WN'): + set_rule(world.get_entrance('GT Speed Torch WN', player), lambda state: state.has('Fire Rod', player)) set_rule(world.get_entrance('GT Hookshot South-Mid Path', player), lambda state: state.has('Hookshot', player)) set_rule(world.get_entrance('GT Hookshot Mid-North Path', player), lambda state: state.has('Hookshot', player)) set_rule(world.get_entrance('GT Hookshot East-Mid Path', player), lambda state: state.has('Hookshot', player) or state.has_Boots(player)) @@ -505,6 +547,8 @@ def global_rules(world, player): set_rule(world.get_entrance('GT Lanmolas 2 ES', player), lambda state: world.get_region('GT Lanmolas 2', player).dungeon.bosses['middle'].can_defeat(state)) set_rule(world.get_entrance('GT Lanmolas 2 NW', player), lambda state: world.get_region('GT Lanmolas 2', player).dungeon.bosses['middle'].can_defeat(state)) set_rule(world.get_entrance('GT Torch Cross ES', player), lambda state: state.has_fire_source(player)) + if is_trapped('GT Torch Cross WN'): + set_rule(world.get_entrance('GT Torch Cross WN', player), lambda state: state.has_fire_source(player)) set_rule(world.get_entrance('GT Falling Torches NE', player), lambda state: state.has_fire_source(player)) # todo: the following only applies to crystal state propagation from this supertile # you can also reset the supertile, but I'm not sure how to model that @@ -760,13 +804,29 @@ def bomb_rules(world, player): ('GT Petting Zoo SE', False), # Dont make anyone do this room with bombs and/or pots. ('GT DMs Room SW', False) # Four red stalfos ] + conditional_kill_traps = [ + ('Hyrule Dungeon Armory Interior Key Door N', True), + ('Desert Compass Key Door WN', True), + ('Thieves Blocked Entry SW', True), + ('TR Tongue Pull WS', True), + ('TR Twin Pokeys NW', False), + ] for killdoor,bombable in easy_kill_rooms: if bombable: add_rule(world.get_entrance(killdoor, player), lambda state: (state.can_use_bombs(player) or state.can_kill_most_things(player))) else: add_rule(world.get_entrance(killdoor, player), lambda state: state.can_kill_most_things(player)) + for kill_door, bombable in conditional_kill_traps: + if world.get_entrance(kill_door, player).door.trapped: + if bombable: + add_rule(world.get_entrance(kill_door, player), + lambda state: (state.can_use_bombs(player) or state.can_kill_most_things(player))) + else: + add_rule(world.get_entrance(kill_door, player), lambda state: state.can_kill_most_things(player)) add_rule(world.get_entrance('Ice Stalfos Hint SE', player), lambda state: state.can_use_bombs(player)) # Need bombs for big stalfos knights - add_rule(world.get_entrance('Mire Cross ES', player), lambda state: state.can_kill_most_things(player)) # 4 Sluggulas. Bombs don't work // or (state.can_use_bombs(player) and state.has('Magic Powder'), player) + add_rule(world.get_entrance('Mire Cross ES', player), lambda state: state.can_kill_most_things(player)) # 4 Sluggulas. Bombs don't work // or (state.can_use_bombs(player) and state.has('Magic Powder'), player) + if world.get_entrance('Mire Cross SW', player).door.trapped: + add_rule(world.get_entrance('Mire Cross SW', player), lambda state: state.can_kill_most_things(player)) enemy_kill_drops = [ # Location, bool-bombable ('Hyrule Castle - Map Guard Key Drop', True), @@ -1143,6 +1203,9 @@ def swordless_rules(world, player): set_rule(world.get_entrance('Tower Altar NW', player), lambda state: True) set_rule(world.get_entrance('Skull Vines NW', player), lambda state: True) set_rule(world.get_entrance('Ice Lobby WS', player), lambda state: state.has('Fire Rod', player) or state.has('Bombos', player)) + if world.get_entrance('Ice Lobby SE', player).door.trapped: + set_rule(world.get_entrance('Ice Lobby SE', player), + lambda state: state.has('Fire Rod', player) or state.has('Bombos', player)) set_rule(world.get_location('Ice Palace - Freezor Chest', player), lambda state: state.has('Fire Rod', player) or state.has('Bombos', player)) set_rule(world.get_location('Ether Tablet', player), lambda state: state.has('Book of Mudora', player) and state.has('Hammer', player)) @@ -1156,7 +1219,7 @@ def swordless_rules(world, player): if world.mode[player] != 'inverted': set_rule(world.get_entrance('Agahnims Tower', player), lambda state: state.has('Cape', player) or state.has('Hammer', player)) - +# todo: new traps std_kill_rooms = { 'Hyrule Dungeon Armory Main': ['Hyrule Dungeon Armory S', 'Hyrule Dungeon Armory ES'], # One green guard 'Hyrule Dungeon Armory Boomerang': ['Hyrule Dungeon Armory Boomerang WS'], # One blue guard @@ -1187,6 +1250,18 @@ std_kill_rooms = { 'GT Wizzrobes 2': ['GT Wizzrobes 2 SE', 'GT Wizzrobes 2 NE'] # Wizzrobes. Bombs don't work } # all trap rooms? +std_kill_doors_if_trapped = { + 'Hyrule Dungeon Armory Main': 'Hyrule Dungeon Armory Interior Key Door N', + # 'Eastern Single Eyegore ES', # arrow rule is sufficient + # 'Eastern Duo Eyegores S', # arrow rule is sufficient + 'TR Twin Pokeys': 'TR Twin Pokeys NW', + 'Thieves Basement Block': 'Thieves Blocked Entry SW', + 'Desert Compass Room': 'Desert Compass Key Door WN', + 'Mire Cross': 'Mire Cross SW', + 'Tower Circle of Pots': 'Tower Circle of Pots ES', + # 'Ice Lobby S' # can melt rule is sufficient +} + def add_connection(parent_name, target_name, entrance_name, world, player): parent = world.get_region(parent_name, player) target = world.get_region(target_name, player) @@ -1241,6 +1316,10 @@ def standard_rules(world, player): if region.name in std_kill_rooms: for ent in std_kill_rooms[region.name]: add_rule(world.get_entrance(ent, player), lambda state: standard_escape_rule(state)) + if region.name in std_kill_doors_if_trapped: + ent = world.get_entrance(std_kill_doors_if_trapped[region.name], player) + if ent.door.trapped: + add_rule(ent, lambda state: standard_escape_rule(state)) set_rule(world.get_location('Zelda Pickup', player), lambda state: state.has('Big Key (Escape)', player)) set_rule(world.get_entrance('Hyrule Castle Throne Room Tapestry', player), lambda state: state.has('Zelda Herself', player)) @@ -1866,6 +1945,11 @@ def set_bunny_rules(world, player, inverted): if is_bunny(bunny_exit.parent_region): add_rule(bunny_exit, get_rule_to_add(bunny_exit.parent_region)) + for ent_name in bunny_impassible_if_trapped: + bunny_exit = world.get_entrance(ent_name, player) + if bunny_exit.door.trapped and is_bunny(bunny_exit.parent_region): + add_rule(bunny_exit, get_rule_to_add(bunny_exit.parent_region)) + doors_to_check = [x for x in world.doors if x.player == player and x not in bunny_impassible_doors] doors_to_check = [x for x in doors_to_check if x.type in [DoorType.Normal, DoorType.Interior] and not x.blocked] for door in doors_to_check: @@ -1997,6 +2081,17 @@ bunny_impassible_doors = { 'GT Validation Block Path' } +bunny_impassible_if_trapped = { + 'Hyrule Dungeon Armory Interior Key Door N', 'Eastern Pot Switch WN', 'Eastern Lobby NW', + 'Eastern Lobby NE', 'Desert Compass Key Door WN', 'Tower Circle of Pots ES', 'PoD Mimics 2 SW', + 'PoD Middle Cage S', 'Swamp Push Statue S', 'Skull 2 East Lobby WS', 'Skull Torch Room WS', + 'Thieves Conveyor Maze WN', 'Thieves Conveyor Maze SW', 'Thieves Blocked Entry SW', 'Ice Bomb Jump NW', + 'Ice Tall Hint EN', 'Ice Switch Room ES', 'Ice Switch Room NE', 'Mire Cross SW', + 'Mire Tile Room SW', 'Mire Tile Room ES', 'TR Twin Pokeys NW', 'TR Torches WN', 'GT Hope Room WN', + 'GT Speed Torch NE', 'GT Speed Torch WS', 'GT Torch Cross WN', 'GT Hidden Spikes SE', 'GT Conveyor Cross EN', + 'GT Speed Torch WN', 'Ice Lobby SE' +} + def add_key_logic_rules(world, player): key_logic = world.key_logic[player] diff --git a/test/dungeons/trap_test.yaml b/test/dungeons/trap_test.yaml new file mode 100644 index 00000000..d82a8ade --- /dev/null +++ b/test/dungeons/trap_test.yaml @@ -0,0 +1,125 @@ +meta: + players: 1 +settings: + 1: + door_shuffle: basic + intensity: 3 + door_type_mode: all +doors: + 1: + doors: + PoD Mimics 2 SW: + type: Trap Door +# TR Twin Pokeys NW: # not possible due to trap flags +# type: Trap Door + Thieves Blocked Entry SW: + type: Trap Door + Hyrule Dungeon Armory Interior Key Door N: + type: Trap Door + Desert Compass Key Door WN: + type: Trap Door + TR Tile Room SE: + type: Trap Door +# Mire Cross SW: # not possible due to trap flags +# type: Trap Door + Tower Circle of Pots ES: + type: Trap Door + Eastern Single Eyegore ES: + type: Trap Door + Eastern Duo Eyegores SE: + type: Trap Door + Swamp Push Statue S: + type: Trap Door +# Skull 2 East Lobby WS: # currently not possible due to trap flags +# type: Trap Door + GT Hope Room WN : + type: Trap Door + +# Eastern Courtyard Ledge S: # currently not possible due to trap flags +# type: Trap Door + Ice Switch Room ES : + type: Trap Door + Ice Switch Room NE : + type: Trap Door + Skull Torch Room WS : + type: Trap Door + GT Speed Torch NE : + type: Trap Door + GT Speed Torch WS : + type: Trap Door + GT Torch Cross WN : + type: Trap Door + Mire Tile Room SW : + type: Trap Door + Mire Tile Room ES : + type: Trap Door + TR Torches WN : + type: Trap Door + PoD Lobby N: + type: Trap Door + PoD Middle Cage S: + type: Trap Door + Ice Bomb Jump NW: + type: Trap Door + GT Hidden Spikes SE: + type: Trap Door + Ice Tall Hint EN: + type: Trap Door + GT Conveyor Cross EN: + type: Trap Door + Eastern Pot Switch WN: + type: Trap Door + Thieves Conveyor Maze WN: + type: Trap Door +# Thieves Conveyor Maze SW: #not possible due to 4 door limit +# type: Trap Door + Eastern Dark Square Key Door WN: + type: Trap Door + Eastern Lobby NW: + type: Trap Door + Eastern Lobby NE: + type: Trap Door +# Ice Cross Bottom SE: # not possible due to trap flags +# type: Trap Door + Desert Back Lobby S: + type: Trap Door +# Desert West S: need enough lobbies for basic, should otherwise work +# type: Trap Door + Desert West Lobby ES: + type: Trap Door +# Mire Hidden Shooters SE: # not possible due to trap flags +# type: Trap Door +# Mire Hidden Shooters ES: # not possible due to trap flags +# type: Trap Door + Mire Hidden Shooters WS: + type: Trap Door + Tower Dark Pits EN: + type: Trap Door + Tower Dark Maze ES: + type: Trap Door + TR Tongue Pull WS: + type: Trap Door + +# Lower layer: not valid + # Sewers Pull Switch N: + # type: Trap Door + # PoD Sexy Statue W: # not possible due to trap flags and low layer too, so likely not an exception + # type: Trap Door + +# Not valid due to disappearing somaria block +# Mire Dark Shooters SE: +# type: Trap Door + + # These triggers don't open doors +# Ice Compass Room NE: +# type: Trap Door +# Hera Torches NE: +# type: Trap Door +# Mire Spikes WS: +# type: Trap Door +# Mire Spikes SW: +# type: Trap Door +# Mire Spikes NW: +# type: Trap Door +# Tower Room 03 WN: +# type: Trap Door From e6597a7ab9c43c8ab88da11a83f4f6838bf06d17 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 7 Aug 2023 09:36:50 -0600 Subject: [PATCH 08/11] Fixed inverted problem with experimental (logically assumed link's house was in the light world) Fixed hint typo --- PotShuffle.py | 2 +- RELEASENOTES.md | 4 +++- source/overworld/EntranceShuffle2.py | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/PotShuffle.py b/PotShuffle.py index 6a4df35e..b90d7863 100644 --- a/PotShuffle.py +++ b/PotShuffle.py @@ -1022,7 +1022,7 @@ key_drop_data = { 'Ice Palace - Jelly Key Drop': ['Drop', (0x09DA21, 0xE, 3), 'dropped in Ice Palace', 'Small Key (Ice Palace)'], 'Ice Palace - Conveyor Key Drop': ['Drop', (0x09DE08, 0x3E, 8), 'dropped in Ice Palace', 'Small Key (Ice Palace)'], 'Ice Palace - Hammer Block Key Drop': ['Pot', 0x3F, 'under a block in Ice Palace', 'Small Key (Ice Palace)'], - 'Ice Palace - Many Pots Pot Key': ['Pot', 0x9F, 'int a pot in Ice Palace', 'Small Key (Ice Palace)'], + 'Ice Palace - Many Pots Pot Key': ['Pot', 0x9F, 'in a pot in Ice Palace', 'Small Key (Ice Palace)'], 'Misery Mire - Spikes Pot Key': ['Pot', 0xB3, 'in a pot in Misery Mire', 'Small Key (Misery Mire)'], 'Misery Mire - Fishbone Pot Key': ['Pot', 0xA1, 'in a pot in forgotten Mire', 'Small Key (Misery Mire)'], 'Misery Mire - Conveyor Crystal Key Drop': ['Drop', (0x09E7FB, 0xC1, 9), 'dropped in Misery Mire', 'Small Key (Misery Mire)'], diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 59f1e778..9dfc8bbd 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -111,7 +111,9 @@ These are now independent of retro mode and have three options: None, Random, an * 1.2.0.20u * Added logic for trap doors that could be opened using existing room triggers - * Added a notes field for user added notes either via CLI or Customizer + * Fixed a problem with inverted generation and the experimental flag + * Added a notes field for user added notes either via CLI or Customizer (thanks Hiimcody and Codemann) + * Fixed a typo for a specific pot hint * 1.2.0.19u * Added min/max for triforce pool, goal, and difference for CLI and Customizer. (Thanks Catobat) * Fixed a bug with dungeon generation diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py index 6afc7b9e..da71c661 100644 --- a/source/overworld/EntranceShuffle2.py +++ b/source/overworld/EntranceShuffle2.py @@ -66,6 +66,10 @@ def link_entrances_new(world, player): default_map['Old Man Cave (East)'] = 'Death Mountain Return Cave Exit (West)' one_way_map['Bumper Cave (Top)'] = 'Dark Death Mountain Healer Fairy' del default_map['Bumper Cave (Top)'] + del one_way_map['Big Bomb Shop'] + one_way_map['Links House'] = 'Big Bomb Shop' + del default_map['Links House'] + default_map['Big Bomb Shop'] = 'Links House Exit' avail_pool.default_map = default_map avail_pool.one_way_map = one_way_map From 9e26c9c42cb9c726f1208183306e063e6d8f1ec4 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 7 Aug 2023 10:44:55 -0600 Subject: [PATCH 09/11] Fixed minor issue with dungeon counter interfering with timer --- Main.py | 2 +- RELEASENOTES.md | 2 ++ Rom.py | 2 +- data/base2current.bps | Bin 93219 -> 93217 bytes 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Main.py b/Main.py index 7d3ae0eb..4f49cc48 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config from source.tools.BPS import create_bps_from_data -__version__ = '1.1.5-dev' +__version__ = '1.1.6-dev' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 4c65204f..b3734893 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -181,6 +181,8 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o # Bug Fixes and Notes +* 1.1.6 + * Minor issue with dungeon counter hud interfering with timer * 1.1.5 * MultiServer can not disable forfeits if desired * 1.1.4 diff --git a/Rom.py b/Rom.py index b76cfef8..b09b7107 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'fc4d4a01f8c4e00280ea5640297f8e9c' +RANDOMIZERBASEHASH = 'e30a2490da811232e0a438da8fa662ee' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 25cc58b2c300e723aaa269298be9cd15e9323ea3..c616e5516f89d5176466cff4f5bd8336b754f234 100644 GIT binary patch delta 63 zcmV-F0KosF*ae~31+ZEH15<&lvt0qw Date: Mon, 7 Aug 2023 10:49:55 -0600 Subject: [PATCH 10/11] Fixed minor issue with dungeon counter interfering with timer (rom re-build) --- RELEASENOTES.md | 2 ++ Rom.py | 2 +- data/base2current.bps | Bin 94169 -> 94167 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 61ab6abb..35155c50 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -201,6 +201,8 @@ These are now independent of retro mode and have three options: None, Random, an * Fix for unintentional decoupled door in standard * Fix a problem with BK doors being one-sided * Change to how wilds keys are placed in standard, better randomization + * Removed a Triforce text + * Fix for Desert Tiles 1 key door * 1.2.0.7-u * Fix for some misery mire key logic * Minor standard generation fix diff --git a/Rom.py b/Rom.py index 482080b2..5b65c852 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '467681d6160233f7af2761c631e26985' +RANDOMIZERBASEHASH = '168574b64461acded5f2e8394a05577e' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 9b3d673a51005eba1d3d336d10206d582cb1852b..80dff6bf7a424495c72c7b12a3e5ab3083e2fc14 100644 GIT binary patch delta 79 zcmV-V0I>hr-v!s-1+ZQL1RRdzakF9pSLQ9vILCf~52=43k21%8k2J@Ak2c4CpAQm{ lxdbBjyQJbEuW$2y$^Y;opC}TLv*_pPhX{CIs4;^=YVPr8Cu0Br delta 81 zcmV-X0IvVn-v!y<1+ZQL1ni9ya Date: Mon, 7 Aug 2023 12:19:35 -0600 Subject: [PATCH 11/11] Fix for hera boss music (the last?) --- RELEASENOTES.md | 2 ++ Rom.py | 2 +- data/base2current.bps | Bin 94167 -> 94175 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 35155c50..336c604e 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -110,10 +110,12 @@ These are now independent of retro mode and have three options: None, Random, an # Bug Fixes and Notes * 1.2.0.20u + * New generation feature that allows Spiral Stair to link to themselves (thank Catobat) * Added logic for trap doors that could be opened using existing room triggers * Fixed a problem with inverted generation and the experimental flag * Added a notes field for user added notes either via CLI or Customizer (thanks Hiimcody and Codemann) * Fixed a typo for a specific pot hint + * Fix for Hera Boss music (thanks Codemann) * 1.1.6 (from Stable) * Minor issue with dungeon counter hud interfering with timer * 1.2.0.19u diff --git a/Rom.py b/Rom.py index 5b65c852..5dc3652a 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '168574b64461acded5f2e8394a05577e' +RANDOMIZERBASEHASH = '61662913cc0cb12fb870d794937d88d9' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 80dff6bf7a424495c72c7b12a3e5ab3083e2fc14..23872f82d3be21e2fabd52ac809761a819691b9f 100644 GIT binary patch delta 5805 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 delta 5761 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