From c014c5a54a8dcd83836f719d8ad06b945bfdea5e Mon Sep 17 00:00:00 2001 From: digiholic Date: Fri, 16 Aug 2024 14:10:30 -0600 Subject: [PATCH 01/60] [OSRS] Fixes Incorrect filler item names causing failures on tests. (#3768) * Updates filler item names to match the actual item names * Adds more descriptive error message in case this error comes back * Properly raises exception instead of just text * Replaces exception with assert --- worlds/osrs/Names.py | 6 +++--- worlds/osrs/__init__.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/worlds/osrs/Names.py b/worlds/osrs/Names.py index 95aed742b6f1..cc92439ef859 100644 --- a/worlds/osrs/Names.py +++ b/worlds/osrs/Names.py @@ -93,9 +93,9 @@ class ItemNames(str, Enum): Progressive_Armor = "Progressive Armor" Progressive_Weapons = "Progressive Weapons" Progressive_Tools = "Progressive Tools" - Progressive_Range_Armor = "Progressive Range Armor" - Progressive_Range_Weapon = "Progressive Range Weapon" - Progressive_Magic = "Progressive Magic Spell" + Progressive_Range_Armor = "Progressive Ranged Armor" + Progressive_Range_Weapon = "Progressive Ranged Weapons" + Progressive_Magic = "Progressive Magic" Lobsters = "10 Lobsters" Swordfish = "5 Swordfish" Energy_Potions = "10 Energy Potions" diff --git a/worlds/osrs/__init__.py b/worlds/osrs/__init__.py index f726b4b81bf2..d74dc7cfd9c2 100644 --- a/worlds/osrs/__init__.py +++ b/worlds/osrs/__init__.py @@ -524,7 +524,9 @@ def create_region(self, name: str) -> "Region": return region def create_item(self, item_name: str) -> "Item": - item = [item for item in item_rows if item.name == item_name][0] + items = [item for item in item_rows if item.name == item_name] + assert len(items) > 0, f"No matching item found for name {item_name} for player {self.player_name}" + item = items[0] index = item_rows.index(item) return OSRSItem(item.name, item.progression, self.base_id + index, self.player) From ca96e7e2941325c46035a5f69775b5baffbf18e0 Mon Sep 17 00:00:00 2001 From: Kaito Sinclaire Date: Fri, 16 Aug 2024 13:20:02 -0700 Subject: [PATCH 02/60] Fix !remaining for cross-world items (#3732) * Fix !remaining for other worlds * Typing fixes for the previous change * Update LocationStore test to match what get_remaining now returns --- MultiServer.py | 18 +++++++++--------- NetUtils.py | 8 ++++---- _speedups.pyx | 8 ++++---- test/netutils/test_location_store.py | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/MultiServer.py b/MultiServer.py index f59855fca6a4..b7c0e0f74555 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -991,7 +991,7 @@ def collect_player(ctx: Context, team: int, slot: int, is_group: bool = False): collect_player(ctx, team, group, True) -def get_remaining(ctx: Context, team: int, slot: int) -> typing.List[int]: +def get_remaining(ctx: Context, team: int, slot: int) -> typing.List[typing.Tuple[int, int]]: return ctx.locations.get_remaining(ctx.location_checks, team, slot) @@ -1350,10 +1350,10 @@ def _cmd_collect(self) -> bool: def _cmd_remaining(self) -> bool: """List remaining items in your game, but not their location or recipient""" if self.ctx.remaining_mode == "enabled": - remaining_item_ids = get_remaining(self.ctx, self.client.team, self.client.slot) - if remaining_item_ids: - self.output("Remaining items: " + ", ".join(self.ctx.item_names[self.ctx.games[self.client.slot]][item_id] - for item_id in remaining_item_ids)) + rest_locations = get_remaining(self.ctx, self.client.team, self.client.slot) + if rest_locations: + self.output("Remaining items: " + ", ".join(self.ctx.item_names[self.ctx.games[slot]][item_id] + for slot, item_id in rest_locations)) else: self.output("No remaining items found.") return True @@ -1363,10 +1363,10 @@ def _cmd_remaining(self) -> bool: return False else: # is goal if self.ctx.client_game_state[self.client.team, self.client.slot] == ClientStatus.CLIENT_GOAL: - remaining_item_ids = get_remaining(self.ctx, self.client.team, self.client.slot) - if remaining_item_ids: - self.output("Remaining items: " + ", ".join(self.ctx.item_names[self.ctx.games[self.client.slot]][item_id] - for item_id in remaining_item_ids)) + rest_locations = get_remaining(self.ctx, self.client.team, self.client.slot) + if rest_locations: + self.output("Remaining items: " + ", ".join(self.ctx.item_names[self.ctx.games[slot]][item_id] + for slot, item_id in rest_locations)) else: self.output("No remaining items found.") return True diff --git a/NetUtils.py b/NetUtils.py index f8d698c74fcc..f79773728cd6 100644 --- a/NetUtils.py +++ b/NetUtils.py @@ -397,12 +397,12 @@ def get_missing(self, state: typing.Dict[typing.Tuple[int, int], typing.Set[int] location_id not in checked] def get_remaining(self, state: typing.Dict[typing.Tuple[int, int], typing.Set[int]], team: int, slot: int - ) -> typing.List[int]: + ) -> typing.List[typing.Tuple[int, int]]: checked = state[team, slot] player_locations = self[slot] - return sorted([player_locations[location_id][0] for - location_id in player_locations if - location_id not in checked]) + return sorted([(player_locations[location_id][1], player_locations[location_id][0]) for + location_id in player_locations if + location_id not in checked]) if typing.TYPE_CHECKING: # type-check with pure python implementation until we have a typing stub diff --git a/_speedups.pyx b/_speedups.pyx index 4b083c2f9aef..dc039e336500 100644 --- a/_speedups.pyx +++ b/_speedups.pyx @@ -287,15 +287,15 @@ cdef class LocationStore: entry in self.entries[start:start + count] if entry.location not in checked] - def get_remaining(self, state: State, team: int, slot: int) -> List[int]: + def get_remaining(self, state: State, team: int, slot: int) -> List[Tuple[int, int]]: cdef LocationEntry* entry cdef ap_player_t sender = slot cdef size_t start = self.sender_index[sender].start cdef size_t count = self.sender_index[sender].count cdef set checked = state[team, slot] - return sorted([entry.item for - entry in self.entries[start:start+count] if - entry.location not in checked]) + return sorted([(entry.receiver, entry.item) for + entry in self.entries[start:start+count] if + entry.location not in checked]) @cython.auto_pickle(False) diff --git a/test/netutils/test_location_store.py b/test/netutils/test_location_store.py index f3e83989bea4..1b984015844d 100644 --- a/test/netutils/test_location_store.py +++ b/test/netutils/test_location_store.py @@ -130,9 +130,9 @@ def test_get_missing(self) -> None: def test_get_remaining(self) -> None: self.assertEqual(self.store.get_remaining(full_state, 0, 1), []) - self.assertEqual(self.store.get_remaining(one_state, 0, 1), [13, 21]) - self.assertEqual(self.store.get_remaining(empty_state, 0, 1), [13, 21, 22]) - self.assertEqual(self.store.get_remaining(empty_state, 0, 3), [99]) + self.assertEqual(self.store.get_remaining(one_state, 0, 1), [(1, 13), (2, 21)]) + self.assertEqual(self.store.get_remaining(empty_state, 0, 1), [(1, 13), (2, 21), (2, 22)]) + self.assertEqual(self.store.get_remaining(empty_state, 0, 3), [(4, 99)]) def test_location_set_intersection(self) -> None: locations = {10, 11, 12} From 81092247c65817dc5f7529ce0ffd934b8007d085 Mon Sep 17 00:00:00 2001 From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Date: Fri, 16 Aug 2024 16:20:20 -0400 Subject: [PATCH 03/60] Core: early_local != local_early #3780 --- Main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Main.py b/Main.py index edae5d7b19b1..c931e22145a5 100644 --- a/Main.py +++ b/Main.py @@ -101,7 +101,7 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No multiworld.early_items[player][item_name] = max(0, early-count) remaining_count = count-early if remaining_count > 0: - local_early = multiworld.early_local_items[player].get(item_name, 0) + local_early = multiworld.local_early_items[player].get(item_name, 0) if local_early: multiworld.early_items[player][item_name] = max(0, local_early - remaining_count) del local_early From f5218faea73983172a593f2caae9058769c0b7db Mon Sep 17 00:00:00 2001 From: Bryce Wilson Date: Fri, 16 Aug 2024 13:23:47 -0700 Subject: [PATCH 04/60] Pokemon Emerald: Ensure dig tutor is always usable (#3660) * Pokemon Emerald: Ensure dig tutor is always usable * Pokemon Emerald: Clarify comment Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --- worlds/pokemon_emerald/rom.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/worlds/pokemon_emerald/rom.py b/worlds/pokemon_emerald/rom.py index 968a103ccd25..75d7d575846d 100644 --- a/worlds/pokemon_emerald/rom.py +++ b/worlds/pokemon_emerald/rom.py @@ -817,6 +817,8 @@ def _randomize_opponent_battle_type(world: "PokemonEmeraldWorld", patch: Pokemon def _randomize_move_tutor_moves(world: "PokemonEmeraldWorld", patch: PokemonEmeraldProcedurePatch, easter_egg: Tuple[int, int]) -> None: + FORTREE_MOVE_TUTOR_INDEX = 24 + if easter_egg[0] == 2: for i in range(30): patch.write_token( @@ -840,18 +842,26 @@ def _randomize_move_tutor_moves(world: "PokemonEmeraldWorld", patch: PokemonEmer # Always set Fortree move tutor to Dig patch.write_token( APTokenTypes.WRITE, - data.rom_addresses["gTutorMoves"] + (24 * 2), + data.rom_addresses["gTutorMoves"] + (FORTREE_MOVE_TUTOR_INDEX * 2), struct.pack("=50%) compatibility + if world.options.tm_tutor_compatibility.value < 50: + compatibility &= ~(1 << FORTREE_MOVE_TUTOR_INDEX) + if world.random.random() < 0.5: + compatibility |= 1 << FORTREE_MOVE_TUTOR_INDEX + patch.write_token( APTokenTypes.WRITE, data.rom_addresses["sTutorLearnsets"] + (species.species_id * 4), - struct.pack(" Date: Fri, 16 Aug 2024 18:19:16 -0700 Subject: [PATCH 05/60] Core: type for `CommonContext.ui` (#3796) * Core: type for `CommonContext.ui` * use `Optional` --- CommonClient.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonClient.py b/CommonClient.py index 09937e4b9ab8..750bee80bd70 100644 --- a/CommonClient.py +++ b/CommonClient.py @@ -252,7 +252,7 @@ def update_game(self, game: str, name_to_id_lookup_table: typing.Dict[str, int]) starting_reconnect_delay: int = 5 current_reconnect_delay: int = starting_reconnect_delay command_processor: typing.Type[CommandProcessor] = ClientCommandProcessor - ui = None + ui: typing.Optional["kvui.GameManager"] = None ui_task: typing.Optional["asyncio.Task[None]"] = None input_task: typing.Optional["asyncio.Task[None]"] = None keep_alive_task: typing.Optional["asyncio.Task[None]"] = None From 49a5b5277430de3be718cd765cb87ed1bf48a77f Mon Sep 17 00:00:00 2001 From: Scrungip <95324612+Scrungip@users.noreply.github.com> Date: Sun, 18 Aug 2024 16:03:57 -0500 Subject: [PATCH 06/60] VVVVVV: Make unnecessary Trinkets filler (#3806) * Make unnecessary trinkets filler * Proper syntax Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --- worlds/v6/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/worlds/v6/__init__.py b/worlds/v6/__init__.py index 3d3ee8cf58fd..b74f335189cf 100644 --- a/worlds/v6/__init__.py +++ b/worlds/v6/__init__.py @@ -49,12 +49,14 @@ def set_rules(self): self.area_cost_map = {} set_rules(self.multiworld, self.options, self.player, self.area_connections, self.area_cost_map) - def create_item(self, name: str) -> Item: - return V6Item(name, ItemClassification.progression, item_table[name], self.player) + def create_item(self, name: str, classification: ItemClassification = ItemClassification.filler) -> Item: + return V6Item(name, classification, item_table[name], self.player) def create_items(self): - trinkets = [self.create_item("Trinket " + str(i+1).zfill(2)) for i in range(0,20)] - self.multiworld.itempool += trinkets + progtrinkets = [self.create_item("Trinket " + str(i+1).zfill(2), ItemClassification.progression) for i in range(0, (4 * self.options.door_cost.value))] + filltrinkets = [self.create_item("Trinket " + str(i+1).zfill(2)) for i in range((4 * self.options.door_cost.value), 20)] + self.multiworld.itempool += progtrinkets + self.multiworld.itempool += filltrinkets def generate_basic(self): musiclist_o = [1,2,3,4,9,12] From 28a97095167fb6a43fd2c80c71c9a80f87bc9591 Mon Sep 17 00:00:00 2001 From: gaithern <36639398+gaithern@users.noreply.github.com> Date: Sun, 18 Aug 2024 17:39:37 -0500 Subject: [PATCH 07/60] Kingdom Hearts: Implement New Game (#3201) * Added Final Ansem Goal * Update __init__.py * Update Rules.py * New EotW logic * Update __init__.py * Update __init__.py * Update Items.py * Update Rules.py * Rename Location to be more meaningful, logic fixes * Removed Aerith locations * Change to allow randomized keyblade stats * Fixed incorrect option description. Fixed victory locations for alternative win condition settings * Commit * Lots of changes * Fixes * Fixes * Update Rules.py * Update Rules.py * Update Rules.py * Update Rules.py * Fixes * Update Rules.py * Update Rules.py * Update Options.py * Old Book is not required * Added Jungle Slider * Add Cid Check * Add Wonderland Book Check * Add OC Green Trinity * Add Inferno Band Event * Add Kurt Zisa Zantetsuken and Unknown EXP Necklace checks * Update Locations.py * Fix Final Ansem Goal * Update __init__.py * Update __init__.py * Add options to exclude super bosses and 100 acre wood * Fix puppies trp, remove cid check * Fix 100 Acre Wood Option * Material to Empty Bottle * Fixed rules, location names, etc * Fix super bosses * Add item + location groups, level sanity * Fix location and item group names * Add Bad Starting Weapons Option * Logic Error for 100 Acre Wood * Update Rules.py * Update __init__.py * Fixes related to randomized keyblade stats and super bosses * Credits and Fixes * Logic fixes, location name group changes * Update Options.py * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Scipio Wright * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Scipio Wright * Update .gitignore * Update CODEOWNERS * Update docs/CODEOWNERS Co-authored-by: Scipio Wright * Fixed Atlantica item group name * Update CODEOWNERS * Update Client.py * Update Items.py * Update __init__.py Co-authored-by: Scipio Wright * Update Rules.py Co-authored-by: Scipio Wright * Update Rules.py Co-authored-by: Scipio Wright * Update Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Fixed report group name * Fixes for PR * Update Options.py * Push changes for making the Final Rest Door appear, few option fixes * Update Rules.py * Website formatting, 0 min for reports, option description typo * Create KH1Client.py * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Scipio Wright * Update Options.py * Update Options.py * Update Rules.py * Update Rules.py * Update Rules.py * Add Donald and Goofy Death Link * Add fight logic for optional bosses * Update __init__.py * Update Options.py * Update worlds/kh1/Options.py Co-authored-by: Scipio Wright * Update Client.py * Update kh1_en.md * Update __init__.py * Cleaning up for PR * Update Client.py * Added event locations for vanilla items * Add proper location groups and auto hint synth shop items when entering * so many changes * Update Rules.py * fixed oathkeeper and crabclaw logic * Update Rules.py * Update Rules.py * Update Rules.py * Update Rules.py * Update en_Kingdom Hearts.md * Update en_Kingdom Hearts.md * fixing text * Update kh1_en.md * Addition of new key items * Update Regions.py * Push for start item from pool test * Update worlds/kh1/Options.py Co-authored-by: Scipio Wright * Document update * Update Rules.py * Added starting world range and final rest goal option * Update kh1_en.md * Update en_Kingdom Hearts.md * Update __init__.py * Update __init__.py * Clean up options descriptions * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/Options.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Client.py Co-authored-by: Scipio Wright * Fix grammar in document * Update __init__.py * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Removed return type * Update __init__.py * Update __init__.py * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update __init__.py * Fix missing i replacement, rework set rules to use "self" instead of a million arguments * Update KH1Client.py Co-authored-by: Doug Hoskisson * Reformat rules, fix bug with exp mult, add to readme * Clean up regions, fix client * Fix item send prompt * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/test/test_goal.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Items.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Locations.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Regions.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Locations.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Locations.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Items.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Regions.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Regions.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Doug Hoskisson * Fix so many suggestions * removed junk in missable locations option * Update __init__.py * Change credits order * Update en_Kingdom Hearts.md * Standardize punctuation * Update en_Kingdom Hearts.md * Update en_Kingdom Hearts.md * Update Regions.py * Removed "disclude" options in generation fillers * Update Rules.py * Update __init__.py * Fix cemetery typo * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Add option groups and option presets * Update worlds/kh1/__init__.py That's a good idea! Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Presets.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * fixed HB rule and formatting on a line in Items.py * Fix logic bug with Geppetto's House postcard * Update Rules.py * Update Options.py * Update __init__.py * Update __init__.py * Huge under-the-hood update for PR * More updates for PR * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update __init__.py --------- Co-authored-by: Scipio Wright Co-authored-by: Doug Hoskisson Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --- KH1Client.py | 9 + README.md | 1 + docs/CODEOWNERS | 3 + worlds/kh1/Client.py | 258 ++++ worlds/kh1/Items.py | 532 +++++++ worlds/kh1/Locations.py | 590 ++++++++ worlds/kh1/Options.py | 445 ++++++ worlds/kh1/Presets.py | 177 +++ worlds/kh1/Regions.py | 516 +++++++ worlds/kh1/Rules.py | 1947 ++++++++++++++++++++++++++ worlds/kh1/__init__.py | 282 ++++ worlds/kh1/docs/en_Kingdom Hearts.md | 88 ++ worlds/kh1/docs/kh1_en.md | 54 + worlds/kh1/test/__init__.py | 5 + worlds/kh1/test/test_goal.py | 33 + 15 files changed, 4940 insertions(+) create mode 100644 KH1Client.py create mode 100644 worlds/kh1/Client.py create mode 100644 worlds/kh1/Items.py create mode 100644 worlds/kh1/Locations.py create mode 100644 worlds/kh1/Options.py create mode 100644 worlds/kh1/Presets.py create mode 100644 worlds/kh1/Regions.py create mode 100644 worlds/kh1/Rules.py create mode 100644 worlds/kh1/__init__.py create mode 100644 worlds/kh1/docs/en_Kingdom Hearts.md create mode 100644 worlds/kh1/docs/kh1_en.md create mode 100644 worlds/kh1/test/__init__.py create mode 100644 worlds/kh1/test/test_goal.py diff --git a/KH1Client.py b/KH1Client.py new file mode 100644 index 000000000000..4c3ed501901b --- /dev/null +++ b/KH1Client.py @@ -0,0 +1,9 @@ +if __name__ == '__main__': + import ModuleUpdate + ModuleUpdate.update() + + import Utils + Utils.init_logging("KH1Client", exception_logger="Client") + + from worlds.kh1.Client import launch + launch() diff --git a/README.md b/README.md index 5b66e3db8782..a2e9d3e5e5a3 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ Currently, the following games are supported: * Yu-Gi-Oh! Ultimate Masters: World Championship Tournament 2006 * A Hat in Time * Old School Runescape +* Kingdom Hearts 1 For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/). Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index 4f012c306be9..bba79c649fc1 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -78,6 +78,9 @@ # Kirby's Dream Land 3 /worlds/kdl3/ @Silvris +# Kingdom Hearts +/worlds/kh1/ @gaithern + # Kingdom Hearts 2 /worlds/kh2/ @JaredWeakStrike diff --git a/worlds/kh1/Client.py b/worlds/kh1/Client.py new file mode 100644 index 000000000000..acfd5dba3825 --- /dev/null +++ b/worlds/kh1/Client.py @@ -0,0 +1,258 @@ +from __future__ import annotations +import os +import json +import sys +import asyncio +import shutil +import logging +import re +import time +from calendar import timegm + +import ModuleUpdate +ModuleUpdate.update() + +import Utils +death_link = False +item_num = 1 + +logger = logging.getLogger("Client") + +if __name__ == "__main__": + Utils.init_logging("KH1Client", exception_logger="Client") + +from NetUtils import NetworkItem, ClientStatus +from CommonClient import gui_enabled, logger, get_base_parser, ClientCommandProcessor, \ + CommonContext, server_loop + + +def check_stdin() -> None: + if Utils.is_windows and sys.stdin: + print("WARNING: Console input is not routed reliably on Windows, use the GUI instead.") + +class KH1ClientCommandProcessor(ClientCommandProcessor): + def _cmd_deathlink(self): + """Toggles Deathlink""" + global death_link + if death_link: + death_link = False + self.output(f"Death Link turned off") + else: + death_link = True + self.output(f"Death Link turned on") + +class KH1Context(CommonContext): + command_processor: int = KH1ClientCommandProcessor + game = "Kingdom Hearts" + items_handling = 0b111 # full remote + + def __init__(self, server_address, password): + super(KH1Context, self).__init__(server_address, password) + self.send_index: int = 0 + self.syncing = False + self.awaiting_bridge = False + # self.game_communication_path: files go in this path to pass data between us and the actual game + if "localappdata" in os.environ: + self.game_communication_path = os.path.expandvars(r"%localappdata%/KH1FM") + else: + self.game_communication_path = os.path.expandvars(r"$HOME/KH1FM") + if not os.path.exists(self.game_communication_path): + os.makedirs(self.game_communication_path) + for root, dirs, files in os.walk(self.game_communication_path): + for file in files: + if file.find("obtain") <= -1: + os.remove(root+"/"+file) + + async def server_auth(self, password_requested: bool = False): + if password_requested and not self.password: + await super(KH1Context, self).server_auth(password_requested) + await self.get_username() + await self.send_connect() + + async def connection_closed(self): + await super(KH1Context, self).connection_closed() + for root, dirs, files in os.walk(self.game_communication_path): + for file in files: + if file.find("obtain") <= -1: + os.remove(root + "/" + file) + global item_num + item_num = 1 + + @property + def endpoints(self): + if self.server: + return [self.server] + else: + return [] + + async def shutdown(self): + await super(KH1Context, self).shutdown() + for root, dirs, files in os.walk(self.game_communication_path): + for file in files: + if file.find("obtain") <= -1: + os.remove(root+"/"+file) + global item_num + item_num = 1 + + def on_package(self, cmd: str, args: dict): + if cmd in {"Connected"}: + if not os.path.exists(self.game_communication_path): + os.makedirs(self.game_communication_path) + for ss in self.checked_locations: + filename = f"send{ss}" + with open(os.path.join(self.game_communication_path, filename), 'w') as f: + f.close() + + #Handle Slot Data + for key in list(args['slot_data'].keys()): + with open(os.path.join(self.game_communication_path, key + ".cfg"), 'w') as f: + f.write(str(args['slot_data'][key])) + f.close() + + ###Support Legacy Games + if "Required Reports" in list(args['slot_data'].keys()) and "required_reports_eotw" not in list(args['slot_data'].keys()): + reports_required = args['slot_data']["Required Reports"] + with open(os.path.join(self.game_communication_path, "required_reports.cfg"), 'w') as f: + f.write(str(reports_required)) + f.close() + ###End Support Legacy Games + + #End Handle Slot Data + + if cmd in {"ReceivedItems"}: + start_index = args["index"] + if start_index != len(self.items_received): + global item_num + for item in args['items']: + found = False + item_filename = f"AP_{str(item_num)}.item" + for filename in os.listdir(self.game_communication_path): + if filename == item_filename: + found = True + if not found: + with open(os.path.join(self.game_communication_path, item_filename), 'w') as f: + f.write(str(NetworkItem(*item).item) + "\n" + str(NetworkItem(*item).location) + "\n" + str(NetworkItem(*item).player)) + f.close() + item_num = item_num + 1 + + if cmd in {"RoomUpdate"}: + if "checked_locations" in args: + for ss in self.checked_locations: + filename = f"send{ss}" + with open(os.path.join(self.game_communication_path, filename), 'w') as f: + f.close() + + if cmd in {"PrintJSON"} and "type" in args: + if args["type"] == "ItemSend": + item = args["item"] + networkItem = NetworkItem(*item) + recieverID = args["receiving"] + senderID = networkItem.player + locationID = networkItem.location + if recieverID != self.slot and senderID == self.slot: + itemName = self.item_names.lookup_in_slot(networkItem.item, recieverID) + itemCategory = networkItem.flags + recieverName = self.player_names[recieverID] + filename = "sent" + with open(os.path.join(self.game_communication_path, filename), 'w') as f: + f.write( + re.sub('[^A-Za-z0-9 ]+', '',str(itemName))[:15] + "\n" + + re.sub('[^A-Za-z0-9 ]+', '',str(recieverName))[:6] + "\n" + + str(itemCategory) + "\n" + + str(locationID)) + f.close() + + def on_deathlink(self, data: dict[str, object]): + self.last_death_link = max(data["time"], self.last_death_link) + text = data.get("cause", "") + if text: + logger.info(f"DeathLink: {text}") + else: + logger.info(f"DeathLink: Received from {data['source']}") + with open(os.path.join(self.game_communication_path, 'dlreceive'), 'w') as f: + f.write(str(int(data["time"]))) + f.close() + + def run_gui(self): + """Import kivy UI system and start running it as self.ui_task.""" + from kvui import GameManager + + class KH1Manager(GameManager): + logging_pairs = [ + ("Client", "Archipelago") + ] + base_title = "Archipelago KH1 Client" + + self.ui = KH1Manager(self) + self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI") + + +async def game_watcher(ctx: KH1Context): + from .Locations import lookup_id_to_name + while not ctx.exit_event.is_set(): + global death_link + if death_link and "DeathLink" not in ctx.tags: + await ctx.update_death_link(death_link) + if not death_link and "DeathLink" in ctx.tags: + await ctx.update_death_link(death_link) + if ctx.syncing == True: + sync_msg = [{'cmd': 'Sync'}] + if ctx.locations_checked: + sync_msg.append({"cmd": "LocationChecks", "locations": list(ctx.locations_checked)}) + await ctx.send_msgs(sync_msg) + ctx.syncing = False + sending = [] + victory = False + for root, dirs, files in os.walk(ctx.game_communication_path): + for file in files: + if file.find("send") > -1: + st = file.split("send", -1)[1] + if st != "nil": + sending = sending+[(int(st))] + if file.find("victory") > -1: + victory = True + if file.find("dlsend") > -1 and "DeathLink" in ctx.tags: + st = file.split("dlsend", -1)[1] + if st != "nil": + if timegm(time.strptime(st, '%Y%m%d%H%M%S')) > ctx.last_death_link and int(time.time()) % int(timegm(time.strptime(st, '%Y%m%d%H%M%S'))) < 10: + await ctx.send_death(death_text = "Sora was defeated!") + if file.find("insynthshop") > -1: + await ctx.send_msgs([{ + "cmd": "LocationScouts", + "locations": [2656401,2656402,2656403,2656404,2656405,2656406], + "create_as_hint": 2 + }]) + ctx.locations_checked = sending + message = [{"cmd": 'LocationChecks', "locations": sending}] + await ctx.send_msgs(message) + if not ctx.finished_game and victory: + await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}]) + ctx.finished_game = True + await asyncio.sleep(0.1) + + +def launch(): + async def main(args): + ctx = KH1Context(args.connect, args.password) + ctx.server_task = asyncio.create_task(server_loop(ctx), name="server loop") + if gui_enabled: + ctx.run_gui() + ctx.run_cli() + progression_watcher = asyncio.create_task( + game_watcher(ctx), name="KH1ProgressionWatcher") + + await ctx.exit_event.wait() + ctx.server_address = None + + await progression_watcher + + await ctx.shutdown() + + import colorama + + parser = get_base_parser(description="KH1 Client, for text interfacing.") + + args, rest = parser.parse_known_args() + colorama.init() + asyncio.run(main(args)) + colorama.deinit() diff --git a/worlds/kh1/Items.py b/worlds/kh1/Items.py new file mode 100644 index 000000000000..bac98a9b3284 --- /dev/null +++ b/worlds/kh1/Items.py @@ -0,0 +1,532 @@ +from typing import Dict, NamedTuple, Optional, Set + +from BaseClasses import Item, ItemClassification + + +class KH1Item(Item): + game: str = "Kingdom Hearts" + + +class KH1ItemData(NamedTuple): + category: str + code: int + classification: ItemClassification = ItemClassification.filler + max_quantity: int = 1 + weight: int = 1 + + +def get_items_by_category(category: str) -> Dict[str, KH1ItemData]: + item_dict: Dict[str, KH1ItemData] = {} + for name, data in item_table.items(): + if data.category == category: + item_dict.setdefault(name, data) + + return item_dict + + +item_table: Dict[str, KH1ItemData] = { + "Victory": KH1ItemData("VIC", code = 264_0000, classification = ItemClassification.progression, ), + "Potion": KH1ItemData("Item", code = 264_1001, classification = ItemClassification.filler, ), + "Hi-Potion": KH1ItemData("Item", code = 264_1002, classification = ItemClassification.filler, ), + "Ether": KH1ItemData("Item", code = 264_1003, classification = ItemClassification.filler, ), + "Elixir": KH1ItemData("Item", code = 264_1004, classification = ItemClassification.filler, ), + #"B05": KH1ItemData("Item", code = 264_1005, classification = ItemClassification.filler, ), + "Mega-Potion": KH1ItemData("Item", code = 264_1006, classification = ItemClassification.filler, ), + "Mega-Ether": KH1ItemData("Item", code = 264_1007, classification = ItemClassification.filler, ), + "Megalixir": KH1ItemData("Item", code = 264_1008, classification = ItemClassification.filler, ), + #"Fury Stone": KH1ItemData("Synthesis", code = 264_1009, classification = ItemClassification.filler, ), + #"Power Stone": KH1ItemData("Synthesis", code = 264_1010, classification = ItemClassification.filler, ), + #"Energy Stone": KH1ItemData("Synthesis", code = 264_1011, classification = ItemClassification.filler, ), + #"Blazing Stone": KH1ItemData("Synthesis", code = 264_1012, classification = ItemClassification.filler, ), + #"Frost Stone": KH1ItemData("Synthesis", code = 264_1013, classification = ItemClassification.filler, ), + #"Lightning Stone": KH1ItemData("Synthesis", code = 264_1014, classification = ItemClassification.filler, ), + #"Dazzling Stone": KH1ItemData("Synthesis", code = 264_1015, classification = ItemClassification.filler, ), + #"Stormy Stone": KH1ItemData("Synthesis", code = 264_1016, classification = ItemClassification.filler, ), + "Protect Chain": KH1ItemData("Accessory", code = 264_1017, classification = ItemClassification.useful, ), + "Protera Chain": KH1ItemData("Accessory", code = 264_1018, classification = ItemClassification.useful, ), + "Protega Chain": KH1ItemData("Accessory", code = 264_1019, classification = ItemClassification.useful, ), + "Fire Ring": KH1ItemData("Accessory", code = 264_1020, classification = ItemClassification.useful, ), + "Fira Ring": KH1ItemData("Accessory", code = 264_1021, classification = ItemClassification.useful, ), + "Firaga Ring": KH1ItemData("Accessory", code = 264_1022, classification = ItemClassification.useful, ), + "Blizzard Ring": KH1ItemData("Accessory", code = 264_1023, classification = ItemClassification.useful, ), + "Blizzara Ring": KH1ItemData("Accessory", code = 264_1024, classification = ItemClassification.useful, ), + "Blizzaga Ring": KH1ItemData("Accessory", code = 264_1025, classification = ItemClassification.useful, ), + "Thunder Ring": KH1ItemData("Accessory", code = 264_1026, classification = ItemClassification.useful, ), + "Thundara Ring": KH1ItemData("Accessory", code = 264_1027, classification = ItemClassification.useful, ), + "Thundaga Ring": KH1ItemData("Accessory", code = 264_1028, classification = ItemClassification.useful, ), + "Ability Stud": KH1ItemData("Accessory", code = 264_1029, classification = ItemClassification.useful, ), + "Guard Earring": KH1ItemData("Accessory", code = 264_1030, classification = ItemClassification.useful, ), + "Master Earring": KH1ItemData("Accessory", code = 264_1031, classification = ItemClassification.useful, ), + "Chaos Ring": KH1ItemData("Accessory", code = 264_1032, classification = ItemClassification.useful, ), + "Dark Ring": KH1ItemData("Accessory", code = 264_1033, classification = ItemClassification.useful, ), + "Element Ring": KH1ItemData("Accessory", code = 264_1034, classification = ItemClassification.useful, ), + "Three Stars": KH1ItemData("Accessory", code = 264_1035, classification = ItemClassification.useful, ), + "Power Chain": KH1ItemData("Accessory", code = 264_1036, classification = ItemClassification.useful, ), + "Golem Chain": KH1ItemData("Accessory", code = 264_1037, classification = ItemClassification.useful, ), + "Titan Chain": KH1ItemData("Accessory", code = 264_1038, classification = ItemClassification.useful, ), + "Energy Bangle": KH1ItemData("Accessory", code = 264_1039, classification = ItemClassification.useful, ), + "Angel Bangle": KH1ItemData("Accessory", code = 264_1040, classification = ItemClassification.useful, ), + "Gaia Bangle": KH1ItemData("Accessory", code = 264_1041, classification = ItemClassification.useful, ), + "Magic Armlet": KH1ItemData("Accessory", code = 264_1042, classification = ItemClassification.useful, ), + "Rune Armlet": KH1ItemData("Accessory", code = 264_1043, classification = ItemClassification.useful, ), + "Atlas Armlet": KH1ItemData("Accessory", code = 264_1044, classification = ItemClassification.useful, ), + "Heartguard": KH1ItemData("Accessory", code = 264_1045, classification = ItemClassification.useful, ), + "Ribbon": KH1ItemData("Accessory", code = 264_1046, classification = ItemClassification.useful, ), + "Crystal Crown": KH1ItemData("Accessory", code = 264_1047, classification = ItemClassification.useful, ), + "Brave Warrior": KH1ItemData("Accessory", code = 264_1048, classification = ItemClassification.useful, ), + "Ifrit's Horn": KH1ItemData("Accessory", code = 264_1049, classification = ItemClassification.useful, ), + "Inferno Band": KH1ItemData("Accessory", code = 264_1050, classification = ItemClassification.useful, ), + "White Fang": KH1ItemData("Accessory", code = 264_1051, classification = ItemClassification.useful, ), + "Ray of Light": KH1ItemData("Accessory", code = 264_1052, classification = ItemClassification.useful, ), + "Holy Circlet": KH1ItemData("Accessory", code = 264_1053, classification = ItemClassification.useful, ), + "Raven's Claw": KH1ItemData("Accessory", code = 264_1054, classification = ItemClassification.useful, ), + "Omega Arts": KH1ItemData("Accessory", code = 264_1055, classification = ItemClassification.useful, ), + "EXP Earring": KH1ItemData("Accessory", code = 264_1056, classification = ItemClassification.useful, ), + #"A41": KH1ItemData("Accessory", code = 264_1057, classification = ItemClassification.useful, ), + "EXP Ring": KH1ItemData("Accessory", code = 264_1058, classification = ItemClassification.useful, ), + "EXP Bracelet": KH1ItemData("Accessory", code = 264_1059, classification = ItemClassification.useful, ), + "EXP Necklace": KH1ItemData("Accessory", code = 264_1060, classification = ItemClassification.useful, ), + "Firagun Band": KH1ItemData("Accessory", code = 264_1061, classification = ItemClassification.useful, ), + "Blizzagun Band": KH1ItemData("Accessory", code = 264_1062, classification = ItemClassification.useful, ), + "Thundagun Band": KH1ItemData("Accessory", code = 264_1063, classification = ItemClassification.useful, ), + "Ifrit Belt": KH1ItemData("Accessory", code = 264_1064, classification = ItemClassification.useful, ), + "Shiva Belt": KH1ItemData("Accessory", code = 264_1065, classification = ItemClassification.useful, ), + "Ramuh Belt": KH1ItemData("Accessory", code = 264_1066, classification = ItemClassification.useful, ), + "Moogle Badge": KH1ItemData("Accessory", code = 264_1067, classification = ItemClassification.useful, ), + "Cosmic Arts": KH1ItemData("Accessory", code = 264_1068, classification = ItemClassification.useful, ), + "Royal Crown": KH1ItemData("Accessory", code = 264_1069, classification = ItemClassification.useful, ), + "Prime Cap": KH1ItemData("Accessory", code = 264_1070, classification = ItemClassification.useful, ), + "Obsidian Ring": KH1ItemData("Accessory", code = 264_1071, classification = ItemClassification.useful, ), + #"A56": KH1ItemData("Accessory", code = 264_1072, classification = ItemClassification.filler, ), + #"A57": KH1ItemData("Accessory", code = 264_1073, classification = ItemClassification.filler, ), + #"A58": KH1ItemData("Accessory", code = 264_1074, classification = ItemClassification.filler, ), + #"A59": KH1ItemData("Accessory", code = 264_1075, classification = ItemClassification.filler, ), + #"A60": KH1ItemData("Accessory", code = 264_1076, classification = ItemClassification.filler, ), + #"A61": KH1ItemData("Accessory", code = 264_1077, classification = ItemClassification.filler, ), + #"A62": KH1ItemData("Accessory", code = 264_1078, classification = ItemClassification.filler, ), + #"A63": KH1ItemData("Accessory", code = 264_1079, classification = ItemClassification.filler, ), + #"A64": KH1ItemData("Accessory", code = 264_1080, classification = ItemClassification.filler, ), + #"Kingdom Key": KH1ItemData("Keyblades", code = 264_1081, classification = ItemClassification.useful, ), + #"Dream Sword": KH1ItemData("Keyblades", code = 264_1082, classification = ItemClassification.useful, ), + #"Dream Shield": KH1ItemData("Keyblades", code = 264_1083, classification = ItemClassification.useful, ), + #"Dream Rod": KH1ItemData("Keyblades", code = 264_1084, classification = ItemClassification.useful, ), + "Wooden Sword": KH1ItemData("Keyblades", code = 264_1085, classification = ItemClassification.useful, ), + "Jungle King": KH1ItemData("Keyblades", code = 264_1086, classification = ItemClassification.progression, ), + "Three Wishes": KH1ItemData("Keyblades", code = 264_1087, classification = ItemClassification.progression, ), + "Fairy Harp": KH1ItemData("Keyblades", code = 264_1088, classification = ItemClassification.progression, ), + "Pumpkinhead": KH1ItemData("Keyblades", code = 264_1089, classification = ItemClassification.progression, ), + "Crabclaw": KH1ItemData("Keyblades", code = 264_1090, classification = ItemClassification.useful, ), + "Divine Rose": KH1ItemData("Keyblades", code = 264_1091, classification = ItemClassification.progression, ), + "Spellbinder": KH1ItemData("Keyblades", code = 264_1092, classification = ItemClassification.useful, ), + "Olympia": KH1ItemData("Keyblades", code = 264_1093, classification = ItemClassification.progression, ), + "Lionheart": KH1ItemData("Keyblades", code = 264_1094, classification = ItemClassification.progression, ), + "Metal Chocobo": KH1ItemData("Keyblades", code = 264_1095, classification = ItemClassification.useful, ), + "Oathkeeper": KH1ItemData("Keyblades", code = 264_1096, classification = ItemClassification.progression, ), + "Oblivion": KH1ItemData("Keyblades", code = 264_1097, classification = ItemClassification.progression, ), + "Lady Luck": KH1ItemData("Keyblades", code = 264_1098, classification = ItemClassification.progression, ), + "Wishing Star": KH1ItemData("Keyblades", code = 264_1099, classification = ItemClassification.progression, ), + "Ultima Weapon": KH1ItemData("Keyblades", code = 264_1100, classification = ItemClassification.useful, ), + "Diamond Dust": KH1ItemData("Keyblades", code = 264_1101, classification = ItemClassification.useful, ), + "One-Winged Angel": KH1ItemData("Keyblades", code = 264_1102, classification = ItemClassification.useful, ), + #"Mage's Staff": KH1ItemData("Weapons", code = 264_1103, classification = ItemClassification.filler, ), + "Morning Star": KH1ItemData("Weapons", code = 264_1104, classification = ItemClassification.useful, ), + "Shooting Star": KH1ItemData("Weapons", code = 264_1105, classification = ItemClassification.useful, ), + "Magus Staff": KH1ItemData("Weapons", code = 264_1106, classification = ItemClassification.useful, ), + "Wisdom Staff": KH1ItemData("Weapons", code = 264_1107, classification = ItemClassification.useful, ), + "Warhammer": KH1ItemData("Weapons", code = 264_1108, classification = ItemClassification.useful, ), + "Silver Mallet": KH1ItemData("Weapons", code = 264_1109, classification = ItemClassification.useful, ), + "Grand Mallet": KH1ItemData("Weapons", code = 264_1110, classification = ItemClassification.useful, ), + "Lord Fortune": KH1ItemData("Weapons", code = 264_1111, classification = ItemClassification.useful, ), + "Violetta": KH1ItemData("Weapons", code = 264_1112, classification = ItemClassification.useful, ), + "Dream Rod (Donald)": KH1ItemData("Weapons", code = 264_1113, classification = ItemClassification.useful, ), + "Save the Queen": KH1ItemData("Weapons", code = 264_1114, classification = ItemClassification.useful, ), + "Wizard's Relic": KH1ItemData("Weapons", code = 264_1115, classification = ItemClassification.useful, ), + "Meteor Strike": KH1ItemData("Weapons", code = 264_1116, classification = ItemClassification.useful, ), + "Fantasista": KH1ItemData("Weapons", code = 264_1117, classification = ItemClassification.useful, ), + #"Unused (Donald)": KH1ItemData("Weapons", code = 264_1118, classification = ItemClassification.filler, ), + #"Knight's Shield": KH1ItemData("Weapons", code = 264_1119, classification = ItemClassification.filler, ), + "Mythril Shield": KH1ItemData("Weapons", code = 264_1120, classification = ItemClassification.useful, ), + "Onyx Shield": KH1ItemData("Weapons", code = 264_1121, classification = ItemClassification.useful, ), + "Stout Shield": KH1ItemData("Weapons", code = 264_1122, classification = ItemClassification.useful, ), + "Golem Shield": KH1ItemData("Weapons", code = 264_1123, classification = ItemClassification.useful, ), + "Adamant Shield": KH1ItemData("Weapons", code = 264_1124, classification = ItemClassification.useful, ), + "Smasher": KH1ItemData("Weapons", code = 264_1125, classification = ItemClassification.useful, ), + "Gigas Fist": KH1ItemData("Weapons", code = 264_1126, classification = ItemClassification.useful, ), + "Genji Shield": KH1ItemData("Weapons", code = 264_1127, classification = ItemClassification.useful, ), + "Herc's Shield": KH1ItemData("Weapons", code = 264_1128, classification = ItemClassification.useful, ), + "Dream Shield (Goofy)": KH1ItemData("Weapons", code = 264_1129, classification = ItemClassification.useful, ), + "Save the King": KH1ItemData("Weapons", code = 264_1130, classification = ItemClassification.useful, ), + "Defender": KH1ItemData("Weapons", code = 264_1131, classification = ItemClassification.useful, ), + "Mighty Shield": KH1ItemData("Weapons", code = 264_1132, classification = ItemClassification.useful, ), + "Seven Elements": KH1ItemData("Weapons", code = 264_1133, classification = ItemClassification.useful, ), + #"Unused (Goofy)": KH1ItemData("Weapons", code = 264_1134, classification = ItemClassification.filler, ), + #"Spear": KH1ItemData("Weapons", code = 264_1135, classification = ItemClassification.filler, ), + #"No Weapon": KH1ItemData("Weapons", code = 264_1136, classification = ItemClassification.filler, ), + #"Genie": KH1ItemData("Weapons", code = 264_1137, classification = ItemClassification.filler, ), + #"No Weapon": KH1ItemData("Weapons", code = 264_1138, classification = ItemClassification.filler, ), + #"No Weapon": KH1ItemData("Weapons", code = 264_1139, classification = ItemClassification.filler, ), + #"Tinker Bell": KH1ItemData("Weapons", code = 264_1140, classification = ItemClassification.filler, ), + #"Claws": KH1ItemData("Weapons", code = 264_1141, classification = ItemClassification.filler, ), + "Tent": KH1ItemData("Camping", code = 264_1142, classification = ItemClassification.filler, ), + "Camping Set": KH1ItemData("Camping", code = 264_1143, classification = ItemClassification.filler, ), + "Cottage": KH1ItemData("Camping", code = 264_1144, classification = ItemClassification.filler, ), + #"C04": KH1ItemData("Camping", code = 264_1145, classification = ItemClassification.filler, ), + #"C05": KH1ItemData("Camping", code = 264_1146, classification = ItemClassification.filler, ), + #"C06": KH1ItemData("Camping", code = 264_1147, classification = ItemClassification.filler, ), + #"C07": KH1ItemData("Camping", code = 264_1148, classification = ItemClassification.filler, ), + "Ansem's Report 11": KH1ItemData("Reports", code = 264_1149, classification = ItemClassification.progression, ), + "Ansem's Report 12": KH1ItemData("Reports", code = 264_1150, classification = ItemClassification.progression, ), + "Ansem's Report 13": KH1ItemData("Reports", code = 264_1151, classification = ItemClassification.progression, ), + "Power Up": KH1ItemData("Stat Ups", code = 264_1152, classification = ItemClassification.filler, ), + "Defense Up": KH1ItemData("Stat Ups", code = 264_1153, classification = ItemClassification.filler, ), + "AP Up": KH1ItemData("Stat Ups", code = 264_1154, classification = ItemClassification.filler, ), + #"Serenity Power": KH1ItemData("Synthesis", code = 264_1155, classification = ItemClassification.filler, ), + #"Dark Matter": KH1ItemData("Synthesis", code = 264_1156, classification = ItemClassification.filler, ), + #"Mythril Stone": KH1ItemData("Synthesis", code = 264_1157, classification = ItemClassification.filler, ), + "Fire Arts": KH1ItemData("Key", code = 264_1158, classification = ItemClassification.progression, ), + "Blizzard Arts": KH1ItemData("Key", code = 264_1159, classification = ItemClassification.progression, ), + "Thunder Arts": KH1ItemData("Key", code = 264_1160, classification = ItemClassification.progression, ), + "Cure Arts": KH1ItemData("Key", code = 264_1161, classification = ItemClassification.progression, ), + "Gravity Arts": KH1ItemData("Key", code = 264_1162, classification = ItemClassification.progression, ), + "Stop Arts": KH1ItemData("Key", code = 264_1163, classification = ItemClassification.progression, ), + "Aero Arts": KH1ItemData("Key", code = 264_1164, classification = ItemClassification.progression, ), + #"Shiitank Rank": KH1ItemData("Synthesis", code = 264_1165, classification = ItemClassification.filler, ), + #"Matsutake Rank": KH1ItemData("Synthesis", code = 264_1166, classification = ItemClassification.filler, ), + #"Mystery Mold": KH1ItemData("Synthesis", code = 264_1167, classification = ItemClassification.filler, ), + "Ansem's Report 1": KH1ItemData("Reports", code = 264_1168, classification = ItemClassification.progression, ), + "Ansem's Report 2": KH1ItemData("Reports", code = 264_1169, classification = ItemClassification.progression, ), + "Ansem's Report 3": KH1ItemData("Reports", code = 264_1170, classification = ItemClassification.progression, ), + "Ansem's Report 4": KH1ItemData("Reports", code = 264_1171, classification = ItemClassification.progression, ), + "Ansem's Report 5": KH1ItemData("Reports", code = 264_1172, classification = ItemClassification.progression, ), + "Ansem's Report 6": KH1ItemData("Reports", code = 264_1173, classification = ItemClassification.progression, ), + "Ansem's Report 7": KH1ItemData("Reports", code = 264_1174, classification = ItemClassification.progression, ), + "Ansem's Report 8": KH1ItemData("Reports", code = 264_1175, classification = ItemClassification.progression, ), + "Ansem's Report 9": KH1ItemData("Reports", code = 264_1176, classification = ItemClassification.progression, ), + "Ansem's Report 10": KH1ItemData("Reports", code = 264_1177, classification = ItemClassification.progression, ), + #"Khama Vol. 8": KH1ItemData("Key", code = 264_1178, classification = ItemClassification.progression, ), + #"Salegg Vol. 6": KH1ItemData("Key", code = 264_1179, classification = ItemClassification.progression, ), + #"Azal Vol. 3": KH1ItemData("Key", code = 264_1180, classification = ItemClassification.progression, ), + #"Mava Vol. 3": KH1ItemData("Key", code = 264_1181, classification = ItemClassification.progression, ), + #"Mava Vol. 6": KH1ItemData("Key", code = 264_1182, classification = ItemClassification.progression, ), + "Theon Vol. 6": KH1ItemData("Key", code = 264_1183, classification = ItemClassification.progression, ), + #"Nahara Vol. 5": KH1ItemData("Key", code = 264_1184, classification = ItemClassification.progression, ), + #"Hafet Vol. 4": KH1ItemData("Key", code = 264_1185, classification = ItemClassification.progression, ), + "Empty Bottle": KH1ItemData("Key", code = 264_1186, classification = ItemClassification.progression, max_quantity = 6 ), + #"Old Book": KH1ItemData("Key", code = 264_1187, classification = ItemClassification.progression, ), + "Emblem Piece (Flame)": KH1ItemData("Key", code = 264_1188, classification = ItemClassification.progression, ), + "Emblem Piece (Chest)": KH1ItemData("Key", code = 264_1189, classification = ItemClassification.progression, ), + "Emblem Piece (Statue)": KH1ItemData("Key", code = 264_1190, classification = ItemClassification.progression, ), + "Emblem Piece (Fountain)": KH1ItemData("Key", code = 264_1191, classification = ItemClassification.progression, ), + #"Log": KH1ItemData("Key", code = 264_1192, classification = ItemClassification.progression, ), + #"Cloth": KH1ItemData("Key", code = 264_1193, classification = ItemClassification.progression, ), + #"Rope": KH1ItemData("Key", code = 264_1194, classification = ItemClassification.progression, ), + #"Seagull Egg": KH1ItemData("Key", code = 264_1195, classification = ItemClassification.progression, ), + #"Fish": KH1ItemData("Key", code = 264_1196, classification = ItemClassification.progression, ), + #"Mushroom": KH1ItemData("Key", code = 264_1197, classification = ItemClassification.progression, ), + #"Coconut": KH1ItemData("Key", code = 264_1198, classification = ItemClassification.progression, ), + #"Drinking Water": KH1ItemData("Key", code = 264_1199, classification = ItemClassification.progression, ), + #"Navi-G Piece 1": KH1ItemData("Key", code = 264_1200, classification = ItemClassification.progression, ), + #"Navi-G Piece 2": KH1ItemData("Key", code = 264_1201, classification = ItemClassification.progression, ), + #"Navi-Gummi Unused": KH1ItemData("Key", code = 264_1202, classification = ItemClassification.progression, ), + #"Navi-G Piece 3": KH1ItemData("Key", code = 264_1203, classification = ItemClassification.progression, ), + #"Navi-G Piece 4": KH1ItemData("Key", code = 264_1204, classification = ItemClassification.progression, ), + #"Navi-Gummi": KH1ItemData("Key", code = 264_1205, classification = ItemClassification.progression, ), + #"Watergleam": KH1ItemData("Key", code = 264_1206, classification = ItemClassification.progression, ), + #"Naturespark": KH1ItemData("Key", code = 264_1207, classification = ItemClassification.progression, ), + #"Fireglow": KH1ItemData("Key", code = 264_1208, classification = ItemClassification.progression, ), + #"Earthshine": KH1ItemData("Key", code = 264_1209, classification = ItemClassification.progression, ), + "Crystal Trident": KH1ItemData("Key", code = 264_1210, classification = ItemClassification.progression, ), + "Postcard": KH1ItemData("Key", code = 264_1211, classification = ItemClassification.progression, max_quantity = 10), + "Torn Page 1": KH1ItemData("Torn Pages", code = 264_1212, classification = ItemClassification.progression, ), + "Torn Page 2": KH1ItemData("Torn Pages", code = 264_1213, classification = ItemClassification.progression, ), + "Torn Page 3": KH1ItemData("Torn Pages", code = 264_1214, classification = ItemClassification.progression, ), + "Torn Page 4": KH1ItemData("Torn Pages", code = 264_1215, classification = ItemClassification.progression, ), + "Torn Page 5": KH1ItemData("Torn Pages", code = 264_1216, classification = ItemClassification.progression, ), + "Slides": KH1ItemData("Key", code = 264_1217, classification = ItemClassification.progression, ), + #"Slide 2": KH1ItemData("Key", code = 264_1218, classification = ItemClassification.progression, ), + #"Slide 3": KH1ItemData("Key", code = 264_1219, classification = ItemClassification.progression, ), + #"Slide 4": KH1ItemData("Key", code = 264_1220, classification = ItemClassification.progression, ), + #"Slide 5": KH1ItemData("Key", code = 264_1221, classification = ItemClassification.progression, ), + #"Slide 6": KH1ItemData("Key", code = 264_1222, classification = ItemClassification.progression, ), + "Footprints": KH1ItemData("Key", code = 264_1223, classification = ItemClassification.progression, ), + #"Claw Marks": KH1ItemData("Key", code = 264_1224, classification = ItemClassification.progression, ), + #"Stench": KH1ItemData("Key", code = 264_1225, classification = ItemClassification.progression, ), + #"Antenna": KH1ItemData("Key", code = 264_1226, classification = ItemClassification.progression, ), + "Forget-Me-Not": KH1ItemData("Key", code = 264_1227, classification = ItemClassification.progression, ), + "Jack-In-The-Box": KH1ItemData("Key", code = 264_1228, classification = ItemClassification.progression, ), + "Entry Pass": KH1ItemData("Key", code = 264_1229, classification = ItemClassification.progression, ), + #"Hero License": KH1ItemData("Key", code = 264_1230, classification = ItemClassification.progression, ), + #"Pretty Stone": KH1ItemData("Synthesis", code = 264_1231, classification = ItemClassification.filler, ), + #"N41": KH1ItemData("Synthesis", code = 264_1232, classification = ItemClassification.filler, ), + #"Lucid Shard": KH1ItemData("Synthesis", code = 264_1233, classification = ItemClassification.filler, ), + #"Lucid Gem": KH1ItemData("Synthesis", code = 264_1234, classification = ItemClassification.filler, ), + #"Lucid Crystal": KH1ItemData("Synthesis", code = 264_1235, classification = ItemClassification.filler, ), + #"Spirit Shard": KH1ItemData("Synthesis", code = 264_1236, classification = ItemClassification.filler, ), + #"Spirit Gem": KH1ItemData("Synthesis", code = 264_1237, classification = ItemClassification.filler, ), + #"Power Shard": KH1ItemData("Synthesis", code = 264_1238, classification = ItemClassification.filler, ), + #"Power Gem": KH1ItemData("Synthesis", code = 264_1239, classification = ItemClassification.filler, ), + #"Power Crystal": KH1ItemData("Synthesis", code = 264_1240, classification = ItemClassification.filler, ), + #"Blaze Shard": KH1ItemData("Synthesis", code = 264_1241, classification = ItemClassification.filler, ), + #"Blaze Gem": KH1ItemData("Synthesis", code = 264_1242, classification = ItemClassification.filler, ), + #"Frost Shard": KH1ItemData("Synthesis", code = 264_1243, classification = ItemClassification.filler, ), + #"Frost Gem": KH1ItemData("Synthesis", code = 264_1244, classification = ItemClassification.filler, ), + #"Thunder Shard": KH1ItemData("Synthesis", code = 264_1245, classification = ItemClassification.filler, ), + #"Thunder Gem": KH1ItemData("Synthesis", code = 264_1246, classification = ItemClassification.filler, ), + #"Shiny Crystal": KH1ItemData("Synthesis", code = 264_1247, classification = ItemClassification.filler, ), + #"Bright Shard": KH1ItemData("Synthesis", code = 264_1248, classification = ItemClassification.filler, ), + #"Bright Gem": KH1ItemData("Synthesis", code = 264_1249, classification = ItemClassification.filler, ), + #"Bright Crystal": KH1ItemData("Synthesis", code = 264_1250, classification = ItemClassification.filler, ), + #"Mystery Goo": KH1ItemData("Synthesis", code = 264_1251, classification = ItemClassification.filler, ), + #"Gale": KH1ItemData("Synthesis", code = 264_1252, classification = ItemClassification.filler, ), + #"Mythril Shard": KH1ItemData("Synthesis", code = 264_1253, classification = ItemClassification.filler, ), + #"Mythril": KH1ItemData("Synthesis", code = 264_1254, classification = ItemClassification.filler, ), + #"Orichalcum": KH1ItemData("Synthesis", code = 264_1255, classification = ItemClassification.filler, ), + "High Jump": KH1ItemData("Shared Abilities", code = 264_2001, classification = ItemClassification.progression, ), + "Mermaid Kick": KH1ItemData("Shared Abilities", code = 264_2002, classification = ItemClassification.progression, ), + "Progressive Glide": KH1ItemData("Shared Abilities", code = 264_2003, classification = ItemClassification.progression, max_quantity = 2 ), + #"Superglide": KH1ItemData("Shared Abilities", code = 264_2004, classification = ItemClassification.progression, ), + "Puppy 01": KH1ItemData("Puppies", code = 264_2101, classification = ItemClassification.progression, ), + "Puppy 02": KH1ItemData("Puppies", code = 264_2102, classification = ItemClassification.progression, ), + "Puppy 03": KH1ItemData("Puppies", code = 264_2103, classification = ItemClassification.progression, ), + "Puppy 04": KH1ItemData("Puppies", code = 264_2104, classification = ItemClassification.progression, ), + "Puppy 05": KH1ItemData("Puppies", code = 264_2105, classification = ItemClassification.progression, ), + "Puppy 06": KH1ItemData("Puppies", code = 264_2106, classification = ItemClassification.progression, ), + "Puppy 07": KH1ItemData("Puppies", code = 264_2107, classification = ItemClassification.progression, ), + "Puppy 08": KH1ItemData("Puppies", code = 264_2108, classification = ItemClassification.progression, ), + "Puppy 09": KH1ItemData("Puppies", code = 264_2109, classification = ItemClassification.progression, ), + "Puppy 10": KH1ItemData("Puppies", code = 264_2110, classification = ItemClassification.progression, ), + "Puppy 11": KH1ItemData("Puppies", code = 264_2111, classification = ItemClassification.progression, ), + "Puppy 12": KH1ItemData("Puppies", code = 264_2112, classification = ItemClassification.progression, ), + "Puppy 13": KH1ItemData("Puppies", code = 264_2113, classification = ItemClassification.progression, ), + "Puppy 14": KH1ItemData("Puppies", code = 264_2114, classification = ItemClassification.progression, ), + "Puppy 15": KH1ItemData("Puppies", code = 264_2115, classification = ItemClassification.progression, ), + "Puppy 16": KH1ItemData("Puppies", code = 264_2116, classification = ItemClassification.progression, ), + "Puppy 17": KH1ItemData("Puppies", code = 264_2117, classification = ItemClassification.progression, ), + "Puppy 18": KH1ItemData("Puppies", code = 264_2118, classification = ItemClassification.progression, ), + "Puppy 19": KH1ItemData("Puppies", code = 264_2119, classification = ItemClassification.progression, ), + "Puppy 20": KH1ItemData("Puppies", code = 264_2120, classification = ItemClassification.progression, ), + "Puppy 21": KH1ItemData("Puppies", code = 264_2121, classification = ItemClassification.progression, ), + "Puppy 22": KH1ItemData("Puppies", code = 264_2122, classification = ItemClassification.progression, ), + "Puppy 23": KH1ItemData("Puppies", code = 264_2123, classification = ItemClassification.progression, ), + "Puppy 24": KH1ItemData("Puppies", code = 264_2124, classification = ItemClassification.progression, ), + "Puppy 25": KH1ItemData("Puppies", code = 264_2125, classification = ItemClassification.progression, ), + "Puppy 26": KH1ItemData("Puppies", code = 264_2126, classification = ItemClassification.progression, ), + "Puppy 27": KH1ItemData("Puppies", code = 264_2127, classification = ItemClassification.progression, ), + "Puppy 28": KH1ItemData("Puppies", code = 264_2128, classification = ItemClassification.progression, ), + "Puppy 29": KH1ItemData("Puppies", code = 264_2129, classification = ItemClassification.progression, ), + "Puppy 30": KH1ItemData("Puppies", code = 264_2130, classification = ItemClassification.progression, ), + "Puppy 31": KH1ItemData("Puppies", code = 264_2131, classification = ItemClassification.progression, ), + "Puppy 32": KH1ItemData("Puppies", code = 264_2132, classification = ItemClassification.progression, ), + "Puppy 33": KH1ItemData("Puppies", code = 264_2133, classification = ItemClassification.progression, ), + "Puppy 34": KH1ItemData("Puppies", code = 264_2134, classification = ItemClassification.progression, ), + "Puppy 35": KH1ItemData("Puppies", code = 264_2135, classification = ItemClassification.progression, ), + "Puppy 36": KH1ItemData("Puppies", code = 264_2136, classification = ItemClassification.progression, ), + "Puppy 37": KH1ItemData("Puppies", code = 264_2137, classification = ItemClassification.progression, ), + "Puppy 38": KH1ItemData("Puppies", code = 264_2138, classification = ItemClassification.progression, ), + "Puppy 39": KH1ItemData("Puppies", code = 264_2139, classification = ItemClassification.progression, ), + "Puppy 40": KH1ItemData("Puppies", code = 264_2140, classification = ItemClassification.progression, ), + "Puppy 41": KH1ItemData("Puppies", code = 264_2141, classification = ItemClassification.progression, ), + "Puppy 42": KH1ItemData("Puppies", code = 264_2142, classification = ItemClassification.progression, ), + "Puppy 43": KH1ItemData("Puppies", code = 264_2143, classification = ItemClassification.progression, ), + "Puppy 44": KH1ItemData("Puppies", code = 264_2144, classification = ItemClassification.progression, ), + "Puppy 45": KH1ItemData("Puppies", code = 264_2145, classification = ItemClassification.progression, ), + "Puppy 46": KH1ItemData("Puppies", code = 264_2146, classification = ItemClassification.progression, ), + "Puppy 47": KH1ItemData("Puppies", code = 264_2147, classification = ItemClassification.progression, ), + "Puppy 48": KH1ItemData("Puppies", code = 264_2148, classification = ItemClassification.progression, ), + "Puppy 49": KH1ItemData("Puppies", code = 264_2149, classification = ItemClassification.progression, ), + "Puppy 50": KH1ItemData("Puppies", code = 264_2150, classification = ItemClassification.progression, ), + "Puppy 51": KH1ItemData("Puppies", code = 264_2151, classification = ItemClassification.progression, ), + "Puppy 52": KH1ItemData("Puppies", code = 264_2152, classification = ItemClassification.progression, ), + "Puppy 53": KH1ItemData("Puppies", code = 264_2153, classification = ItemClassification.progression, ), + "Puppy 54": KH1ItemData("Puppies", code = 264_2154, classification = ItemClassification.progression, ), + "Puppy 55": KH1ItemData("Puppies", code = 264_2155, classification = ItemClassification.progression, ), + "Puppy 56": KH1ItemData("Puppies", code = 264_2156, classification = ItemClassification.progression, ), + "Puppy 57": KH1ItemData("Puppies", code = 264_2157, classification = ItemClassification.progression, ), + "Puppy 58": KH1ItemData("Puppies", code = 264_2158, classification = ItemClassification.progression, ), + "Puppy 59": KH1ItemData("Puppies", code = 264_2159, classification = ItemClassification.progression, ), + "Puppy 60": KH1ItemData("Puppies", code = 264_2160, classification = ItemClassification.progression, ), + "Puppy 61": KH1ItemData("Puppies", code = 264_2161, classification = ItemClassification.progression, ), + "Puppy 62": KH1ItemData("Puppies", code = 264_2162, classification = ItemClassification.progression, ), + "Puppy 63": KH1ItemData("Puppies", code = 264_2163, classification = ItemClassification.progression, ), + "Puppy 64": KH1ItemData("Puppies", code = 264_2164, classification = ItemClassification.progression, ), + "Puppy 65": KH1ItemData("Puppies", code = 264_2165, classification = ItemClassification.progression, ), + "Puppy 66": KH1ItemData("Puppies", code = 264_2166, classification = ItemClassification.progression, ), + "Puppy 67": KH1ItemData("Puppies", code = 264_2167, classification = ItemClassification.progression, ), + "Puppy 68": KH1ItemData("Puppies", code = 264_2168, classification = ItemClassification.progression, ), + "Puppy 69": KH1ItemData("Puppies", code = 264_2169, classification = ItemClassification.progression, ), + "Puppy 70": KH1ItemData("Puppies", code = 264_2170, classification = ItemClassification.progression, ), + "Puppy 71": KH1ItemData("Puppies", code = 264_2171, classification = ItemClassification.progression, ), + "Puppy 72": KH1ItemData("Puppies", code = 264_2172, classification = ItemClassification.progression, ), + "Puppy 73": KH1ItemData("Puppies", code = 264_2173, classification = ItemClassification.progression, ), + "Puppy 74": KH1ItemData("Puppies", code = 264_2174, classification = ItemClassification.progression, ), + "Puppy 75": KH1ItemData("Puppies", code = 264_2175, classification = ItemClassification.progression, ), + "Puppy 76": KH1ItemData("Puppies", code = 264_2176, classification = ItemClassification.progression, ), + "Puppy 77": KH1ItemData("Puppies", code = 264_2177, classification = ItemClassification.progression, ), + "Puppy 78": KH1ItemData("Puppies", code = 264_2178, classification = ItemClassification.progression, ), + "Puppy 79": KH1ItemData("Puppies", code = 264_2179, classification = ItemClassification.progression, ), + "Puppy 80": KH1ItemData("Puppies", code = 264_2180, classification = ItemClassification.progression, ), + "Puppy 81": KH1ItemData("Puppies", code = 264_2181, classification = ItemClassification.progression, ), + "Puppy 82": KH1ItemData("Puppies", code = 264_2182, classification = ItemClassification.progression, ), + "Puppy 83": KH1ItemData("Puppies", code = 264_2183, classification = ItemClassification.progression, ), + "Puppy 84": KH1ItemData("Puppies", code = 264_2184, classification = ItemClassification.progression, ), + "Puppy 85": KH1ItemData("Puppies", code = 264_2185, classification = ItemClassification.progression, ), + "Puppy 86": KH1ItemData("Puppies", code = 264_2186, classification = ItemClassification.progression, ), + "Puppy 87": KH1ItemData("Puppies", code = 264_2187, classification = ItemClassification.progression, ), + "Puppy 88": KH1ItemData("Puppies", code = 264_2188, classification = ItemClassification.progression, ), + "Puppy 89": KH1ItemData("Puppies", code = 264_2189, classification = ItemClassification.progression, ), + "Puppy 90": KH1ItemData("Puppies", code = 264_2190, classification = ItemClassification.progression, ), + "Puppy 91": KH1ItemData("Puppies", code = 264_2191, classification = ItemClassification.progression, ), + "Puppy 92": KH1ItemData("Puppies", code = 264_2192, classification = ItemClassification.progression, ), + "Puppy 93": KH1ItemData("Puppies", code = 264_2193, classification = ItemClassification.progression, ), + "Puppy 94": KH1ItemData("Puppies", code = 264_2194, classification = ItemClassification.progression, ), + "Puppy 95": KH1ItemData("Puppies", code = 264_2195, classification = ItemClassification.progression, ), + "Puppy 96": KH1ItemData("Puppies", code = 264_2196, classification = ItemClassification.progression, ), + "Puppy 97": KH1ItemData("Puppies", code = 264_2197, classification = ItemClassification.progression, ), + "Puppy 98": KH1ItemData("Puppies", code = 264_2198, classification = ItemClassification.progression, ), + "Puppy 99": KH1ItemData("Puppies", code = 264_2199, classification = ItemClassification.progression, ), + "Puppies 01-03": KH1ItemData("Puppies", code = 264_2201, classification = ItemClassification.progression, ), + "Puppies 04-06": KH1ItemData("Puppies", code = 264_2202, classification = ItemClassification.progression, ), + "Puppies 07-09": KH1ItemData("Puppies", code = 264_2203, classification = ItemClassification.progression, ), + "Puppies 10-12": KH1ItemData("Puppies", code = 264_2204, classification = ItemClassification.progression, ), + "Puppies 13-15": KH1ItemData("Puppies", code = 264_2205, classification = ItemClassification.progression, ), + "Puppies 16-18": KH1ItemData("Puppies", code = 264_2206, classification = ItemClassification.progression, ), + "Puppies 19-21": KH1ItemData("Puppies", code = 264_2207, classification = ItemClassification.progression, ), + "Puppies 22-24": KH1ItemData("Puppies", code = 264_2208, classification = ItemClassification.progression, ), + "Puppies 25-27": KH1ItemData("Puppies", code = 264_2209, classification = ItemClassification.progression, ), + "Puppies 28-30": KH1ItemData("Puppies", code = 264_2210, classification = ItemClassification.progression, ), + "Puppies 31-33": KH1ItemData("Puppies", code = 264_2211, classification = ItemClassification.progression, ), + "Puppies 34-36": KH1ItemData("Puppies", code = 264_2212, classification = ItemClassification.progression, ), + "Puppies 37-39": KH1ItemData("Puppies", code = 264_2213, classification = ItemClassification.progression, ), + "Puppies 40-42": KH1ItemData("Puppies", code = 264_2214, classification = ItemClassification.progression, ), + "Puppies 43-45": KH1ItemData("Puppies", code = 264_2215, classification = ItemClassification.progression, ), + "Puppies 46-48": KH1ItemData("Puppies", code = 264_2216, classification = ItemClassification.progression, ), + "Puppies 49-51": KH1ItemData("Puppies", code = 264_2217, classification = ItemClassification.progression, ), + "Puppies 52-54": KH1ItemData("Puppies", code = 264_2218, classification = ItemClassification.progression, ), + "Puppies 55-57": KH1ItemData("Puppies", code = 264_2219, classification = ItemClassification.progression, ), + "Puppies 58-60": KH1ItemData("Puppies", code = 264_2220, classification = ItemClassification.progression, ), + "Puppies 61-63": KH1ItemData("Puppies", code = 264_2221, classification = ItemClassification.progression, ), + "Puppies 64-66": KH1ItemData("Puppies", code = 264_2222, classification = ItemClassification.progression, ), + "Puppies 67-69": KH1ItemData("Puppies", code = 264_2223, classification = ItemClassification.progression, ), + "Puppies 70-72": KH1ItemData("Puppies", code = 264_2224, classification = ItemClassification.progression, ), + "Puppies 73-75": KH1ItemData("Puppies", code = 264_2225, classification = ItemClassification.progression, ), + "Puppies 76-78": KH1ItemData("Puppies", code = 264_2226, classification = ItemClassification.progression, ), + "Puppies 79-81": KH1ItemData("Puppies", code = 264_2227, classification = ItemClassification.progression, ), + "Puppies 82-84": KH1ItemData("Puppies", code = 264_2228, classification = ItemClassification.progression, ), + "Puppies 85-87": KH1ItemData("Puppies", code = 264_2229, classification = ItemClassification.progression, ), + "Puppies 88-90": KH1ItemData("Puppies", code = 264_2230, classification = ItemClassification.progression, ), + "Puppies 91-93": KH1ItemData("Puppies", code = 264_2231, classification = ItemClassification.progression, ), + "Puppies 94-96": KH1ItemData("Puppies", code = 264_2232, classification = ItemClassification.progression, ), + "Puppies 97-99": KH1ItemData("Puppies", code = 264_2233, classification = ItemClassification.progression, ), + "All Puppies": KH1ItemData("Puppies", code = 264_2240, classification = ItemClassification.progression, ), + "Treasure Magnet": KH1ItemData("Abilities", code = 264_3005, classification = ItemClassification.useful, max_quantity = 2 ), + "Combo Plus": KH1ItemData("Abilities", code = 264_3006, classification = ItemClassification.useful, max_quantity = 4 ), + "Air Combo Plus": KH1ItemData("Abilities", code = 264_3007, classification = ItemClassification.useful, max_quantity = 2 ), + "Critical Plus": KH1ItemData("Abilities", code = 264_3008, classification = ItemClassification.useful, max_quantity = 3 ), + #"Second Wind": KH1ItemData("Abilities", code = 264_3009, classification = ItemClassification.useful, ), + "Scan": KH1ItemData("Abilities", code = 264_3010, classification = ItemClassification.useful, ), + "Sonic Blade": KH1ItemData("Abilities", code = 264_3011, classification = ItemClassification.useful, ), + "Ars Arcanum": KH1ItemData("Abilities", code = 264_3012, classification = ItemClassification.useful, ), + "Strike Raid": KH1ItemData("Abilities", code = 264_3013, classification = ItemClassification.useful, ), + "Ragnarok": KH1ItemData("Abilities", code = 264_3014, classification = ItemClassification.useful, ), + "Trinity Limit": KH1ItemData("Abilities", code = 264_3015, classification = ItemClassification.useful, ), + "Cheer": KH1ItemData("Abilities", code = 264_3016, classification = ItemClassification.useful, ), + "Vortex": KH1ItemData("Abilities", code = 264_3017, classification = ItemClassification.useful, ), + "Aerial Sweep": KH1ItemData("Abilities", code = 264_3018, classification = ItemClassification.useful, ), + "Counterattack": KH1ItemData("Abilities", code = 264_3019, classification = ItemClassification.useful, ), + "Blitz": KH1ItemData("Abilities", code = 264_3020, classification = ItemClassification.useful, ), + "Guard": KH1ItemData("Abilities", code = 264_3021, classification = ItemClassification.progression, ), + "Dodge Roll": KH1ItemData("Abilities", code = 264_3022, classification = ItemClassification.progression, ), + "MP Haste": KH1ItemData("Abilities", code = 264_3023, classification = ItemClassification.useful, ), + "MP Rage": KH1ItemData("Abilities", code = 264_3024, classification = ItemClassification.progression, ), + "Second Chance": KH1ItemData("Abilities", code = 264_3025, classification = ItemClassification.progression, ), + "Berserk": KH1ItemData("Abilities", code = 264_3026, classification = ItemClassification.useful, ), + "Jackpot": KH1ItemData("Abilities", code = 264_3027, classification = ItemClassification.useful, ), + "Lucky Strike": KH1ItemData("Abilities", code = 264_3028, classification = ItemClassification.useful, ), + #"Charge": KH1ItemData("Abilities", code = 264_3029, classification = ItemClassification.useful, ), + #"Rocket": KH1ItemData("Abilities", code = 264_3030, classification = ItemClassification.useful, ), + #"Tornado": KH1ItemData("Abilities", code = 264_3031, classification = ItemClassification.useful, ), + #"MP Gift": KH1ItemData("Abilities", code = 264_3032, classification = ItemClassification.useful, ), + #"Raging Boar": KH1ItemData("Abilities", code = 264_3033, classification = ItemClassification.useful, ), + #"Asp's Bite": KH1ItemData("Abilities", code = 264_3034, classification = ItemClassification.useful, ), + #"Healing Herb": KH1ItemData("Abilities", code = 264_3035, classification = ItemClassification.useful, ), + #"Wind Armor": KH1ItemData("Abilities", code = 264_3036, classification = ItemClassification.useful, ), + #"Crescent": KH1ItemData("Abilities", code = 264_3037, classification = ItemClassification.useful, ), + #"Sandstorm": KH1ItemData("Abilities", code = 264_3038, classification = ItemClassification.useful, ), + #"Applause!": KH1ItemData("Abilities", code = 264_3039, classification = ItemClassification.useful, ), + #"Blazing Fury": KH1ItemData("Abilities", code = 264_3040, classification = ItemClassification.useful, ), + #"Icy Terror": KH1ItemData("Abilities", code = 264_3041, classification = ItemClassification.useful, ), + #"Bolts of Sorrow": KH1ItemData("Abilities", code = 264_3042, classification = ItemClassification.useful, ), + #"Ghostly Scream": KH1ItemData("Abilities", code = 264_3043, classification = ItemClassification.useful, ), + #"Humming Bird": KH1ItemData("Abilities", code = 264_3044, classification = ItemClassification.useful, ), + #"Time-Out": KH1ItemData("Abilities", code = 264_3045, classification = ItemClassification.useful, ), + #"Storm's Eye": KH1ItemData("Abilities", code = 264_3046, classification = ItemClassification.useful, ), + #"Ferocious Lunge": KH1ItemData("Abilities", code = 264_3047, classification = ItemClassification.useful, ), + #"Furious Bellow": KH1ItemData("Abilities", code = 264_3048, classification = ItemClassification.useful, ), + #"Spiral Wave": KH1ItemData("Abilities", code = 264_3049, classification = ItemClassification.useful, ), + #"Thunder Potion": KH1ItemData("Abilities", code = 264_3050, classification = ItemClassification.useful, ), + #"Cure Potion": KH1ItemData("Abilities", code = 264_3051, classification = ItemClassification.useful, ), + #"Aero Potion": KH1ItemData("Abilities", code = 264_3052, classification = ItemClassification.useful, ), + "Slapshot": KH1ItemData("Abilities", code = 264_3053, classification = ItemClassification.useful, ), + "Sliding Dash": KH1ItemData("Abilities", code = 264_3054, classification = ItemClassification.useful, ), + "Hurricane Blast": KH1ItemData("Abilities", code = 264_3055, classification = ItemClassification.useful, ), + "Ripple Drive": KH1ItemData("Abilities", code = 264_3056, classification = ItemClassification.useful, ), + "Stun Impact": KH1ItemData("Abilities", code = 264_3057, classification = ItemClassification.useful, ), + "Gravity Break": KH1ItemData("Abilities", code = 264_3058, classification = ItemClassification.useful, ), + "Zantetsuken": KH1ItemData("Abilities", code = 264_3059, classification = ItemClassification.useful, ), + "Tech Boost": KH1ItemData("Abilities", code = 264_3060, classification = ItemClassification.useful, max_quantity = 4 ), + "Encounter Plus": KH1ItemData("Abilities", code = 264_3061, classification = ItemClassification.useful, ), + "Leaf Bracer": KH1ItemData("Abilities", code = 264_3062, classification = ItemClassification.progression, ), + #"Evolution": KH1ItemData("Abilities", code = 264_3063, classification = ItemClassification.useful, ), + "EXP Zero": KH1ItemData("Abilities", code = 264_3064, classification = ItemClassification.useful, ), + "Combo Master": KH1ItemData("Abilities", code = 264_3065, classification = ItemClassification.progression, ), + "Max HP Increase": KH1ItemData("Level Up", code = 264_4001, classification = ItemClassification.useful, max_quantity = 15), + "Max MP Increase": KH1ItemData("Level Up", code = 264_4002, classification = ItemClassification.useful, max_quantity = 15), + "Max AP Increase": KH1ItemData("Level Up", code = 264_4003, classification = ItemClassification.useful, max_quantity = 15), + "Strength Increase": KH1ItemData("Level Up", code = 264_4004, classification = ItemClassification.useful, max_quantity = 15), + "Defense Increase": KH1ItemData("Level Up", code = 264_4005, classification = ItemClassification.useful, max_quantity = 15), + "Accessory Slot Increase": KH1ItemData("Limited Level Up", code = 264_4006, classification = ItemClassification.useful, max_quantity = 15), + "Item Slot Increase": KH1ItemData("Limited Level Up", code = 264_4007, classification = ItemClassification.useful, max_quantity = 15), + "Dumbo": KH1ItemData("Summons", code = 264_5000, classification = ItemClassification.progression, ), + "Bambi": KH1ItemData("Summons", code = 264_5001, classification = ItemClassification.progression, ), + "Genie": KH1ItemData("Summons", code = 264_5002, classification = ItemClassification.progression, ), + "Tinker Bell": KH1ItemData("Summons", code = 264_5003, classification = ItemClassification.progression, ), + "Mushu": KH1ItemData("Summons", code = 264_5004, classification = ItemClassification.progression, ), + "Simba": KH1ItemData("Summons", code = 264_5005, classification = ItemClassification.progression, ), + "Progressive Fire": KH1ItemData("Magic", code = 264_6001, classification = ItemClassification.progression, max_quantity = 3 ), + "Progressive Blizzard": KH1ItemData("Magic", code = 264_6002, classification = ItemClassification.progression, max_quantity = 3 ), + "Progressive Thunder": KH1ItemData("Magic", code = 264_6003, classification = ItemClassification.progression, max_quantity = 3 ), + "Progressive Cure": KH1ItemData("Magic", code = 264_6004, classification = ItemClassification.progression, max_quantity = 3 ), + "Progressive Gravity": KH1ItemData("Magic", code = 264_6005, classification = ItemClassification.progression, max_quantity = 3 ), + "Progressive Stop": KH1ItemData("Magic", code = 264_6006, classification = ItemClassification.progression, max_quantity = 3 ), + "Progressive Aero": KH1ItemData("Magic", code = 264_6007, classification = ItemClassification.progression, max_quantity = 3 ), + #"Traverse Town": KH1ItemData("Worlds", code = 264_7001, classification = ItemClassification.progression, ), + "Wonderland": KH1ItemData("Worlds", code = 264_7002, classification = ItemClassification.progression, ), + "Olympus Coliseum": KH1ItemData("Worlds", code = 264_7003, classification = ItemClassification.progression, ), + "Deep Jungle": KH1ItemData("Worlds", code = 264_7004, classification = ItemClassification.progression, ), + "Agrabah": KH1ItemData("Worlds", code = 264_7005, classification = ItemClassification.progression, ), + "Halloween Town": KH1ItemData("Worlds", code = 264_7006, classification = ItemClassification.progression, ), + "Atlantica": KH1ItemData("Worlds", code = 264_7007, classification = ItemClassification.progression, ), + "Neverland": KH1ItemData("Worlds", code = 264_7008, classification = ItemClassification.progression, ), + "Hollow Bastion": KH1ItemData("Worlds", code = 264_7009, classification = ItemClassification.progression, ), + "End of the World": KH1ItemData("Worlds", code = 264_7010, classification = ItemClassification.progression, ), + "Monstro": KH1ItemData("Worlds", code = 264_7011, classification = ItemClassification.progression, ), + "Blue Trinity": KH1ItemData("Trinities", code = 264_8001, classification = ItemClassification.progression, ), + "Red Trinity": KH1ItemData("Trinities", code = 264_8002, classification = ItemClassification.progression, ), + "Green Trinity": KH1ItemData("Trinities", code = 264_8003, classification = ItemClassification.progression, ), + "Yellow Trinity": KH1ItemData("Trinities", code = 264_8004, classification = ItemClassification.progression, ), + "White Trinity": KH1ItemData("Trinities", code = 264_8005, classification = ItemClassification.progression, ), + "Phil Cup": KH1ItemData("Cups", code = 264_9001, classification = ItemClassification.progression, ), + "Pegasus Cup": KH1ItemData("Cups", code = 264_9002, classification = ItemClassification.progression, ), + "Hercules Cup": KH1ItemData("Cups", code = 264_9003, classification = ItemClassification.progression, ), + #"Hades Cup": KH1ItemData("Cups", code = 264_9004, classification = ItemClassification.progression, ), +} + +event_item_table: Dict[str, KH1ItemData] = {} + +#Make item categories +item_name_groups: Dict[str, Set[str]] = {} +for item in item_table.keys(): + category = item_table[item].category + if category not in item_name_groups.keys(): + item_name_groups[category] = set() + item_name_groups[category].add(item) diff --git a/worlds/kh1/Locations.py b/worlds/kh1/Locations.py new file mode 100644 index 000000000000..a82be70f090b --- /dev/null +++ b/worlds/kh1/Locations.py @@ -0,0 +1,590 @@ +from typing import Dict, NamedTuple, Optional, Set +import typing + + +from BaseClasses import Location + + +class KH1Location(Location): + game: str = "Kingdom Hearts" + + +class KH1LocationData(NamedTuple): + category: str + code: int + + +def get_locations_by_category(category: str) -> Dict[str, KH1LocationData]: + location_dict: Dict[str, KH1LocationData] = {} + for name, data in location_table.items(): + if data.category == category: + location_dict.setdefault(name, data) + + return location_dict + + +location_table: Dict[str, KH1LocationData] = { + #"Destiny Islands Chest": KH1LocationData("Destiny Islands", 265_0011), missable + "Traverse Town 1st District Candle Puzzle Chest": KH1LocationData("Traverse Town", 265_0211), + "Traverse Town 1st District Accessory Shop Roof Chest": KH1LocationData("Traverse Town", 265_0212), + "Traverse Town 2nd District Boots and Shoes Awning Chest": KH1LocationData("Traverse Town", 265_0213), + "Traverse Town 2nd District Rooftop Chest": KH1LocationData("Traverse Town", 265_0214), + "Traverse Town 2nd District Gizmo Shop Facade Chest": KH1LocationData("Traverse Town", 265_0251), + "Traverse Town Alleyway Balcony Chest": KH1LocationData("Traverse Town", 265_0252), + "Traverse Town Alleyway Blue Room Awning Chest": KH1LocationData("Traverse Town", 265_0253), + "Traverse Town Alleyway Corner Chest": KH1LocationData("Traverse Town", 265_0254), + "Traverse Town Green Room Clock Puzzle Chest": KH1LocationData("Traverse Town", 265_0292), + "Traverse Town Green Room Table Chest": KH1LocationData("Traverse Town", 265_0293), + "Traverse Town Red Room Chest": KH1LocationData("Traverse Town", 265_0294), + "Traverse Town Mystical House Yellow Trinity Chest": KH1LocationData("Traverse Town", 265_0331), + "Traverse Town Accessory Shop Chest": KH1LocationData("Traverse Town", 265_0332), + "Traverse Town Secret Waterway White Trinity Chest": KH1LocationData("Traverse Town", 265_0333), + "Traverse Town Geppetto's House Chest": KH1LocationData("Traverse Town", 265_0334), + "Traverse Town Item Workshop Right Chest": KH1LocationData("Traverse Town", 265_0371), + "Traverse Town 1st District Blue Trinity Balcony Chest": KH1LocationData("Traverse Town", 265_0411), + "Traverse Town Mystical House Glide Chest": KH1LocationData("Traverse Town", 265_0891), + "Traverse Town Alleyway Behind Crates Chest": KH1LocationData("Traverse Town", 265_0892), + "Traverse Town Item Workshop Left Chest": KH1LocationData("Traverse Town", 265_0893), + "Traverse Town Secret Waterway Near Stairs Chest": KH1LocationData("Traverse Town", 265_0894), + "Wonderland Rabbit Hole Green Trinity Chest": KH1LocationData("Wonderland", 265_0931), + "Wonderland Rabbit Hole Defeat Heartless 1 Chest": KH1LocationData("Wonderland", 265_0932), + "Wonderland Rabbit Hole Defeat Heartless 2 Chest": KH1LocationData("Wonderland", 265_0933), + "Wonderland Rabbit Hole Defeat Heartless 3 Chest": KH1LocationData("Wonderland", 265_0934), + "Wonderland Bizarre Room Green Trinity Chest": KH1LocationData("Wonderland", 265_0971), + "Wonderland Queen's Castle Hedge Left Red Chest": KH1LocationData("Wonderland", 265_1011), + "Wonderland Queen's Castle Hedge Right Blue Chest": KH1LocationData("Wonderland", 265_1012), + "Wonderland Queen's Castle Hedge Right Red Chest": KH1LocationData("Wonderland", 265_1013), + "Wonderland Lotus Forest Thunder Plant Chest": KH1LocationData("Wonderland", 265_1014), + "Wonderland Lotus Forest Through the Painting Thunder Plant Chest": KH1LocationData("Wonderland", 265_1051), + "Wonderland Lotus Forest Glide Chest": KH1LocationData("Wonderland", 265_1052), + "Wonderland Lotus Forest Nut Chest": KH1LocationData("Wonderland", 265_1053), + "Wonderland Lotus Forest Corner Chest": KH1LocationData("Wonderland", 265_1054), + "Wonderland Bizarre Room Lamp Chest": KH1LocationData("Wonderland", 265_1091), + "Wonderland Tea Party Garden Above Lotus Forest Entrance 2nd Chest": KH1LocationData("Wonderland", 265_1093), + "Wonderland Tea Party Garden Above Lotus Forest Entrance 1st Chest": KH1LocationData("Wonderland", 265_1094), + "Wonderland Tea Party Garden Bear and Clock Puzzle Chest": KH1LocationData("Wonderland", 265_1131), + "Wonderland Tea Party Garden Across From Bizarre Room Entrance Chest": KH1LocationData("Wonderland", 265_1132), + "Wonderland Lotus Forest Through the Painting White Trinity Chest": KH1LocationData("Wonderland", 265_1133), + "Deep Jungle Tree House Beneath Tree House Chest": KH1LocationData("Deep Jungle", 265_1213), + "Deep Jungle Tree House Rooftop Chest": KH1LocationData("Deep Jungle", 265_1214), + "Deep Jungle Hippo's Lagoon Center Chest": KH1LocationData("Deep Jungle", 265_1251), + "Deep Jungle Hippo's Lagoon Left Chest": KH1LocationData("Deep Jungle", 265_1252), + "Deep Jungle Hippo's Lagoon Right Chest": KH1LocationData("Deep Jungle", 265_1253), + "Deep Jungle Vines Chest": KH1LocationData("Deep Jungle", 265_1291), + "Deep Jungle Vines 2 Chest": KH1LocationData("Deep Jungle", 265_1292), + "Deep Jungle Climbing Trees Blue Trinity Chest": KH1LocationData("Deep Jungle", 265_1293), + "Deep Jungle Tunnel Chest": KH1LocationData("Deep Jungle", 265_1331), + "Deep Jungle Cavern of Hearts White Trinity Chest": KH1LocationData("Deep Jungle", 265_1332), + "Deep Jungle Camp Blue Trinity Chest": KH1LocationData("Deep Jungle", 265_1333), + "Deep Jungle Tent Chest": KH1LocationData("Deep Jungle", 265_1334), + "Deep Jungle Waterfall Cavern Low Chest": KH1LocationData("Deep Jungle", 265_1371), + "Deep Jungle Waterfall Cavern Middle Chest": KH1LocationData("Deep Jungle", 265_1372), + "Deep Jungle Waterfall Cavern High Wall Chest": KH1LocationData("Deep Jungle", 265_1373), + "Deep Jungle Waterfall Cavern High Middle Chest": KH1LocationData("Deep Jungle", 265_1374), + "Deep Jungle Cliff Right Cliff Left Chest": KH1LocationData("Deep Jungle", 265_1411), + "Deep Jungle Cliff Right Cliff Right Chest": KH1LocationData("Deep Jungle", 265_1412), + "Deep Jungle Tree House Suspended Boat Chest": KH1LocationData("Deep Jungle", 265_1413), + "100 Acre Wood Meadow Inside Log Chest": KH1LocationData("100 Acre Wood", 265_1654), + "100 Acre Wood Bouncing Spot Left Cliff Chest": KH1LocationData("100 Acre Wood", 265_1691), + "100 Acre Wood Bouncing Spot Right Tree Alcove Chest": KH1LocationData("100 Acre Wood", 265_1692), + "100 Acre Wood Bouncing Spot Under Giant Pot Chest": KH1LocationData("100 Acre Wood", 265_1693), + "Agrabah Plaza By Storage Chest": KH1LocationData("Agrabah", 265_1972), + "Agrabah Plaza Raised Terrace Chest": KH1LocationData("Agrabah", 265_1973), + "Agrabah Plaza Top Corner Chest": KH1LocationData("Agrabah", 265_1974), + "Agrabah Alley Chest": KH1LocationData("Agrabah", 265_2011), + "Agrabah Bazaar Across Windows Chest": KH1LocationData("Agrabah", 265_2012), + "Agrabah Bazaar High Corner Chest": KH1LocationData("Agrabah", 265_2013), + "Agrabah Main Street Right Palace Entrance Chest": KH1LocationData("Agrabah", 265_2014), + "Agrabah Main Street High Above Alley Entrance Chest": KH1LocationData("Agrabah", 265_2051), + "Agrabah Main Street High Above Palace Gates Entrance Chest": KH1LocationData("Agrabah", 265_2052), + "Agrabah Palace Gates Low Chest": KH1LocationData("Agrabah", 265_2053), + "Agrabah Palace Gates High Opposite Palace Chest": KH1LocationData("Agrabah", 265_2054), + "Agrabah Palace Gates High Close to Palace Chest": KH1LocationData("Agrabah", 265_2091), + "Agrabah Storage Green Trinity Chest": KH1LocationData("Agrabah", 265_2092), + "Agrabah Storage Behind Barrel Chest": KH1LocationData("Agrabah", 265_2093), + "Agrabah Cave of Wonders Entrance Left Chest": KH1LocationData("Agrabah", 265_2094), + "Agrabah Cave of Wonders Entrance Tall Tower Chest": KH1LocationData("Agrabah", 265_2131), + "Agrabah Cave of Wonders Hall High Left Chest": KH1LocationData("Agrabah", 265_2132), + "Agrabah Cave of Wonders Hall Near Bottomless Hall Chest": KH1LocationData("Agrabah", 265_2133), + "Agrabah Cave of Wonders Bottomless Hall Raised Platform Chest": KH1LocationData("Agrabah", 265_2134), + "Agrabah Cave of Wonders Bottomless Hall Pillar Chest": KH1LocationData("Agrabah", 265_2171), + "Agrabah Cave of Wonders Bottomless Hall Across Chasm Chest": KH1LocationData("Agrabah", 265_2172), + "Agrabah Cave of Wonders Treasure Room Across Platforms Chest": KH1LocationData("Agrabah", 265_2173), + "Agrabah Cave of Wonders Treasure Room Small Treasure Pile Chest": KH1LocationData("Agrabah", 265_2174), + "Agrabah Cave of Wonders Treasure Room Large Treasure Pile Chest": KH1LocationData("Agrabah", 265_2211), + "Agrabah Cave of Wonders Treasure Room Above Fire Chest": KH1LocationData("Agrabah", 265_2212), + "Agrabah Cave of Wonders Relic Chamber Jump from Stairs Chest": KH1LocationData("Agrabah", 265_2213), + "Agrabah Cave of Wonders Relic Chamber Stairs Chest": KH1LocationData("Agrabah", 265_2214), + "Agrabah Cave of Wonders Dark Chamber Abu Gem Chest": KH1LocationData("Agrabah", 265_2251), + "Agrabah Cave of Wonders Dark Chamber Across from Relic Chamber Entrance Chest": KH1LocationData("Agrabah", 265_2252), + "Agrabah Cave of Wonders Dark Chamber Bridge Chest": KH1LocationData("Agrabah", 265_2253), + "Agrabah Cave of Wonders Dark Chamber Near Save Chest": KH1LocationData("Agrabah", 265_2254), + "Agrabah Cave of Wonders Silent Chamber Blue Trinity Chest": KH1LocationData("Agrabah", 265_2291), + "Agrabah Cave of Wonders Hidden Room Right Chest": KH1LocationData("Agrabah", 265_2292), + "Agrabah Cave of Wonders Hidden Room Left Chest": KH1LocationData("Agrabah", 265_2293), + "Agrabah Aladdin's House Main Street Entrance Chest": KH1LocationData("Agrabah", 265_2294), + "Agrabah Aladdin's House Plaza Entrance Chest": KH1LocationData("Agrabah", 265_2331), + "Agrabah Cave of Wonders Entrance White Trinity Chest": KH1LocationData("Agrabah", 265_2332), + "Monstro Chamber 6 Other Platform Chest": KH1LocationData("Monstro", 265_2413), + "Monstro Chamber 6 Platform Near Chamber 5 Entrance Chest": KH1LocationData("Monstro", 265_2414), + "Monstro Chamber 6 Raised Area Near Chamber 1 Entrance Chest": KH1LocationData("Monstro", 265_2451), + "Monstro Chamber 6 Low Chest": KH1LocationData("Monstro", 265_2452), + "Atlantica Sunken Ship In Flipped Boat Chest": KH1LocationData("Atlantica", 265_2531), + "Atlantica Sunken Ship Seabed Chest": KH1LocationData("Atlantica", 265_2532), + "Atlantica Sunken Ship Inside Ship Chest": KH1LocationData("Atlantica", 265_2533), + "Atlantica Ariel's Grotto High Chest": KH1LocationData("Atlantica", 265_2534), + "Atlantica Ariel's Grotto Middle Chest": KH1LocationData("Atlantica", 265_2571), + "Atlantica Ariel's Grotto Low Chest": KH1LocationData("Atlantica", 265_2572), + "Atlantica Ursula's Lair Use Fire on Urchin Chest": KH1LocationData("Atlantica", 265_2573), + "Atlantica Undersea Gorge Jammed by Ariel's Grotto Chest": KH1LocationData("Atlantica", 265_2574), + "Atlantica Triton's Palace White Trinity Chest": KH1LocationData("Atlantica", 265_2611), + "Halloween Town Moonlight Hill White Trinity Chest": KH1LocationData("Halloween Town", 265_3014), + "Halloween Town Bridge Under Bridge": KH1LocationData("Halloween Town", 265_3051), + "Halloween Town Boneyard Tombstone Puzzle Chest": KH1LocationData("Halloween Town", 265_3052), + "Halloween Town Bridge Right of Gate Chest": KH1LocationData("Halloween Town", 265_3053), + "Halloween Town Cemetery Behind Grave Chest": KH1LocationData("Halloween Town", 265_3054), + "Halloween Town Cemetery By Cat Shape Chest": KH1LocationData("Halloween Town", 265_3091), + "Halloween Town Cemetery Between Graves Chest": KH1LocationData("Halloween Town", 265_3092), + "Halloween Town Oogie's Manor Lower Iron Cage Chest": KH1LocationData("Halloween Town", 265_3093), + "Halloween Town Oogie's Manor Upper Iron Cage Chest": KH1LocationData("Halloween Town", 265_3094), + "Halloween Town Oogie's Manor Hollow Chest": KH1LocationData("Halloween Town", 265_3131), + "Halloween Town Oogie's Manor Grounds Red Trinity Chest": KH1LocationData("Halloween Town", 265_3132), + "Halloween Town Guillotine Square High Tower Chest": KH1LocationData("Halloween Town", 265_3133), + "Halloween Town Guillotine Square Pumpkin Structure Left Chest": KH1LocationData("Halloween Town", 265_3134), + "Halloween Town Oogie's Manor Entrance Steps Chest": KH1LocationData("Halloween Town", 265_3171), + "Halloween Town Oogie's Manor Inside Entrance Chest": KH1LocationData("Halloween Town", 265_3172), + "Halloween Town Bridge Left of Gate Chest": KH1LocationData("Halloween Town", 265_3291), + "Halloween Town Cemetery By Striped Grave Chest": KH1LocationData("Halloween Town", 265_3292), + "Halloween Town Guillotine Square Under Jack's House Stairs Chest": KH1LocationData("Halloween Town", 265_3293), + "Halloween Town Guillotine Square Pumpkin Structure Right Chest": KH1LocationData("Halloween Town", 265_3294), + "Olympus Coliseum Coliseum Gates Left Behind Columns Chest": KH1LocationData("Olympus Coliseum", 265_3332), + "Olympus Coliseum Coliseum Gates Right Blue Trinity Chest": KH1LocationData("Olympus Coliseum", 265_3333), + "Olympus Coliseum Coliseum Gates Left Blue Trinity Chest": KH1LocationData("Olympus Coliseum", 265_3334), + "Olympus Coliseum Coliseum Gates White Trinity Chest": KH1LocationData("Olympus Coliseum", 265_3371), + "Olympus Coliseum Coliseum Gates Blizzara Chest": KH1LocationData("Olympus Coliseum", 265_3372), + "Olympus Coliseum Coliseum Gates Blizzaga Chest": KH1LocationData("Olympus Coliseum", 265_3373), + "Monstro Mouth Boat Deck Chest": KH1LocationData("Monstro", 265_3454), + "Monstro Mouth High Platform Boat Side Chest": KH1LocationData("Monstro", 265_3491), + "Monstro Mouth High Platform Across from Boat Chest": KH1LocationData("Monstro", 265_3492), + "Monstro Mouth Near Ship Chest": KH1LocationData("Monstro", 265_3493), + "Monstro Mouth Green Trinity Top of Boat Chest": KH1LocationData("Monstro", 265_3494), + "Monstro Chamber 2 Ground Chest": KH1LocationData("Monstro", 265_3534), + "Monstro Chamber 2 Platform Chest": KH1LocationData("Monstro", 265_3571), + "Monstro Chamber 5 Platform Chest": KH1LocationData("Monstro", 265_3613), + "Monstro Chamber 3 Ground Chest": KH1LocationData("Monstro", 265_3614), + "Monstro Chamber 3 Platform Above Chamber 2 Entrance Chest": KH1LocationData("Monstro", 265_3651), + "Monstro Chamber 3 Near Chamber 6 Entrance Chest": KH1LocationData("Monstro", 265_3652), + "Monstro Chamber 3 Platform Near Chamber 6 Entrance Chest": KH1LocationData("Monstro", 265_3653), + "Monstro Mouth High Platform Near Teeth Chest": KH1LocationData("Monstro", 265_3732), + "Monstro Chamber 5 Atop Barrel Chest": KH1LocationData("Monstro", 265_3733), + "Monstro Chamber 5 Low 2nd Chest": KH1LocationData("Monstro", 265_3734), + "Monstro Chamber 5 Low 1st Chest": KH1LocationData("Monstro", 265_3771), + "Neverland Pirate Ship Deck White Trinity Chest": KH1LocationData("Neverland", 265_3772), + "Neverland Pirate Ship Crows Nest Chest": KH1LocationData("Neverland", 265_3773), + "Neverland Hold Yellow Trinity Right Blue Chest": KH1LocationData("Neverland", 265_3774), + "Neverland Hold Yellow Trinity Left Blue Chest": KH1LocationData("Neverland", 265_3811), + "Neverland Galley Chest": KH1LocationData("Neverland", 265_3812), + "Neverland Cabin Chest": KH1LocationData("Neverland", 265_3813), + "Neverland Hold Flight 1st Chest": KH1LocationData("Neverland", 265_3814), + "Neverland Clock Tower Chest": KH1LocationData("Neverland", 265_4014), + "Neverland Hold Flight 2nd Chest": KH1LocationData("Neverland", 265_4051), + "Neverland Hold Yellow Trinity Green Chest": KH1LocationData("Neverland", 265_4052), + "Neverland Captain's Cabin Chest": KH1LocationData("Neverland", 265_4053), + "Hollow Bastion Rising Falls Water's Surface Chest": KH1LocationData("Hollow Bastion", 265_4054), + "Hollow Bastion Rising Falls Under Water 1st Chest": KH1LocationData("Hollow Bastion", 265_4091), + "Hollow Bastion Rising Falls Under Water 2nd Chest": KH1LocationData("Hollow Bastion", 265_4092), + "Hollow Bastion Rising Falls Floating Platform Near Save Chest": KH1LocationData("Hollow Bastion", 265_4093), + "Hollow Bastion Rising Falls Floating Platform Near Bubble Chest": KH1LocationData("Hollow Bastion", 265_4094), + "Hollow Bastion Rising Falls High Platform Chest": KH1LocationData("Hollow Bastion", 265_4131), + "Hollow Bastion Castle Gates Gravity Chest": KH1LocationData("Hollow Bastion", 265_4132), + "Hollow Bastion Castle Gates Freestanding Pillar Chest": KH1LocationData("Hollow Bastion", 265_4133), + "Hollow Bastion Castle Gates High Pillar Chest": KH1LocationData("Hollow Bastion", 265_4134), + "Hollow Bastion Great Crest Lower Chest": KH1LocationData("Hollow Bastion", 265_4171), + "Hollow Bastion Great Crest After Battle Platform Chest": KH1LocationData("Hollow Bastion", 265_4172), + "Hollow Bastion High Tower 2nd Gravity Chest": KH1LocationData("Hollow Bastion", 265_4173), + "Hollow Bastion High Tower 1st Gravity Chest": KH1LocationData("Hollow Bastion", 265_4174), + "Hollow Bastion High Tower Above Sliding Blocks Chest": KH1LocationData("Hollow Bastion", 265_4211), + "Hollow Bastion Library Top of Bookshelf Chest": KH1LocationData("Hollow Bastion", 265_4213), + "Hollow Bastion Library 1st Floor Turn the Carousel Chest": KH1LocationData("Hollow Bastion", 265_4214), + "Hollow Bastion Library Top of Bookshelf Turn the Carousel Chest": KH1LocationData("Hollow Bastion", 265_4251), + "Hollow Bastion Library 2nd Floor Turn the Carousel 1st Chest": KH1LocationData("Hollow Bastion", 265_4252), + "Hollow Bastion Library 2nd Floor Turn the Carousel 2nd Chest": KH1LocationData("Hollow Bastion", 265_4253), + "Hollow Bastion Lift Stop Library Node After High Tower Switch Gravity Chest": KH1LocationData("Hollow Bastion", 265_4254), + "Hollow Bastion Lift Stop Library Node Gravity Chest": KH1LocationData("Hollow Bastion", 265_4291), + "Hollow Bastion Lift Stop Under High Tower Sliding Blocks Chest": KH1LocationData("Hollow Bastion", 265_4292), + "Hollow Bastion Lift Stop Outside Library Gravity Chest": KH1LocationData("Hollow Bastion", 265_4293), + "Hollow Bastion Lift Stop Heartless Sigil Door Gravity Chest": KH1LocationData("Hollow Bastion", 265_4294), + "Hollow Bastion Base Level Bubble Under the Wall Platform Chest": KH1LocationData("Hollow Bastion", 265_4331), + "Hollow Bastion Base Level Platform Near Entrance Chest": KH1LocationData("Hollow Bastion", 265_4332), + "Hollow Bastion Base Level Near Crystal Switch Chest": KH1LocationData("Hollow Bastion", 265_4333), + "Hollow Bastion Waterway Near Save Chest": KH1LocationData("Hollow Bastion", 265_4334), + "Hollow Bastion Waterway Blizzard on Bubble Chest": KH1LocationData("Hollow Bastion", 265_4371), + "Hollow Bastion Waterway Unlock Passage from Base Level Chest": KH1LocationData("Hollow Bastion", 265_4372), + "Hollow Bastion Dungeon By Candles Chest": KH1LocationData("Hollow Bastion", 265_4373), + "Hollow Bastion Dungeon Corner Chest": KH1LocationData("Hollow Bastion", 265_4374), + "Hollow Bastion Grand Hall Steps Right Side Chest": KH1LocationData("Hollow Bastion", 265_4454), + "Hollow Bastion Grand Hall Oblivion Chest": KH1LocationData("Hollow Bastion", 265_4491), + "Hollow Bastion Grand Hall Left of Gate Chest": KH1LocationData("Hollow Bastion", 265_4492), + #"Hollow Bastion Entrance Hall Push the Statue Chest": KH1LocationData("Hollow Bastion", 265_4493), --handled later + "Hollow Bastion Entrance Hall Left of Emblem Door Chest": KH1LocationData("Hollow Bastion", 265_4212), + "Hollow Bastion Rising Falls White Trinity Chest": KH1LocationData("Hollow Bastion", 265_4494), + "End of the World Final Dimension 1st Chest": KH1LocationData("End of the World", 265_4531), + "End of the World Final Dimension 2nd Chest": KH1LocationData("End of the World", 265_4532), + "End of the World Final Dimension 3rd Chest": KH1LocationData("End of the World", 265_4533), + "End of the World Final Dimension 4th Chest": KH1LocationData("End of the World", 265_4534), + "End of the World Final Dimension 5th Chest": KH1LocationData("End of the World", 265_4571), + "End of the World Final Dimension 6th Chest": KH1LocationData("End of the World", 265_4572), + "End of the World Final Dimension 10th Chest": KH1LocationData("End of the World", 265_4573), + "End of the World Final Dimension 9th Chest": KH1LocationData("End of the World", 265_4574), + "End of the World Final Dimension 8th Chest": KH1LocationData("End of the World", 265_4611), + "End of the World Final Dimension 7th Chest": KH1LocationData("End of the World", 265_4612), + "End of the World Giant Crevasse 3rd Chest": KH1LocationData("End of the World", 265_4613), + "End of the World Giant Crevasse 5th Chest": KH1LocationData("End of the World", 265_4614), + "End of the World Giant Crevasse 1st Chest": KH1LocationData("End of the World", 265_4651), + "End of the World Giant Crevasse 4th Chest": KH1LocationData("End of the World", 265_4652), + "End of the World Giant Crevasse 2nd Chest": KH1LocationData("End of the World", 265_4653), + "End of the World World Terminus Traverse Town Chest": KH1LocationData("End of the World", 265_4654), + "End of the World World Terminus Wonderland Chest": KH1LocationData("End of the World", 265_4691), + "End of the World World Terminus Olympus Coliseum Chest": KH1LocationData("End of the World", 265_4692), + "End of the World World Terminus Deep Jungle Chest": KH1LocationData("End of the World", 265_4693), + "End of the World World Terminus Agrabah Chest": KH1LocationData("End of the World", 265_4694), + "End of the World World Terminus Atlantica Chest": KH1LocationData("End of the World", 265_4731), + "End of the World World Terminus Halloween Town Chest": KH1LocationData("End of the World", 265_4732), + "End of the World World Terminus Neverland Chest": KH1LocationData("End of the World", 265_4733), + "End of the World World Terminus 100 Acre Wood Chest": KH1LocationData("End of the World", 265_4734), + #"End of the World World Terminus Hollow Bastion Chest": KH1LocationData("End of the World", 265_4771), + "End of the World Final Rest Chest": KH1LocationData("End of the World", 265_4772), + "Monstro Chamber 6 White Trinity Chest": KH1LocationData("End of the World", 265_5092), + #"Awakening Chest": KH1LocationData("Awakening", 265_5093), missable + + "Traverse Town Defeat Guard Armor Dodge Roll Event": KH1LocationData("Traverse Town", 265_6011), + "Traverse Town Defeat Guard Armor Fire Event": KH1LocationData("Traverse Town", 265_6012), + "Traverse Town Defeat Guard Armor Blue Trinity Event": KH1LocationData("Traverse Town", 265_6013), + "Traverse Town Leon Secret Waterway Earthshine Event": KH1LocationData("Traverse Town", 265_6014), + "Traverse Town Kairi Secret Waterway Oathkeeper Event": KH1LocationData("Traverse Town", 265_6015), + "Traverse Town Defeat Guard Armor Brave Warrior Event": KH1LocationData("Traverse Town", 265_6016), + "Deep Jungle Defeat Sabor White Fang Event": KH1LocationData("Deep Jungle", 265_6021), + "Deep Jungle Defeat Clayton Cure Event": KH1LocationData("Deep Jungle", 265_6022), + "Deep Jungle Seal Keyhole Jungle King Event": KH1LocationData("Deep Jungle", 265_6023), + "Deep Jungle Seal Keyhole Red Trinity Event": KH1LocationData("Deep Jungle", 265_6024), + "Olympus Coliseum Clear Phil's Training Thunder Event": KH1LocationData("Olympus Coliseum", 265_6031), + "Olympus Coliseum Defeat Cerberus Inferno Band Event": KH1LocationData("Olympus Coliseum", 265_6033), + "Wonderland Defeat Trickmaster Blizzard Event": KH1LocationData("Wonderland", 265_6041), + "Wonderland Defeat Trickmaster Ifrit's Horn Event": KH1LocationData("Wonderland", 265_6042), + "Agrabah Defeat Pot Centipede Ray of Light Event": KH1LocationData("Agrabah", 265_6051), + "Agrabah Defeat Jafar Blizzard Event": KH1LocationData("Agrabah", 265_6052), + "Agrabah Defeat Jafar Genie Fire Event": KH1LocationData("Agrabah", 265_6053), + "Agrabah Seal Keyhole Genie Event": KH1LocationData("Agrabah", 265_6054), + "Agrabah Seal Keyhole Three Wishes Event": KH1LocationData("Agrabah", 265_6055), + "Agrabah Seal Keyhole Green Trinity Event": KH1LocationData("Agrabah", 265_6056), + "Monstro Defeat Parasite Cage I Goofy Cheer Event": KH1LocationData("Monstro", 265_6061), + "Monstro Defeat Parasite Cage II Stop Event": KH1LocationData("Monstro", 265_6062), + "Atlantica Defeat Ursula I Mermaid Kick Event": KH1LocationData("Atlantica", 265_6071), + "Atlantica Defeat Ursula II Thunder Event": KH1LocationData("Atlantica", 265_6072), + "Atlantica Seal Keyhole Crabclaw Event": KH1LocationData("Atlantica", 265_6073), + "Halloween Town Defeat Oogie Boogie Holy Circlet Event": KH1LocationData("Halloween Town", 265_6081), + "Halloween Town Defeat Oogie's Manor Gravity Event": KH1LocationData("Halloween Town", 265_6082), + "Halloween Town Seal Keyhole Pumpkinhead Event": KH1LocationData("Halloween Town", 265_6083), + "Neverland Defeat Anti Sora Raven's Claw Event": KH1LocationData("Neverland", 265_6091), + "Neverland Encounter Hook Cure Event": KH1LocationData("Neverland", 265_6092), + "Neverland Seal Keyhole Fairy Harp Event": KH1LocationData("Neverland", 265_6093), + "Neverland Seal Keyhole Tinker Bell Event": KH1LocationData("Neverland", 265_6094), + "Neverland Seal Keyhole Glide Event": KH1LocationData("Neverland", 265_6095), + "Neverland Defeat Phantom Stop Event": KH1LocationData("Neverland", 265_6096), + "Neverland Defeat Captain Hook Ars Arcanum Event": KH1LocationData("Neverland", 265_6097), + "Hollow Bastion Defeat Riku I White Trinity Event": KH1LocationData("Hollow Bastion", 265_6101), + "Hollow Bastion Defeat Maleficent Donald Cheer Event": KH1LocationData("Hollow Bastion", 265_6102), + "Hollow Bastion Defeat Dragon Maleficent Fireglow Event": KH1LocationData("Hollow Bastion", 265_6103), + "Hollow Bastion Defeat Riku II Ragnarok Event": KH1LocationData("Hollow Bastion", 265_6104), + "Hollow Bastion Defeat Behemoth Omega Arts Event": KH1LocationData("Hollow Bastion", 265_6105), + "Hollow Bastion Speak to Princesses Fire Event": KH1LocationData("Hollow Bastion", 265_6106), + "End of the World Defeat Chernabog Superglide Event": KH1LocationData("End of the World", 265_6111), + + "Traverse Town Mail Postcard 01 Event": KH1LocationData("Traverse Town", 265_6120), + "Traverse Town Mail Postcard 02 Event": KH1LocationData("Traverse Town", 265_6121), + "Traverse Town Mail Postcard 03 Event": KH1LocationData("Traverse Town", 265_6122), + "Traverse Town Mail Postcard 04 Event": KH1LocationData("Traverse Town", 265_6123), + "Traverse Town Mail Postcard 05 Event": KH1LocationData("Traverse Town", 265_6124), + "Traverse Town Mail Postcard 06 Event": KH1LocationData("Traverse Town", 265_6125), + "Traverse Town Mail Postcard 07 Event": KH1LocationData("Traverse Town", 265_6126), + "Traverse Town Mail Postcard 08 Event": KH1LocationData("Traverse Town", 265_6127), + "Traverse Town Mail Postcard 09 Event": KH1LocationData("Traverse Town", 265_6128), + "Traverse Town Mail Postcard 10 Event": KH1LocationData("Traverse Town", 265_6129), + + "Traverse Town Defeat Opposite Armor Aero Event": KH1LocationData("Traverse Town", 265_6131), + + "Atlantica Undersea Gorge Blizzard Clam": KH1LocationData("Atlantica", 265_6201), + "Atlantica Undersea Gorge Ocean Floor Clam": KH1LocationData("Atlantica", 265_6202), + "Atlantica Undersea Valley Higher Cave Clam": KH1LocationData("Atlantica", 265_6203), + "Atlantica Undersea Valley Lower Cave Clam": KH1LocationData("Atlantica", 265_6204), + "Atlantica Undersea Valley Fire Clam": KH1LocationData("Atlantica", 265_6205), + "Atlantica Undersea Valley Wall Clam": KH1LocationData("Atlantica", 265_6206), + "Atlantica Undersea Valley Pillar Clam": KH1LocationData("Atlantica", 265_6207), + "Atlantica Undersea Valley Ocean Floor Clam": KH1LocationData("Atlantica", 265_6208), + "Atlantica Triton's Palace Thunder Clam": KH1LocationData("Atlantica", 265_6209), + "Atlantica Triton's Palace Wall Right Clam": KH1LocationData("Atlantica", 265_6210), + "Atlantica Triton's Palace Near Path Clam": KH1LocationData("Atlantica", 265_6211), + "Atlantica Triton's Palace Wall Left Clam": KH1LocationData("Atlantica", 265_6212), + "Atlantica Cavern Nook Clam": KH1LocationData("Atlantica", 265_6213), + "Atlantica Below Deck Clam": KH1LocationData("Atlantica", 265_6214), + "Atlantica Undersea Garden Clam": KH1LocationData("Atlantica", 265_6215), + "Atlantica Undersea Cave Clam": KH1LocationData("Atlantica", 265_6216), + + #"Traverse Town Magician's Study Turn in Naturespark": KH1LocationData("Traverse Town", 265_6300), + #"Traverse Town Magician's Study Turn in Watergleam": KH1LocationData("Traverse Town", 265_6301), + #"Traverse Town Magician's Study Turn in Fireglow": KH1LocationData("Traverse Town", 265_6302), + #"Traverse Town Magician's Study Turn in all Summon Gems": KH1LocationData("Traverse Town", 265_6303), + "Traverse Town Geppetto's House Geppetto Reward 1": KH1LocationData("Traverse Town", 265_6304), + "Traverse Town Geppetto's House Geppetto Reward 2": KH1LocationData("Traverse Town", 265_6305), + "Traverse Town Geppetto's House Geppetto Reward 3": KH1LocationData("Traverse Town", 265_6306), + "Traverse Town Geppetto's House Geppetto Reward 4": KH1LocationData("Traverse Town", 265_6307), + "Traverse Town Geppetto's House Geppetto Reward 5": KH1LocationData("Traverse Town", 265_6308), + "Traverse Town Geppetto's House Geppetto All Summons Reward": KH1LocationData("Traverse Town", 265_6309), + "Traverse Town Geppetto's House Talk to Pinocchio": KH1LocationData("Traverse Town", 265_6310), + "Traverse Town Magician's Study Obtained All Arts Items": KH1LocationData("Traverse Town", 265_6311), + "Traverse Town Magician's Study Obtained All LV1 Magic": KH1LocationData("Traverse Town", 265_6312), + "Traverse Town Magician's Study Obtained All LV3 Magic": KH1LocationData("Traverse Town", 265_6313), + "Traverse Town Piano Room Return 10 Puppies": KH1LocationData("Traverse Town", 265_6314), + "Traverse Town Piano Room Return 20 Puppies": KH1LocationData("Traverse Town", 265_6315), + "Traverse Town Piano Room Return 30 Puppies": KH1LocationData("Traverse Town", 265_6316), + "Traverse Town Piano Room Return 40 Puppies": KH1LocationData("Traverse Town", 265_6317), + "Traverse Town Piano Room Return 50 Puppies Reward 1": KH1LocationData("Traverse Town", 265_6318), + "Traverse Town Piano Room Return 50 Puppies Reward 2": KH1LocationData("Traverse Town", 265_6319), + "Traverse Town Piano Room Return 60 Puppies": KH1LocationData("Traverse Town", 265_6320), + "Traverse Town Piano Room Return 70 Puppies": KH1LocationData("Traverse Town", 265_6321), + "Traverse Town Piano Room Return 80 Puppies": KH1LocationData("Traverse Town", 265_6322), + "Traverse Town Piano Room Return 90 Puppies": KH1LocationData("Traverse Town", 265_6324), + "Traverse Town Piano Room Return 99 Puppies Reward 1": KH1LocationData("Traverse Town", 265_6326), + "Traverse Town Piano Room Return 99 Puppies Reward 2": KH1LocationData("Traverse Town", 265_6327), + "Olympus Coliseum Cloud Sonic Blade Event": KH1LocationData("Olympus Coliseum", 265_6032), #Had to change the way we send this check, not changing location_id + "Olympus Coliseum Defeat Sephiroth One-Winged Angel Event": KH1LocationData("Olympus Coliseum", 265_6328), + "Olympus Coliseum Defeat Ice Titan Diamond Dust Event": KH1LocationData("Olympus Coliseum", 265_6329), + "Olympus Coliseum Gates Purple Jar After Defeating Hades": KH1LocationData("Olympus Coliseum", 265_6330), + "Halloween Town Guillotine Square Ring Jack's Doorbell 3 Times": KH1LocationData("Halloween Town", 265_6331), + #"Neverland Clock Tower 01:00 Door": KH1LocationData("Neverland", 265_6332), + #"Neverland Clock Tower 02:00 Door": KH1LocationData("Neverland", 265_6333), + #"Neverland Clock Tower 03:00 Door": KH1LocationData("Neverland", 265_6334), + #"Neverland Clock Tower 04:00 Door": KH1LocationData("Neverland", 265_6335), + #"Neverland Clock Tower 05:00 Door": KH1LocationData("Neverland", 265_6336), + #"Neverland Clock Tower 06:00 Door": KH1LocationData("Neverland", 265_6337), + #"Neverland Clock Tower 07:00 Door": KH1LocationData("Neverland", 265_6338), + #"Neverland Clock Tower 08:00 Door": KH1LocationData("Neverland", 265_6339), + #"Neverland Clock Tower 09:00 Door": KH1LocationData("Neverland", 265_6340), + #"Neverland Clock Tower 10:00 Door": KH1LocationData("Neverland", 265_6341), + #"Neverland Clock Tower 11:00 Door": KH1LocationData("Neverland", 265_6342), + #"Neverland Clock Tower 12:00 Door": KH1LocationData("Neverland", 265_6343), + "Neverland Hold Aero Chest": KH1LocationData("Neverland", 265_6344), + "100 Acre Wood Bouncing Spot Turn in Rare Nut 1": KH1LocationData("100 Acre Wood", 265_6345), + "100 Acre Wood Bouncing Spot Turn in Rare Nut 2": KH1LocationData("100 Acre Wood", 265_6346), + "100 Acre Wood Bouncing Spot Turn in Rare Nut 3": KH1LocationData("100 Acre Wood", 265_6347), + "100 Acre Wood Bouncing Spot Turn in Rare Nut 4": KH1LocationData("100 Acre Wood", 265_6348), + "100 Acre Wood Bouncing Spot Turn in Rare Nut 5": KH1LocationData("100 Acre Wood", 265_6349), + "100 Acre Wood Pooh's House Owl Cheer": KH1LocationData("100 Acre Wood", 265_6350), + "100 Acre Wood Convert Torn Page 1": KH1LocationData("100 Acre Wood", 265_6351), + "100 Acre Wood Convert Torn Page 2": KH1LocationData("100 Acre Wood", 265_6352), + "100 Acre Wood Convert Torn Page 3": KH1LocationData("100 Acre Wood", 265_6353), + "100 Acre Wood Convert Torn Page 4": KH1LocationData("100 Acre Wood", 265_6354), + "100 Acre Wood Convert Torn Page 5": KH1LocationData("100 Acre Wood", 265_6355), + "100 Acre Wood Pooh's House Start Fire": KH1LocationData("100 Acre Wood", 265_6356), + "100 Acre Wood Pooh's Room Cabinet": KH1LocationData("100 Acre Wood", 265_6357), + "100 Acre Wood Pooh's Room Chimney": KH1LocationData("100 Acre Wood", 265_6358), + "100 Acre Wood Bouncing Spot Break Log": KH1LocationData("100 Acre Wood", 265_6359), + "100 Acre Wood Bouncing Spot Fall Through Top of Tree Next to Pooh": KH1LocationData("100 Acre Wood", 265_6360), + "Deep Jungle Camp Hi-Potion Experiment": KH1LocationData("Deep Jungle", 265_6361), + "Deep Jungle Camp Ether Experiment": KH1LocationData("Deep Jungle", 265_6362), + "Deep Jungle Camp Replication Experiment": KH1LocationData("Deep Jungle", 265_6363), + "Deep Jungle Cliff Save Gorillas": KH1LocationData("Deep Jungle", 265_6364), + "Deep Jungle Tree House Save Gorillas": KH1LocationData("Deep Jungle", 265_6365), + "Deep Jungle Camp Save Gorillas": KH1LocationData("Deep Jungle", 265_6366), + "Deep Jungle Bamboo Thicket Save Gorillas": KH1LocationData("Deep Jungle", 265_6367), + "Deep Jungle Climbing Trees Save Gorillas": KH1LocationData("Deep Jungle", 265_6368), + "Olympus Coliseum Olympia Chest": KH1LocationData("Olympus Coliseum", 265_6369), + "Deep Jungle Jungle Slider 10 Fruits": KH1LocationData("Deep Jungle", 265_6370), + "Deep Jungle Jungle Slider 20 Fruits": KH1LocationData("Deep Jungle", 265_6371), + "Deep Jungle Jungle Slider 30 Fruits": KH1LocationData("Deep Jungle", 265_6372), + "Deep Jungle Jungle Slider 40 Fruits": KH1LocationData("Deep Jungle", 265_6373), + "Deep Jungle Jungle Slider 50 Fruits": KH1LocationData("Deep Jungle", 265_6374), + "Traverse Town 1st District Speak with Cid Event": KH1LocationData("Traverse Town", 265_6375), + "Wonderland Bizarre Room Read Book": KH1LocationData("Wonderland", 265_6376), + "Olympus Coliseum Coliseum Gates Green Trinity": KH1LocationData("Olympus Coliseum", 265_6377), + "Agrabah Defeat Kurt Zisa Zantetsuken Event": KH1LocationData("Agrabah", 265_6378), + "Hollow Bastion Defeat Unknown EXP Necklace Event": KH1LocationData("Hollow Bastion", 265_6379), + "Olympus Coliseum Coliseum Gates Hero's License Event": KH1LocationData("Olympus Coliseum", 265_6380), + "Atlantica Sunken Ship Crystal Trident Event": KH1LocationData("Atlantica", 265_6381), + "Halloween Town Graveyard Forget-Me-Not Event": KH1LocationData("Halloween Town", 265_6382), + "Deep Jungle Tent Protect-G Event": KH1LocationData("Deep Jungle", 265_6383), + "Deep Jungle Cavern of Hearts Navi-G Piece Event": KH1LocationData("Deep Jungle", 265_6384), + "Wonderland Bizarre Room Navi-G Piece Event": KH1LocationData("Wonderland", 265_6385), + "Olympus Coliseum Coliseum Gates Entry Pass Event": KH1LocationData("Olympus Coliseum", 265_6386), + + "Traverse Town Synth Log": KH1LocationData("Traverse Town", 265_6401), + "Traverse Town Synth Cloth": KH1LocationData("Traverse Town", 265_6402), + "Traverse Town Synth Rope": KH1LocationData("Traverse Town", 265_6403), + "Traverse Town Synth Seagull Egg": KH1LocationData("Traverse Town", 265_6404), + "Traverse Town Synth Fish": KH1LocationData("Traverse Town", 265_6405), + "Traverse Town Synth Mushroom": KH1LocationData("Traverse Town", 265_6406), + + "Traverse Town Item Shop Postcard": KH1LocationData("Traverse Town", 265_6500), + "Traverse Town 1st District Safe Postcard": KH1LocationData("Traverse Town", 265_6501), + "Traverse Town Gizmo Shop Postcard 1": KH1LocationData("Traverse Town", 265_6502), + "Traverse Town Gizmo Shop Postcard 2": KH1LocationData("Traverse Town", 265_6503), + "Traverse Town Item Workshop Postcard": KH1LocationData("Traverse Town", 265_6504), + "Traverse Town 3rd District Balcony Postcard": KH1LocationData("Traverse Town", 265_6505), + "Traverse Town Geppetto's House Postcard": KH1LocationData("Traverse Town", 265_6506), + "Halloween Town Lab Torn Page": KH1LocationData("Halloween Town", 265_6508), + "Hollow Bastion Entrance Hall Emblem Piece (Flame)": KH1LocationData("Hollow Bastion", 265_6516), + "Hollow Bastion Entrance Hall Emblem Piece (Chest)": KH1LocationData("Hollow Bastion", 265_6517), + "Hollow Bastion Entrance Hall Emblem Piece (Statue)": KH1LocationData("Hollow Bastion", 265_6518), + "Hollow Bastion Entrance Hall Emblem Piece (Fountain)": KH1LocationData("Hollow Bastion", 265_6519), + #"Traverse Town 1st District Leon Gift": KH1LocationData("Traverse Town", 265_6520), + #"Traverse Town 1st District Aerith Gift": KH1LocationData("Traverse Town", 265_6521), + "Hollow Bastion Library Speak to Belle Divine Rose": KH1LocationData("Hollow Bastion", 265_6522), + "Hollow Bastion Library Speak to Aerith Cure": KH1LocationData("Hollow Bastion", 265_6523), + + "Agrabah Defeat Jafar Genie Ansem's Report 1": KH1LocationData("Agrabah", 265_7018), + "Hollow Bastion Speak with Aerith Ansem's Report 2": KH1LocationData("Hollow Bastion", 265_7017), + "Atlantica Defeat Ursula II Ansem's Report 3": KH1LocationData("Atlantica", 265_7016), + "Hollow Bastion Speak with Aerith Ansem's Report 4": KH1LocationData("Hollow Bastion", 265_7015), + "Hollow Bastion Defeat Maleficent Ansem's Report 5": KH1LocationData("Hollow Bastion", 265_7014), + "Hollow Bastion Speak with Aerith Ansem's Report 6": KH1LocationData("Hollow Bastion", 265_7013), + "Halloween Town Defeat Oogie Boogie Ansem's Report 7": KH1LocationData("Halloween Town", 265_7012), + "Olympus Coliseum Defeat Hades Ansem's Report 8": KH1LocationData("Olympus Coliseum", 265_7011), + "Neverland Defeat Hook Ansem's Report 9": KH1LocationData("Neverland", 265_7028), + "Hollow Bastion Speak with Aerith Ansem's Report 10": KH1LocationData("Hollow Bastion", 265_7027), + "Agrabah Defeat Kurt Zisa Ansem's Report 11": KH1LocationData("Agrabah", 265_7026), + "Olympus Coliseum Defeat Sephiroth Ansem's Report 12": KH1LocationData("Olympus Coliseum", 265_7025), + "Hollow Bastion Defeat Unknown Ansem's Report 13": KH1LocationData("Hollow Bastion", 265_7024), + "Level 001": KH1LocationData("Levels", 265_8001), + "Level 002": KH1LocationData("Levels", 265_8002), + "Level 003": KH1LocationData("Levels", 265_8003), + "Level 004": KH1LocationData("Levels", 265_8004), + "Level 005": KH1LocationData("Levels", 265_8005), + "Level 006": KH1LocationData("Levels", 265_8006), + "Level 007": KH1LocationData("Levels", 265_8007), + "Level 008": KH1LocationData("Levels", 265_8008), + "Level 009": KH1LocationData("Levels", 265_8009), + "Level 010": KH1LocationData("Levels", 265_8010), + "Level 011": KH1LocationData("Levels", 265_8011), + "Level 012": KH1LocationData("Levels", 265_8012), + "Level 013": KH1LocationData("Levels", 265_8013), + "Level 014": KH1LocationData("Levels", 265_8014), + "Level 015": KH1LocationData("Levels", 265_8015), + "Level 016": KH1LocationData("Levels", 265_8016), + "Level 017": KH1LocationData("Levels", 265_8017), + "Level 018": KH1LocationData("Levels", 265_8018), + "Level 019": KH1LocationData("Levels", 265_8019), + "Level 020": KH1LocationData("Levels", 265_8020), + "Level 021": KH1LocationData("Levels", 265_8021), + "Level 022": KH1LocationData("Levels", 265_8022), + "Level 023": KH1LocationData("Levels", 265_8023), + "Level 024": KH1LocationData("Levels", 265_8024), + "Level 025": KH1LocationData("Levels", 265_8025), + "Level 026": KH1LocationData("Levels", 265_8026), + "Level 027": KH1LocationData("Levels", 265_8027), + "Level 028": KH1LocationData("Levels", 265_8028), + "Level 029": KH1LocationData("Levels", 265_8029), + "Level 030": KH1LocationData("Levels", 265_8030), + "Level 031": KH1LocationData("Levels", 265_8031), + "Level 032": KH1LocationData("Levels", 265_8032), + "Level 033": KH1LocationData("Levels", 265_8033), + "Level 034": KH1LocationData("Levels", 265_8034), + "Level 035": KH1LocationData("Levels", 265_8035), + "Level 036": KH1LocationData("Levels", 265_8036), + "Level 037": KH1LocationData("Levels", 265_8037), + "Level 038": KH1LocationData("Levels", 265_8038), + "Level 039": KH1LocationData("Levels", 265_8039), + "Level 040": KH1LocationData("Levels", 265_8040), + "Level 041": KH1LocationData("Levels", 265_8041), + "Level 042": KH1LocationData("Levels", 265_8042), + "Level 043": KH1LocationData("Levels", 265_8043), + "Level 044": KH1LocationData("Levels", 265_8044), + "Level 045": KH1LocationData("Levels", 265_8045), + "Level 046": KH1LocationData("Levels", 265_8046), + "Level 047": KH1LocationData("Levels", 265_8047), + "Level 048": KH1LocationData("Levels", 265_8048), + "Level 049": KH1LocationData("Levels", 265_8049), + "Level 050": KH1LocationData("Levels", 265_8050), + "Level 051": KH1LocationData("Levels", 265_8051), + "Level 052": KH1LocationData("Levels", 265_8052), + "Level 053": KH1LocationData("Levels", 265_8053), + "Level 054": KH1LocationData("Levels", 265_8054), + "Level 055": KH1LocationData("Levels", 265_8055), + "Level 056": KH1LocationData("Levels", 265_8056), + "Level 057": KH1LocationData("Levels", 265_8057), + "Level 058": KH1LocationData("Levels", 265_8058), + "Level 059": KH1LocationData("Levels", 265_8059), + "Level 060": KH1LocationData("Levels", 265_8060), + "Level 061": KH1LocationData("Levels", 265_8061), + "Level 062": KH1LocationData("Levels", 265_8062), + "Level 063": KH1LocationData("Levels", 265_8063), + "Level 064": KH1LocationData("Levels", 265_8064), + "Level 065": KH1LocationData("Levels", 265_8065), + "Level 066": KH1LocationData("Levels", 265_8066), + "Level 067": KH1LocationData("Levels", 265_8067), + "Level 068": KH1LocationData("Levels", 265_8068), + "Level 069": KH1LocationData("Levels", 265_8069), + "Level 070": KH1LocationData("Levels", 265_8070), + "Level 071": KH1LocationData("Levels", 265_8071), + "Level 072": KH1LocationData("Levels", 265_8072), + "Level 073": KH1LocationData("Levels", 265_8073), + "Level 074": KH1LocationData("Levels", 265_8074), + "Level 075": KH1LocationData("Levels", 265_8075), + "Level 076": KH1LocationData("Levels", 265_8076), + "Level 077": KH1LocationData("Levels", 265_8077), + "Level 078": KH1LocationData("Levels", 265_8078), + "Level 079": KH1LocationData("Levels", 265_8079), + "Level 080": KH1LocationData("Levels", 265_8080), + "Level 081": KH1LocationData("Levels", 265_8081), + "Level 082": KH1LocationData("Levels", 265_8082), + "Level 083": KH1LocationData("Levels", 265_8083), + "Level 084": KH1LocationData("Levels", 265_8084), + "Level 085": KH1LocationData("Levels", 265_8085), + "Level 086": KH1LocationData("Levels", 265_8086), + "Level 087": KH1LocationData("Levels", 265_8087), + "Level 088": KH1LocationData("Levels", 265_8088), + "Level 089": KH1LocationData("Levels", 265_8089), + "Level 090": KH1LocationData("Levels", 265_8090), + "Level 091": KH1LocationData("Levels", 265_8091), + "Level 092": KH1LocationData("Levels", 265_8092), + "Level 093": KH1LocationData("Levels", 265_8093), + "Level 094": KH1LocationData("Levels", 265_8094), + "Level 095": KH1LocationData("Levels", 265_8095), + "Level 096": KH1LocationData("Levels", 265_8096), + "Level 097": KH1LocationData("Levels", 265_8097), + "Level 098": KH1LocationData("Levels", 265_8098), + "Level 099": KH1LocationData("Levels", 265_8099), + "Level 100": KH1LocationData("Levels", 265_8100), + "Complete Phil Cup": KH1LocationData("Olympus Coliseum", 265_9001), + "Complete Phil Cup Solo": KH1LocationData("Olympus Coliseum", 265_9002), + "Complete Phil Cup Time Trial": KH1LocationData("Olympus Coliseum", 265_9003), + "Complete Pegasus Cup": KH1LocationData("Olympus Coliseum", 265_9004), + "Complete Pegasus Cup Solo": KH1LocationData("Olympus Coliseum", 265_9005), + "Complete Pegasus Cup Time Trial": KH1LocationData("Olympus Coliseum", 265_9006), + "Complete Hercules Cup": KH1LocationData("Olympus Coliseum", 265_9007), + "Complete Hercules Cup Solo": KH1LocationData("Olympus Coliseum", 265_9008), + "Complete Hercules Cup Time Trial": KH1LocationData("Olympus Coliseum", 265_9009), + "Complete Hades Cup": KH1LocationData("Olympus Coliseum", 265_9010), + "Complete Hades Cup Solo": KH1LocationData("Olympus Coliseum", 265_9011), + "Complete Hades Cup Time Trial": KH1LocationData("Olympus Coliseum", 265_9012), + "Hades Cup Defeat Cloud and Leon Event": KH1LocationData("Olympus Coliseum", 265_9013), + "Hades Cup Defeat Yuffie Event": KH1LocationData("Olympus Coliseum", 265_9014), + "Hades Cup Defeat Cerberus Event": KH1LocationData("Olympus Coliseum", 265_9015), + "Hades Cup Defeat Behemoth Event": KH1LocationData("Olympus Coliseum", 265_9016), + "Hades Cup Defeat Hades Event": KH1LocationData("Olympus Coliseum", 265_9017), + "Hercules Cup Defeat Cloud Event": KH1LocationData("Olympus Coliseum", 265_9018), + "Hercules Cup Yellow Trinity Event": KH1LocationData("Olympus Coliseum", 265_9019), + "Final Ansem": KH1LocationData("Final", 265_9999) +} + +event_location_table: Dict[str, KH1LocationData] = {} + +lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in location_table.items() if data.code} + + +#Make location categories +location_name_groups: Dict[str, Set[str]] = {} +for location in location_table.keys(): + category = location_table[location].category + if category not in location_name_groups.keys(): + location_name_groups[category] = set() + location_name_groups[category].add(location) diff --git a/worlds/kh1/Options.py b/worlds/kh1/Options.py new file mode 100644 index 000000000000..63732f61b2d0 --- /dev/null +++ b/worlds/kh1/Options.py @@ -0,0 +1,445 @@ +from dataclasses import dataclass + +from Options import NamedRange, Choice, Range, Toggle, DefaultOnToggle, PerGameCommonOptions, StartInventoryPool, OptionGroup + +class StrengthIncrease(Range): + """ + Determines the number of Strength Increases to add to the multiworld. + + The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld. + Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random. + """ + display_name = "STR Increases" + range_start = 0 + range_end = 100 + default = 24 + +class DefenseIncrease(Range): + """ + Determines the number of Defense Increases to add to the multiworld. + + The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld. + Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random. + """ + display_name = "DEF Increases" + range_start = 0 + range_end = 100 + default = 24 + +class HPIncrease(Range): + """ + Determines the number of HP Increases to add to the multiworld. + + The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld. + Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random. + """ + display_name = "HP Increases" + range_start = 0 + range_end = 100 + default = 23 + +class APIncrease(Range): + """ + Determines the number of AP Increases to add to the multiworld. + + The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld. + Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random. + """ + display_name = "AP Increases" + range_start = 0 + range_end = 100 + default = 18 + +class MPIncrease(Range): + """ + Determines the number of MP Increases to add to the multiworld. + + The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld. + Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random. + """ + display_name = "MP Increases" + range_start = 0 + range_end = 20 + default = 7 + +class AccessorySlotIncrease(Range): + """ + Determines the number of Accessory Slot Increases to add to the multiworld. + + The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld. + Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random. + """ + display_name = "Accessory Slot Increases" + range_start = 0 + range_end = 6 + default = 1 + +class ItemSlotIncrease(Range): + """ + Determines the number of Item Slot Increases to add to the multiworld. + + The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld. + Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random. + """ + display_name = "Item Slot Increases" + range_start = 0 + range_end = 5 + default = 3 + +class Atlantica(Toggle): + """ + Toggle whether to include checks in Atlantica. + """ + display_name = "Atlantica" + +class HundredAcreWood(Toggle): + """ + Toggle whether to include checks in the 100 Acre Wood. + """ + display_name = "100 Acre Wood" + +class SuperBosses(Toggle): + """ + Toggle whether to include checks behind Super Bosses. + """ + display_name = "Super Bosses" + +class Cups(Toggle): + """ + Toggle whether to include checks behind completing Phil, Pegasus, Hercules, or Hades cups. + Please note that the cup items will still appear in the multiworld even if toggled off, as they are required to challenge Sephiroth. + """ + display_name = "Cups" + +class Goal(Choice): + """ + Determines when victory is achieved in your playthrough. + + Sephiroth: Defeat Sephiroth + Unknown: Defeat Unknown + Postcards: Turn in all 10 postcards in Traverse Town + Final Ansem: Enter End of the World and defeat Ansem as normal + Puppies: Rescue and return all 99 puppies in Traverse Town + Final Rest: Open the chest in End of the World Final Rest + """ + display_name = "Goal" + option_sephiroth = 0 + option_unknown = 1 + option_postcards = 2 + option_final_ansem = 3 + option_puppies = 4 + option_final_rest = 5 + default = 3 + +class EndoftheWorldUnlock(Choice): + """Determines how End of the World is unlocked. + + Item: You can receive an item called "End of the World" which unlocks the world + Reports: A certain amount of reports are required to unlock End of the World, which is defined in your options""" + display_name = "End of the World Unlock" + option_item = 0 + option_reports = 1 + default = 1 + +class FinalRestDoor(Choice): + """Determines what conditions need to be met to manifest the door in Final Rest, allowing the player to challenge Ansem. + + Reports: A certain number of Ansem's Reports are required, determined by the "Reports to Open Final Rest Door" option + Puppies: Having all 99 puppies is required + Postcards: Turning in all 10 postcards is required + Superbosses: Defeating Sephiroth, Unknown, Kurt Zisa, and Phantom are required + """ + display_name = "Final Rest Door" + option_reports = 0 + option_puppies = 1 + option_postcards = 2 + option_superbosses = 3 + +class Puppies(Choice): + """ + Determines how dalmatian puppies are shuffled into the pool. + Full: All puppies are in one location + Triplets: Puppies are found in triplets just as they are in the base game + Individual: One puppy can be found per location + """ + display_name = "Puppies" + option_full = 0 + option_triplets = 1 + option_individual = 2 + default = 1 + +class EXPMultiplier(NamedRange): + """ + Determines the multiplier to apply to EXP gained. + """ + display_name = "EXP Multiplier" + default = 16 + range_start = default // 4 + range_end = 128 + special_range_names = { + "0.25x": int(default // 4), + "0.5x": int(default // 2), + "1x": default, + "2x": default * 2, + "3x": default * 3, + "4x": default * 4, + "8x": default * 8, + } + +class RequiredReportsEotW(Range): + """ + If End of the World Unlock is set to "Reports", determines the number of Ansem's Reports required to open End of the World. + """ + display_name = "Reports to Open End of the World" + default = 4 + range_start = 0 + range_end = 13 + +class RequiredReportsDoor(Range): + """ + If Final Rest Door is set to "Reports", determines the number of Ansem's Reports required to manifest the door in Final Rest to challenge Ansem. + """ + display_name = "Reports to Open Final Rest Door" + default = 4 + range_start = 0 + range_end = 13 + +class ReportsInPool(Range): + """ + Determines the number of Ansem's Reports in the item pool. + """ + display_name = "Reports in Pool" + default = 4 + range_start = 0 + range_end = 13 + +class RandomizeKeybladeStats(DefaultOnToggle): + """ + Determines whether Keyblade stats should be randomized. + """ + display_name = "Randomize Keyblade Stats" + +class KeybladeMinStrength(Range): + """ + Determines the minimum STR bonus a keyblade can have. + """ + display_name = "Keyblade Minimum STR Bonus" + default = 3 + range_start = 0 + range_end = 20 + +class KeybladeMaxStrength(Range): + """ + Determines the maximum STR bonus a keyblade can have. + """ + display_name = "Keyblade Maximum STR Bonus" + default = 14 + range_start = 0 + range_end = 20 + +class KeybladeMinMP(Range): + """ + Determines the minimum MP bonus a keyblade can have. + """ + display_name = "Keyblade Minimum MP Bonus" + default = -2 + range_start = -2 + range_end = 5 + +class KeybladeMaxMP(Range): + """ + Determines the maximum MP bonus a keyblade can have. + """ + display_name = "Keyblade Maximum MP Bonus" + default = 3 + range_start = -2 + range_end = 5 + +class LevelChecks(Range): + """ + Determines the maximum level for which checks can be obtained. + """ + display_name = "Level Checks" + default = 100 + range_start = 0 + range_end = 100 + +class ForceStatsOnLevels(NamedRange): + """ + If this value is less than the value for Level Checks, this determines the minimum level from which only stat ups are obtained at level up locations. + For example, if you want to be able to find any multiworld item from levels 1-50, then just stat ups for levels 51-100, set this value to 51. + """ + display_name = "Force Stats on Level Starting From" + default = 1 + range_start = 1 + range_end = 101 + special_range_names = { + "none": 101, + "multiworld-to-level-50": 51, + "all": 1 + } + +class BadStartingWeapons(Toggle): + """ + Forces Kingdom Key, Dream Sword, Dream Shield, and Dream Staff to have bad stats. + """ + display_name = "Bad Starting Weapons" + +class DonaldDeathLink(Toggle): + """ + If Donald is KO'ed, so is Sora. If Death Link is toggled on in your client, this will send a death to everyone. + """ + display_name = "Donald Death Link" + +class GoofyDeathLink(Toggle): + """ + If Goofy is KO'ed, so is Sora. If Death Link is toggled on in your client, this will send a death to everyone. + """ + display_name = "Goofy Death Link" + +class KeybladesUnlockChests(Toggle): + """ + If toggled on, the player is required to have a certain keyblade to open chests in certain worlds. + TT - Lionheart + WL - Lady Luck + OC - Olympia + DJ - Jungle King + AG - Three Wishes + MS - Wishing Star + HT - Pumpkinhead + NL - Fairy Harp + HB - Divine Rose + EotW - Oblivion + HAW - Oathkeeper + + Note: Does not apply to Atlantica, the emblem and carousel chests in Hollow Bastion, or the Aero chest in Neverland currently. + """ + display_name = "Keyblades Unlock Chests" + +class InteractInBattle(Toggle): + """ + Allow Sora to talk to people, examine objects, and open chests in battle. + """ + display_name = "Interact in Battle" + +class AdvancedLogic(Toggle): + """ + If on, logic may expect you to do advanced skips like using Combo Master, Dumbo, and other unusual methods to reach locations. + """ + display_name = "Advanced Logic" + +class ExtraSharedAbilities(Toggle): + """ + If on, adds extra shared abilities to the pool. These can stack, so multiple high jumps make you jump higher and multiple glides make you superglide faster. + """ + display_name = "Extra Shared Abilities" + +class EXPZeroInPool(Toggle): + """ + If on, adds EXP Zero ability to the item pool. This is redundant if you are planning on playing on Proud. + """ + display_name = "EXP Zero in Pool" + +class VanillaEmblemPieces(DefaultOnToggle): + """ + If on, the Hollow Bastion emblem pieces are in their vanilla locations. + """ + display_name = "Vanilla Emblem Pieces" + +class StartingWorlds(Range): + """ + Number of random worlds to start with in addition to Traverse Town, which is always available. Will only consider Atlantica if toggled, and will only consider End of the World if its unlock is set to "Item". + """ + display_name = "Starting Worlds" + default = 0 + range_start = 0 + range_end = 10 + +@dataclass +class KH1Options(PerGameCommonOptions): + goal: Goal + end_of_the_world_unlock: EndoftheWorldUnlock + final_rest_door: FinalRestDoor + required_reports_eotw: RequiredReportsEotW + required_reports_door: RequiredReportsDoor + reports_in_pool: ReportsInPool + super_bosses: SuperBosses + atlantica: Atlantica + hundred_acre_wood: HundredAcreWood + cups: Cups + puppies: Puppies + starting_worlds: StartingWorlds + keyblades_unlock_chests: KeybladesUnlockChests + interact_in_battle: InteractInBattle + exp_multiplier: EXPMultiplier + advanced_logic: AdvancedLogic + extra_shared_abilities: ExtraSharedAbilities + exp_zero_in_pool: EXPZeroInPool + vanilla_emblem_pieces: VanillaEmblemPieces + donald_death_link: DonaldDeathLink + goofy_death_link: GoofyDeathLink + randomize_keyblade_stats: RandomizeKeybladeStats + bad_starting_weapons: BadStartingWeapons + keyblade_min_str: KeybladeMinStrength + keyblade_max_str: KeybladeMaxStrength + keyblade_min_mp: KeybladeMinMP + keyblade_max_mp: KeybladeMaxMP + level_checks: LevelChecks + force_stats_on_levels: ForceStatsOnLevels + strength_increase: StrengthIncrease + defense_increase: DefenseIncrease + hp_increase: HPIncrease + ap_increase: APIncrease + mp_increase: MPIncrease + accessory_slot_increase: AccessorySlotIncrease + item_slot_increase: ItemSlotIncrease + start_inventory_from_pool: StartInventoryPool + +kh1_option_groups = [ + OptionGroup("Goal", [ + Goal, + EndoftheWorldUnlock, + FinalRestDoor, + RequiredReportsDoor, + RequiredReportsEotW, + ReportsInPool, + ]), + OptionGroup("Locations", [ + SuperBosses, + Atlantica, + Cups, + HundredAcreWood, + VanillaEmblemPieces, + ]), + OptionGroup("Levels", [ + EXPMultiplier, + LevelChecks, + ForceStatsOnLevels, + StrengthIncrease, + DefenseIncrease, + HPIncrease, + APIncrease, + MPIncrease, + AccessorySlotIncrease, + ItemSlotIncrease, + ]), + OptionGroup("Keyblades", [ + KeybladesUnlockChests, + RandomizeKeybladeStats, + BadStartingWeapons, + KeybladeMaxStrength, + KeybladeMinStrength, + KeybladeMaxMP, + KeybladeMinMP, + ]), + OptionGroup("Misc", [ + StartingWorlds, + Puppies, + InteractInBattle, + AdvancedLogic, + ExtraSharedAbilities, + EXPZeroInPool, + DonaldDeathLink, + GoofyDeathLink, + ]) +] diff --git a/worlds/kh1/Presets.py b/worlds/kh1/Presets.py new file mode 100644 index 000000000000..77b43b7624b9 --- /dev/null +++ b/worlds/kh1/Presets.py @@ -0,0 +1,177 @@ +from typing import Any, Dict + +from .Options import * + +kh1_option_presets: Dict[str, Dict[str, Any]] = { + # Standard playthrough where your goal is to defeat Ansem, reaching him by acquiring enough reports. + "Final Ansem": { + "goal": Goal.option_final_ansem, + "end_of_the_world_unlock": EndoftheWorldUnlock.option_reports, + "final_rest_door": FinalRestDoor.option_reports, + "required_reports_eotw": 7, + "required_reports_door": 10, + "reports_in_pool": 13, + + "super_bosses": False, + "atlantica": False, + "hundred_acre_wood": False, + "cups": False, + "vanilla_emblem_pieces": True, + + "exp_multiplier": 48, + "level_checks": 100, + "force_stats_on_levels": 1, + "strength_increase": 24, + "defense_increase": 24, + "hp_increase": 23, + "ap_increase": 18, + "mp_increase": 7, + "accessory_slot_increase": 1, + "item_slot_increase": 3, + + "keyblades_unlock_chests": False, + "randomize_keyblade_stats": True, + "bad_starting_weapons": False, + "keyblade_max_str": 14, + "keyblade_min_str": 3, + "keyblade_max_mp": 3, + "keyblade_min_mp": -2, + + "puppies": Puppies.option_triplets, + "starting_worlds": 0, + "interact_in_battle": False, + "advanced_logic": False, + "extra_shared_abilities": False, + "exp_zero_in_pool": False, + "donald_death_link": False, + "goofy_death_link": False + }, + # Puppies are found individually, and the goal is to return them all. + "Puppy Hunt": { + "goal": Goal.option_puppies, + "end_of_the_world_unlock": EndoftheWorldUnlock.option_item, + "final_rest_door": FinalRestDoor.option_puppies, + "required_reports_eotw": 13, + "required_reports_door": 13, + "reports_in_pool": 13, + + "super_bosses": False, + "atlantica": False, + "hundred_acre_wood": False, + "cups": False, + "vanilla_emblem_pieces": True, + + "exp_multiplier": 48, + "level_checks": 100, + "force_stats_on_levels": 1, + "strength_increase": 24, + "defense_increase": 24, + "hp_increase": 23, + "ap_increase": 18, + "mp_increase": 7, + "accessory_slot_increase": 1, + "item_slot_increase": 3, + + "keyblades_unlock_chests": False, + "randomize_keyblade_stats": True, + "bad_starting_weapons": False, + "keyblade_max_str": 14, + "keyblade_min_str": 3, + "keyblade_max_mp": 3, + "keyblade_min_mp": -2, + + "puppies": Puppies.option_individual, + "starting_worlds": 0, + "interact_in_battle": False, + "advanced_logic": False, + "extra_shared_abilities": False, + "exp_zero_in_pool": False, + "donald_death_link": False, + "goofy_death_link": False + }, + # Advanced playthrough with most settings on. + "Advanced": { + "goal": Goal.option_final_ansem, + "end_of_the_world_unlock": EndoftheWorldUnlock.option_reports, + "final_rest_door": FinalRestDoor.option_reports, + "required_reports_eotw": 7, + "required_reports_door": 10, + "reports_in_pool": 13, + + "super_bosses": True, + "atlantica": True, + "hundred_acre_wood": True, + "cups": True, + "vanilla_emblem_pieces": False, + + "exp_multiplier": 48, + "level_checks": 100, + "force_stats_on_levels": 1, + "strength_increase": 24, + "defense_increase": 24, + "hp_increase": 23, + "ap_increase": 18, + "mp_increase": 7, + "accessory_slot_increase": 1, + "item_slot_increase": 3, + + "keyblades_unlock_chests": True, + "randomize_keyblade_stats": True, + "bad_starting_weapons": True, + "keyblade_max_str": 14, + "keyblade_min_str": 3, + "keyblade_max_mp": 3, + "keyblade_min_mp": -2, + + "puppies": Puppies.option_triplets, + "starting_worlds": 0, + "interact_in_battle": True, + "advanced_logic": True, + "extra_shared_abilities": True, + "exp_zero_in_pool": True, + "donald_death_link": False, + "goofy_death_link": False + }, + # Playthrough meant to enhance the level 1 experience. + "Level 1": { + "goal": Goal.option_final_ansem, + "end_of_the_world_unlock": EndoftheWorldUnlock.option_reports, + "final_rest_door": FinalRestDoor.option_reports, + "required_reports_eotw": 7, + "required_reports_door": 10, + "reports_in_pool": 13, + + "super_bosses": False, + "atlantica": False, + "hundred_acre_wood": False, + "cups": False, + "vanilla_emblem_pieces": True, + + "exp_multiplier": 16, + "level_checks": 0, + "force_stats_on_levels": 101, + "strength_increase": 0, + "defense_increase": 0, + "hp_increase": 0, + "mp_increase": 0, + "accessory_slot_increase": 6, + "item_slot_increase": 5, + + "keyblades_unlock_chests": False, + "randomize_keyblade_stats": True, + "bad_starting_weapons": False, + "keyblade_max_str": 14, + "keyblade_min_str": 3, + "keyblade_max_mp": 3, + "keyblade_min_mp": -2, + + "puppies": Puppies.option_triplets, + "starting_worlds": 0, + "interact_in_battle": False, + "advanced_logic": False, + "extra_shared_abilities": False, + "exp_zero_in_pool": False, + "donald_death_link": False, + "goofy_death_link": False + } +} diff --git a/worlds/kh1/Regions.py b/worlds/kh1/Regions.py new file mode 100644 index 000000000000..a6f85fe617cb --- /dev/null +++ b/worlds/kh1/Regions.py @@ -0,0 +1,516 @@ +from typing import Dict, List, NamedTuple, Optional + +from BaseClasses import MultiWorld, Region, Entrance +from .Locations import KH1Location, location_table + + +class KH1RegionData(NamedTuple): + locations: List[str] + region_exits: Optional[List[str]] + + +def create_regions(multiworld: MultiWorld, player: int, options): + regions: Dict[str, KH1RegionData] = { + "Menu": KH1RegionData([], ["Awakening", "Levels"]), + "Awakening": KH1RegionData([], ["Destiny Islands"]), + "Destiny Islands": KH1RegionData([], ["Traverse Town"]), + "Traverse Town": KH1RegionData([], ["World Map"]), + "Wonderland": KH1RegionData([], []), + "Olympus Coliseum": KH1RegionData([], []), + "Deep Jungle": KH1RegionData([], []), + "Agrabah": KH1RegionData([], []), + "Monstro": KH1RegionData([], []), + "Atlantica": KH1RegionData([], []), + "Halloween Town": KH1RegionData([], []), + "Neverland": KH1RegionData([], []), + "Hollow Bastion": KH1RegionData([], []), + "End of the World": KH1RegionData([], []), + "100 Acre Wood": KH1RegionData([], []), + "Levels": KH1RegionData([], []), + "World Map": KH1RegionData([], ["Wonderland", "Olympus Coliseum", "Deep Jungle", + "Agrabah", "Monstro", "Atlantica", + "Halloween Town", "Neverland", "Hollow Bastion", + "End of the World", "100 Acre Wood"]) + } + + # Set up locations + regions["Agrabah"].locations.append("Agrabah Aladdin's House Main Street Entrance Chest") + regions["Agrabah"].locations.append("Agrabah Aladdin's House Plaza Entrance Chest") + regions["Agrabah"].locations.append("Agrabah Alley Chest") + regions["Agrabah"].locations.append("Agrabah Bazaar Across Windows Chest") + regions["Agrabah"].locations.append("Agrabah Bazaar High Corner Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Bottomless Hall Across Chasm Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Bottomless Hall Pillar Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Bottomless Hall Raised Platform Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Dark Chamber Abu Gem Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Dark Chamber Across from Relic Chamber Entrance Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Dark Chamber Bridge Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Dark Chamber Near Save Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Entrance Left Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Entrance Tall Tower Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Entrance White Trinity Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Hall High Left Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Hall Near Bottomless Hall Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Hidden Room Left Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Hidden Room Right Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Relic Chamber Jump from Stairs Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Relic Chamber Stairs Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Silent Chamber Blue Trinity Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Treasure Room Above Fire Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Treasure Room Across Platforms Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Treasure Room Large Treasure Pile Chest") + regions["Agrabah"].locations.append("Agrabah Cave of Wonders Treasure Room Small Treasure Pile Chest") + regions["Agrabah"].locations.append("Agrabah Defeat Jafar Blizzard Event") + regions["Agrabah"].locations.append("Agrabah Defeat Jafar Genie Ansem's Report 1") + regions["Agrabah"].locations.append("Agrabah Defeat Jafar Genie Fire Event") + regions["Agrabah"].locations.append("Agrabah Defeat Pot Centipede Ray of Light Event") + regions["Agrabah"].locations.append("Agrabah Main Street High Above Alley Entrance Chest") + regions["Agrabah"].locations.append("Agrabah Main Street High Above Palace Gates Entrance Chest") + regions["Agrabah"].locations.append("Agrabah Main Street Right Palace Entrance Chest") + regions["Agrabah"].locations.append("Agrabah Palace Gates High Close to Palace Chest") + regions["Agrabah"].locations.append("Agrabah Palace Gates High Opposite Palace Chest") + regions["Agrabah"].locations.append("Agrabah Palace Gates Low Chest") + regions["Agrabah"].locations.append("Agrabah Plaza By Storage Chest") + regions["Agrabah"].locations.append("Agrabah Plaza Raised Terrace Chest") + regions["Agrabah"].locations.append("Agrabah Plaza Top Corner Chest") + regions["Agrabah"].locations.append("Agrabah Seal Keyhole Genie Event") + regions["Agrabah"].locations.append("Agrabah Seal Keyhole Green Trinity Event") + regions["Agrabah"].locations.append("Agrabah Seal Keyhole Three Wishes Event") + regions["Agrabah"].locations.append("Agrabah Storage Behind Barrel Chest") + regions["Agrabah"].locations.append("Agrabah Storage Green Trinity Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Bamboo Thicket Save Gorillas") + regions["Deep Jungle"].locations.append("Deep Jungle Camp Blue Trinity Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Camp Ether Experiment") + regions["Deep Jungle"].locations.append("Deep Jungle Camp Hi-Potion Experiment") + regions["Deep Jungle"].locations.append("Deep Jungle Camp Replication Experiment") + regions["Deep Jungle"].locations.append("Deep Jungle Camp Save Gorillas") + regions["Deep Jungle"].locations.append("Deep Jungle Cavern of Hearts Navi-G Piece Event") + regions["Deep Jungle"].locations.append("Deep Jungle Cavern of Hearts White Trinity Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Cliff Right Cliff Left Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Cliff Right Cliff Right Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Cliff Save Gorillas") + regions["Deep Jungle"].locations.append("Deep Jungle Climbing Trees Blue Trinity Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Climbing Trees Save Gorillas") + regions["Deep Jungle"].locations.append("Deep Jungle Defeat Clayton Cure Event") + regions["Deep Jungle"].locations.append("Deep Jungle Defeat Sabor White Fang Event") + regions["Deep Jungle"].locations.append("Deep Jungle Hippo's Lagoon Center Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Hippo's Lagoon Left Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Hippo's Lagoon Right Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 10 Fruits") + regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 20 Fruits") + regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 30 Fruits") + regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 40 Fruits") + regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 50 Fruits") + regions["Deep Jungle"].locations.append("Deep Jungle Seal Keyhole Jungle King Event") + regions["Deep Jungle"].locations.append("Deep Jungle Seal Keyhole Red Trinity Event") + regions["Deep Jungle"].locations.append("Deep Jungle Tent Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Tent Protect-G Event") + regions["Deep Jungle"].locations.append("Deep Jungle Tree House Beneath Tree House Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Tree House Rooftop Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Tree House Save Gorillas") + regions["Deep Jungle"].locations.append("Deep Jungle Tree House Suspended Boat Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Tunnel Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Vines 2 Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Vines Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Waterfall Cavern High Middle Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Waterfall Cavern High Wall Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Waterfall Cavern Low Chest") + regions["Deep Jungle"].locations.append("Deep Jungle Waterfall Cavern Middle Chest") + regions["End of the World"].locations.append("End of the World Defeat Chernabog Superglide Event") + regions["End of the World"].locations.append("End of the World Final Dimension 10th Chest") + regions["End of the World"].locations.append("End of the World Final Dimension 1st Chest") + regions["End of the World"].locations.append("End of the World Final Dimension 2nd Chest") + regions["End of the World"].locations.append("End of the World Final Dimension 3rd Chest") + regions["End of the World"].locations.append("End of the World Final Dimension 4th Chest") + regions["End of the World"].locations.append("End of the World Final Dimension 5th Chest") + regions["End of the World"].locations.append("End of the World Final Dimension 6th Chest") + regions["End of the World"].locations.append("End of the World Final Dimension 7th Chest") + regions["End of the World"].locations.append("End of the World Final Dimension 8th Chest") + regions["End of the World"].locations.append("End of the World Final Dimension 9th Chest") + regions["End of the World"].locations.append("End of the World Final Rest Chest") + regions["End of the World"].locations.append("End of the World Giant Crevasse 1st Chest") + regions["End of the World"].locations.append("End of the World Giant Crevasse 2nd Chest") + regions["End of the World"].locations.append("End of the World Giant Crevasse 3rd Chest") + regions["End of the World"].locations.append("End of the World Giant Crevasse 4th Chest") + regions["End of the World"].locations.append("End of the World Giant Crevasse 5th Chest") + regions["End of the World"].locations.append("End of the World World Terminus 100 Acre Wood Chest") + regions["End of the World"].locations.append("End of the World World Terminus Agrabah Chest") + regions["End of the World"].locations.append("End of the World World Terminus Atlantica Chest") + regions["End of the World"].locations.append("End of the World World Terminus Deep Jungle Chest") + regions["End of the World"].locations.append("End of the World World Terminus Halloween Town Chest") + #regions["End of the World"].locations.append("End of the World World Terminus Hollow Bastion Chest") + regions["End of the World"].locations.append("End of the World World Terminus Neverland Chest") + regions["End of the World"].locations.append("End of the World World Terminus Olympus Coliseum Chest") + regions["End of the World"].locations.append("End of the World World Terminus Traverse Town Chest") + regions["End of the World"].locations.append("End of the World World Terminus Wonderland Chest") + regions["Halloween Town"].locations.append("Halloween Town Boneyard Tombstone Puzzle Chest") + regions["Halloween Town"].locations.append("Halloween Town Bridge Left of Gate Chest") + regions["Halloween Town"].locations.append("Halloween Town Bridge Right of Gate Chest") + regions["Halloween Town"].locations.append("Halloween Town Bridge Under Bridge") + regions["Halloween Town"].locations.append("Halloween Town Cemetery Behind Grave Chest") + regions["Halloween Town"].locations.append("Halloween Town Cemetery Between Graves Chest") + regions["Halloween Town"].locations.append("Halloween Town Cemetery By Cat Shape Chest") + regions["Halloween Town"].locations.append("Halloween Town Cemetery By Striped Grave Chest") + regions["Halloween Town"].locations.append("Halloween Town Defeat Oogie Boogie Ansem's Report 7") + regions["Halloween Town"].locations.append("Halloween Town Defeat Oogie Boogie Holy Circlet Event") + regions["Halloween Town"].locations.append("Halloween Town Defeat Oogie's Manor Gravity Event") + regions["Halloween Town"].locations.append("Halloween Town Graveyard Forget-Me-Not Event") + regions["Halloween Town"].locations.append("Halloween Town Guillotine Square High Tower Chest") + regions["Halloween Town"].locations.append("Halloween Town Guillotine Square Pumpkin Structure Left Chest") + regions["Halloween Town"].locations.append("Halloween Town Guillotine Square Pumpkin Structure Right Chest") + regions["Halloween Town"].locations.append("Halloween Town Guillotine Square Ring Jack's Doorbell 3 Times") + regions["Halloween Town"].locations.append("Halloween Town Guillotine Square Under Jack's House Stairs Chest") + regions["Halloween Town"].locations.append("Halloween Town Lab Torn Page") + regions["Halloween Town"].locations.append("Halloween Town Moonlight Hill White Trinity Chest") + regions["Halloween Town"].locations.append("Halloween Town Oogie's Manor Entrance Steps Chest") + regions["Halloween Town"].locations.append("Halloween Town Oogie's Manor Grounds Red Trinity Chest") + regions["Halloween Town"].locations.append("Halloween Town Oogie's Manor Hollow Chest") + regions["Halloween Town"].locations.append("Halloween Town Oogie's Manor Inside Entrance Chest") + regions["Halloween Town"].locations.append("Halloween Town Oogie's Manor Lower Iron Cage Chest") + regions["Halloween Town"].locations.append("Halloween Town Oogie's Manor Upper Iron Cage Chest") + regions["Halloween Town"].locations.append("Halloween Town Seal Keyhole Pumpkinhead Event") + regions["Hollow Bastion"].locations.append("Hollow Bastion Base Level Bubble Under the Wall Platform Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Base Level Near Crystal Switch Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Base Level Platform Near Entrance Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Castle Gates Freestanding Pillar Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Castle Gates Gravity Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Castle Gates High Pillar Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Behemoth Omega Arts Event") + regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Dragon Maleficent Fireglow Event") + regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Maleficent Ansem's Report 5") + regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Maleficent Donald Cheer Event") + regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Riku I White Trinity Event") + regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Riku II Ragnarok Event") + regions["Hollow Bastion"].locations.append("Hollow Bastion Dungeon By Candles Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Dungeon Corner Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Entrance Hall Emblem Piece (Chest)") + regions["Hollow Bastion"].locations.append("Hollow Bastion Entrance Hall Emblem Piece (Flame)") + regions["Hollow Bastion"].locations.append("Hollow Bastion Entrance Hall Emblem Piece (Fountain)") + regions["Hollow Bastion"].locations.append("Hollow Bastion Entrance Hall Emblem Piece (Statue)") + regions["Hollow Bastion"].locations.append("Hollow Bastion Entrance Hall Left of Emblem Door Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Grand Hall Left of Gate Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Grand Hall Oblivion Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Grand Hall Steps Right Side Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Great Crest After Battle Platform Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Great Crest Lower Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion High Tower 1st Gravity Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion High Tower 2nd Gravity Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion High Tower Above Sliding Blocks Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Library 1st Floor Turn the Carousel Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Library 2nd Floor Turn the Carousel 1st Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Library 2nd Floor Turn the Carousel 2nd Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Library Speak to Aerith Cure") + regions["Hollow Bastion"].locations.append("Hollow Bastion Library Speak to Belle Divine Rose") + regions["Hollow Bastion"].locations.append("Hollow Bastion Library Top of Bookshelf Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Library Top of Bookshelf Turn the Carousel Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Lift Stop Heartless Sigil Door Gravity Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Lift Stop Library Node After High Tower Switch Gravity Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Lift Stop Library Node Gravity Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Lift Stop Outside Library Gravity Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Lift Stop Under High Tower Sliding Blocks Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Rising Falls Floating Platform Near Bubble Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Rising Falls Floating Platform Near Save Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Rising Falls High Platform Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Rising Falls Under Water 1st Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Rising Falls Under Water 2nd Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Rising Falls Water's Surface Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Rising Falls White Trinity Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Speak to Princesses Fire Event") + regions["Hollow Bastion"].locations.append("Hollow Bastion Speak with Aerith Ansem's Report 10") + regions["Hollow Bastion"].locations.append("Hollow Bastion Speak with Aerith Ansem's Report 2") + regions["Hollow Bastion"].locations.append("Hollow Bastion Speak with Aerith Ansem's Report 4") + regions["Hollow Bastion"].locations.append("Hollow Bastion Speak with Aerith Ansem's Report 6") + regions["Hollow Bastion"].locations.append("Hollow Bastion Waterway Blizzard on Bubble Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Waterway Near Save Chest") + regions["Hollow Bastion"].locations.append("Hollow Bastion Waterway Unlock Passage from Base Level Chest") + regions["Monstro"].locations.append("Monstro Chamber 2 Ground Chest") + regions["Monstro"].locations.append("Monstro Chamber 2 Platform Chest") + regions["Monstro"].locations.append("Monstro Chamber 3 Ground Chest") + regions["Monstro"].locations.append("Monstro Chamber 3 Near Chamber 6 Entrance Chest") + regions["Monstro"].locations.append("Monstro Chamber 3 Platform Above Chamber 2 Entrance Chest") + regions["Monstro"].locations.append("Monstro Chamber 3 Platform Near Chamber 6 Entrance Chest") + regions["Monstro"].locations.append("Monstro Chamber 5 Atop Barrel Chest") + regions["Monstro"].locations.append("Monstro Chamber 5 Low 1st Chest") + regions["Monstro"].locations.append("Monstro Chamber 5 Low 2nd Chest") + regions["Monstro"].locations.append("Monstro Chamber 5 Platform Chest") + regions["Monstro"].locations.append("Monstro Chamber 6 Low Chest") + regions["Monstro"].locations.append("Monstro Chamber 6 Other Platform Chest") + regions["Monstro"].locations.append("Monstro Chamber 6 Platform Near Chamber 5 Entrance Chest") + regions["Monstro"].locations.append("Monstro Chamber 6 Raised Area Near Chamber 1 Entrance Chest") + regions["Monstro"].locations.append("Monstro Chamber 6 White Trinity Chest") + regions["Monstro"].locations.append("Monstro Defeat Parasite Cage I Goofy Cheer Event") + regions["Monstro"].locations.append("Monstro Defeat Parasite Cage II Stop Event") + regions["Monstro"].locations.append("Monstro Mouth Boat Deck Chest") + regions["Monstro"].locations.append("Monstro Mouth Green Trinity Top of Boat Chest") + regions["Monstro"].locations.append("Monstro Mouth High Platform Across from Boat Chest") + regions["Monstro"].locations.append("Monstro Mouth High Platform Boat Side Chest") + regions["Monstro"].locations.append("Monstro Mouth High Platform Near Teeth Chest") + regions["Monstro"].locations.append("Monstro Mouth Near Ship Chest") + regions["Neverland"].locations.append("Neverland Cabin Chest") + regions["Neverland"].locations.append("Neverland Captain's Cabin Chest") + #regions["Neverland"].locations.append("Neverland Clock Tower 01:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 02:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 03:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 04:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 05:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 06:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 07:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 08:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 09:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 10:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 11:00 Door") + #regions["Neverland"].locations.append("Neverland Clock Tower 12:00 Door") + regions["Neverland"].locations.append("Neverland Clock Tower Chest") + regions["Neverland"].locations.append("Neverland Defeat Anti Sora Raven's Claw Event") + regions["Neverland"].locations.append("Neverland Defeat Captain Hook Ars Arcanum Event") + regions["Neverland"].locations.append("Neverland Defeat Hook Ansem's Report 9") + regions["Neverland"].locations.append("Neverland Encounter Hook Cure Event") + regions["Neverland"].locations.append("Neverland Galley Chest") + regions["Neverland"].locations.append("Neverland Hold Aero Chest") + regions["Neverland"].locations.append("Neverland Hold Flight 1st Chest") + regions["Neverland"].locations.append("Neverland Hold Flight 2nd Chest") + regions["Neverland"].locations.append("Neverland Hold Yellow Trinity Green Chest") + regions["Neverland"].locations.append("Neverland Hold Yellow Trinity Left Blue Chest") + regions["Neverland"].locations.append("Neverland Hold Yellow Trinity Right Blue Chest") + regions["Neverland"].locations.append("Neverland Pirate Ship Crows Nest Chest") + regions["Neverland"].locations.append("Neverland Pirate Ship Deck White Trinity Chest") + regions["Neverland"].locations.append("Neverland Seal Keyhole Fairy Harp Event") + regions["Neverland"].locations.append("Neverland Seal Keyhole Glide Event") + regions["Neverland"].locations.append("Neverland Seal Keyhole Tinker Bell Event") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Clear Phil's Training Thunder Event") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Cloud Sonic Blade Event") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Coliseum Gates Blizzaga Chest") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Coliseum Gates Blizzara Chest") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Coliseum Gates Entry Pass Event") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Coliseum Gates Green Trinity") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Coliseum Gates Hero's License Event") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Coliseum Gates Left Behind Columns Chest") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Coliseum Gates Left Blue Trinity Chest") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Coliseum Gates Right Blue Trinity Chest") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Coliseum Gates White Trinity Chest") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Cerberus Inferno Band Event") + regions["Traverse Town"].locations.append("Traverse Town 1st District Accessory Shop Roof Chest") + #regions["Traverse Town"].locations.append("Traverse Town 1st District Aerith Gift") + regions["Traverse Town"].locations.append("Traverse Town 1st District Blue Trinity Balcony Chest") + regions["Traverse Town"].locations.append("Traverse Town 1st District Candle Puzzle Chest") + #regions["Traverse Town"].locations.append("Traverse Town 1st District Leon Gift") + regions["Traverse Town"].locations.append("Traverse Town 1st District Safe Postcard") + regions["Traverse Town"].locations.append("Traverse Town 1st District Speak with Cid Event") + regions["Traverse Town"].locations.append("Traverse Town 2nd District Boots and Shoes Awning Chest") + regions["Traverse Town"].locations.append("Traverse Town 2nd District Gizmo Shop Facade Chest") + regions["Traverse Town"].locations.append("Traverse Town 2nd District Rooftop Chest") + regions["Traverse Town"].locations.append("Traverse Town 3rd District Balcony Postcard") + regions["Traverse Town"].locations.append("Traverse Town Accessory Shop Chest") + regions["Traverse Town"].locations.append("Traverse Town Alleyway Balcony Chest") + regions["Traverse Town"].locations.append("Traverse Town Alleyway Behind Crates Chest") + regions["Traverse Town"].locations.append("Traverse Town Alleyway Blue Room Awning Chest") + regions["Traverse Town"].locations.append("Traverse Town Alleyway Corner Chest") + regions["Traverse Town"].locations.append("Traverse Town Defeat Guard Armor Blue Trinity Event") + regions["Traverse Town"].locations.append("Traverse Town Defeat Guard Armor Brave Warrior Event") + regions["Traverse Town"].locations.append("Traverse Town Defeat Guard Armor Dodge Roll Event") + regions["Traverse Town"].locations.append("Traverse Town Defeat Guard Armor Fire Event") + regions["Traverse Town"].locations.append("Traverse Town Defeat Opposite Armor Aero Event") + regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Chest") + regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Geppetto All Summons Reward") + regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Geppetto Reward 1") + regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Geppetto Reward 2") + regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Geppetto Reward 3") + regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Geppetto Reward 4") + regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Geppetto Reward 5") + regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Postcard") + regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Talk to Pinocchio") + regions["Traverse Town"].locations.append("Traverse Town Gizmo Shop Postcard 1") + regions["Traverse Town"].locations.append("Traverse Town Gizmo Shop Postcard 2") + regions["Traverse Town"].locations.append("Traverse Town Green Room Clock Puzzle Chest") + regions["Traverse Town"].locations.append("Traverse Town Green Room Table Chest") + regions["Traverse Town"].locations.append("Traverse Town Item Shop Postcard") + regions["Traverse Town"].locations.append("Traverse Town Item Workshop Left Chest") + regions["Traverse Town"].locations.append("Traverse Town Item Workshop Postcard") + regions["Traverse Town"].locations.append("Traverse Town Item Workshop Right Chest") + regions["Traverse Town"].locations.append("Traverse Town Kairi Secret Waterway Oathkeeper Event") + regions["Traverse Town"].locations.append("Traverse Town Leon Secret Waterway Earthshine Event") + regions["Traverse Town"].locations.append("Traverse Town Magician's Study Obtained All Arts Items") + regions["Traverse Town"].locations.append("Traverse Town Magician's Study Obtained All LV1 Magic") + regions["Traverse Town"].locations.append("Traverse Town Magician's Study Obtained All LV3 Magic") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 01 Event") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 02 Event") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 03 Event") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 04 Event") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 05 Event") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 06 Event") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 07 Event") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 08 Event") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 09 Event") + regions["Traverse Town"].locations.append("Traverse Town Mail Postcard 10 Event") + regions["Traverse Town"].locations.append("Traverse Town Mystical House Glide Chest") + regions["Traverse Town"].locations.append("Traverse Town Mystical House Yellow Trinity Chest") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 10 Puppies") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 20 Puppies") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 30 Puppies") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 40 Puppies") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 50 Puppies Reward 1") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 50 Puppies Reward 2") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 60 Puppies") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 70 Puppies") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 80 Puppies") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 90 Puppies") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 99 Puppies Reward 1") + regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 99 Puppies Reward 2") + regions["Traverse Town"].locations.append("Traverse Town Red Room Chest") + regions["Traverse Town"].locations.append("Traverse Town Secret Waterway Near Stairs Chest") + regions["Traverse Town"].locations.append("Traverse Town Secret Waterway White Trinity Chest") + regions["Traverse Town"].locations.append("Traverse Town Synth Cloth") + regions["Traverse Town"].locations.append("Traverse Town Synth Fish") + regions["Traverse Town"].locations.append("Traverse Town Synth Log") + regions["Traverse Town"].locations.append("Traverse Town Synth Mushroom") + regions["Traverse Town"].locations.append("Traverse Town Synth Rope") + regions["Traverse Town"].locations.append("Traverse Town Synth Seagull Egg") + regions["Wonderland"].locations.append("Wonderland Bizarre Room Green Trinity Chest") + regions["Wonderland"].locations.append("Wonderland Bizarre Room Lamp Chest") + regions["Wonderland"].locations.append("Wonderland Bizarre Room Navi-G Piece Event") + regions["Wonderland"].locations.append("Wonderland Bizarre Room Read Book") + regions["Wonderland"].locations.append("Wonderland Defeat Trickmaster Blizzard Event") + regions["Wonderland"].locations.append("Wonderland Defeat Trickmaster Ifrit's Horn Event") + regions["Wonderland"].locations.append("Wonderland Lotus Forest Corner Chest") + regions["Wonderland"].locations.append("Wonderland Lotus Forest Glide Chest") + regions["Wonderland"].locations.append("Wonderland Lotus Forest Nut Chest") + regions["Wonderland"].locations.append("Wonderland Lotus Forest Through the Painting Thunder Plant Chest") + regions["Wonderland"].locations.append("Wonderland Lotus Forest Through the Painting White Trinity Chest") + regions["Wonderland"].locations.append("Wonderland Lotus Forest Thunder Plant Chest") + regions["Wonderland"].locations.append("Wonderland Queen's Castle Hedge Left Red Chest") + regions["Wonderland"].locations.append("Wonderland Queen's Castle Hedge Right Blue Chest") + regions["Wonderland"].locations.append("Wonderland Queen's Castle Hedge Right Red Chest") + regions["Wonderland"].locations.append("Wonderland Rabbit Hole Defeat Heartless 1 Chest") + regions["Wonderland"].locations.append("Wonderland Rabbit Hole Defeat Heartless 2 Chest") + regions["Wonderland"].locations.append("Wonderland Rabbit Hole Defeat Heartless 3 Chest") + regions["Wonderland"].locations.append("Wonderland Rabbit Hole Green Trinity Chest") + regions["Wonderland"].locations.append("Wonderland Tea Party Garden Above Lotus Forest Entrance 1st Chest") + regions["Wonderland"].locations.append("Wonderland Tea Party Garden Above Lotus Forest Entrance 2nd Chest") + regions["Wonderland"].locations.append("Wonderland Tea Party Garden Across From Bizarre Room Entrance Chest") + regions["Wonderland"].locations.append("Wonderland Tea Party Garden Bear and Clock Puzzle Chest") + if options.hundred_acre_wood: + regions["100 Acre Wood"].locations.append("100 Acre Wood Meadow Inside Log Chest") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Left Cliff Chest") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Right Tree Alcove Chest") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Under Giant Pot Chest") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Turn in Rare Nut 1") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Turn in Rare Nut 2") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Turn in Rare Nut 3") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Turn in Rare Nut 4") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Turn in Rare Nut 5") + regions["100 Acre Wood"].locations.append("100 Acre Wood Pooh's House Owl Cheer") + regions["100 Acre Wood"].locations.append("100 Acre Wood Convert Torn Page 1") + regions["100 Acre Wood"].locations.append("100 Acre Wood Convert Torn Page 2") + regions["100 Acre Wood"].locations.append("100 Acre Wood Convert Torn Page 3") + regions["100 Acre Wood"].locations.append("100 Acre Wood Convert Torn Page 4") + regions["100 Acre Wood"].locations.append("100 Acre Wood Convert Torn Page 5") + regions["100 Acre Wood"].locations.append("100 Acre Wood Pooh's House Start Fire") + regions["100 Acre Wood"].locations.append("100 Acre Wood Pooh's Room Cabinet") + regions["100 Acre Wood"].locations.append("100 Acre Wood Pooh's Room Chimney") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Break Log") + regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Fall Through Top of Tree Next to Pooh") + if options.atlantica: + regions["Atlantica"].locations.append("Atlantica Sunken Ship In Flipped Boat Chest") + regions["Atlantica"].locations.append("Atlantica Sunken Ship Seabed Chest") + regions["Atlantica"].locations.append("Atlantica Sunken Ship Inside Ship Chest") + regions["Atlantica"].locations.append("Atlantica Ariel's Grotto High Chest") + regions["Atlantica"].locations.append("Atlantica Ariel's Grotto Middle Chest") + regions["Atlantica"].locations.append("Atlantica Ariel's Grotto Low Chest") + regions["Atlantica"].locations.append("Atlantica Ursula's Lair Use Fire on Urchin Chest") + regions["Atlantica"].locations.append("Atlantica Undersea Gorge Jammed by Ariel's Grotto Chest") + regions["Atlantica"].locations.append("Atlantica Triton's Palace White Trinity Chest") + regions["Atlantica"].locations.append("Atlantica Defeat Ursula I Mermaid Kick Event") + regions["Atlantica"].locations.append("Atlantica Defeat Ursula II Thunder Event") + regions["Atlantica"].locations.append("Atlantica Seal Keyhole Crabclaw Event") + regions["Atlantica"].locations.append("Atlantica Undersea Gorge Blizzard Clam") + regions["Atlantica"].locations.append("Atlantica Undersea Gorge Ocean Floor Clam") + regions["Atlantica"].locations.append("Atlantica Undersea Valley Higher Cave Clam") + regions["Atlantica"].locations.append("Atlantica Undersea Valley Lower Cave Clam") + regions["Atlantica"].locations.append("Atlantica Undersea Valley Fire Clam") + regions["Atlantica"].locations.append("Atlantica Undersea Valley Wall Clam") + regions["Atlantica"].locations.append("Atlantica Undersea Valley Pillar Clam") + regions["Atlantica"].locations.append("Atlantica Undersea Valley Ocean Floor Clam") + regions["Atlantica"].locations.append("Atlantica Triton's Palace Thunder Clam") + regions["Atlantica"].locations.append("Atlantica Triton's Palace Wall Right Clam") + regions["Atlantica"].locations.append("Atlantica Triton's Palace Near Path Clam") + regions["Atlantica"].locations.append("Atlantica Triton's Palace Wall Left Clam") + regions["Atlantica"].locations.append("Atlantica Cavern Nook Clam") + regions["Atlantica"].locations.append("Atlantica Below Deck Clam") + regions["Atlantica"].locations.append("Atlantica Undersea Garden Clam") + regions["Atlantica"].locations.append("Atlantica Undersea Cave Clam") + regions["Atlantica"].locations.append("Atlantica Sunken Ship Crystal Trident Event") + regions["Atlantica"].locations.append("Atlantica Defeat Ursula II Ansem's Report 3") + if options.cups: + regions["Olympus Coliseum"].locations.append("Complete Phil Cup") + regions["Olympus Coliseum"].locations.append("Complete Phil Cup Solo") + regions["Olympus Coliseum"].locations.append("Complete Phil Cup Time Trial") + regions["Olympus Coliseum"].locations.append("Complete Pegasus Cup") + regions["Olympus Coliseum"].locations.append("Complete Pegasus Cup Solo") + regions["Olympus Coliseum"].locations.append("Complete Pegasus Cup Time Trial") + regions["Olympus Coliseum"].locations.append("Complete Hercules Cup") + regions["Olympus Coliseum"].locations.append("Complete Hercules Cup Solo") + regions["Olympus Coliseum"].locations.append("Complete Hercules Cup Time Trial") + regions["Olympus Coliseum"].locations.append("Complete Hades Cup") + regions["Olympus Coliseum"].locations.append("Complete Hades Cup Solo") + regions["Olympus Coliseum"].locations.append("Complete Hades Cup Time Trial") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Cloud and Leon Event") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Yuffie Event") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Cerberus Event") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Behemoth Event") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Hades Event") + regions["Olympus Coliseum"].locations.append("Hercules Cup Defeat Cloud Event") + regions["Olympus Coliseum"].locations.append("Hercules Cup Yellow Trinity Event") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Hades Ansem's Report 8") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Olympia Chest") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Ice Titan Diamond Dust Event") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Gates Purple Jar After Defeating Hades") + if options.super_bosses: + regions["Neverland"].locations.append("Neverland Defeat Phantom Stop Event") + regions["Agrabah"].locations.append("Agrabah Defeat Kurt Zisa Zantetsuken Event") + regions["Agrabah"].locations.append("Agrabah Defeat Kurt Zisa Ansem's Report 11") + if options.super_bosses or options.goal.current_key == "sephiroth": + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Sephiroth Ansem's Report 12") + regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Sephiroth One-Winged Angel Event") + if options.super_bosses or options.goal.current_key == "unknown": + regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Unknown Ansem's Report 13") + regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Unknown EXP Necklace Event") + for i in range(options.level_checks): + regions["Levels"].locations.append("Level " + str(i+1).rjust(3, '0')) + if options.goal.current_key == "final_ansem": + regions["End of the World"].locations.append("Final Ansem") + + # Set up the regions correctly. + for name, data in regions.items(): + multiworld.regions.append(create_region(multiworld, player, name, data)) + + multiworld.get_entrance("Awakening", player).connect(multiworld.get_region("Awakening", player)) + multiworld.get_entrance("Destiny Islands", player).connect(multiworld.get_region("Destiny Islands", player)) + multiworld.get_entrance("Traverse Town", player).connect(multiworld.get_region("Traverse Town", player)) + multiworld.get_entrance("Wonderland", player).connect(multiworld.get_region("Wonderland", player)) + multiworld.get_entrance("Olympus Coliseum", player).connect(multiworld.get_region("Olympus Coliseum", player)) + multiworld.get_entrance("Deep Jungle", player).connect(multiworld.get_region("Deep Jungle", player)) + multiworld.get_entrance("Agrabah", player).connect(multiworld.get_region("Agrabah", player)) + multiworld.get_entrance("Monstro", player).connect(multiworld.get_region("Monstro", player)) + multiworld.get_entrance("Atlantica", player).connect(multiworld.get_region("Atlantica", player)) + multiworld.get_entrance("Halloween Town", player).connect(multiworld.get_region("Halloween Town", player)) + multiworld.get_entrance("Neverland", player).connect(multiworld.get_region("Neverland", player)) + multiworld.get_entrance("Hollow Bastion", player).connect(multiworld.get_region("Hollow Bastion", player)) + multiworld.get_entrance("End of the World", player).connect(multiworld.get_region("End of the World", player)) + multiworld.get_entrance("100 Acre Wood", player).connect(multiworld.get_region("100 Acre Wood", player)) + multiworld.get_entrance("World Map", player).connect(multiworld.get_region("World Map", player)) + multiworld.get_entrance("Levels", player).connect(multiworld.get_region("Levels", player)) + +def create_region(multiworld: MultiWorld, player: int, name: str, data: KH1RegionData): + region = Region(name, player, multiworld) + if data.locations: + for loc_name in data.locations: + loc_data = location_table.get(loc_name) + location = KH1Location(player, loc_name, loc_data.code if loc_data else None, region) + region.locations.append(location) + + if data.region_exits: + for exit in data.region_exits: + entrance = Entrance(player, exit, region) + region.exits.append(entrance) + + return region diff --git a/worlds/kh1/Rules.py b/worlds/kh1/Rules.py new file mode 100644 index 000000000000..c8cb71ffd636 --- /dev/null +++ b/worlds/kh1/Rules.py @@ -0,0 +1,1947 @@ +from BaseClasses import CollectionState +from worlds.generic.Rules import add_rule + +SINGLE_PUPPIES = ["Puppy " + str(i).rjust(2,"0") for i in range(1,100)] +TRIPLE_PUPPIES = ["Puppies " + str(3*(i-1)+1).rjust(2, "0") + "-" + str(3*(i-1)+3).rjust(2, "0") for i in range(1,34)] +TORN_PAGES = ["Torn Page " + str(i) for i in range(1,6)] +WORLDS = ["Wonderland", "Olympus Coliseum", "Deep Jungle", "Agrabah", "Monstro", "Atlantica", "Halloween Town", "Neverland", "Hollow Bastion", "End of the World"] +KEYBLADES = ["Lady Luck", "Olympia", "Jungle King", "Three Wishes", "Wishing Star", "Crabclaw", "Pumpkinhead", "Fairy Harp", "Divine Rose", "Oblivion"] + +def has_x_worlds(state: CollectionState, player: int, num_of_worlds: int, keyblades_unlock_chests: bool) -> bool: + worlds_acquired = 0.0 + for i in range(len(WORLDS)): + if state.has(WORLDS[i], player): + worlds_acquired = worlds_acquired + 0.5 + if (state.has(WORLDS[i], player) and (not keyblades_unlock_chests or state.has(KEYBLADES[i], player))) or (state.has(WORLDS[i], player) and WORLDS[i] == "Atlantica"): + worlds_acquired = worlds_acquired + 0.5 + return worlds_acquired >= num_of_worlds + +def has_emblems(state: CollectionState, player: int, keyblades_unlock_chests: bool) -> bool: + return state.has_all({ + "Emblem Piece (Flame)", + "Emblem Piece (Chest)", + "Emblem Piece (Statue)", + "Emblem Piece (Fountain)", + "Hollow Bastion"}, player) and has_x_worlds(state, player, 5, keyblades_unlock_chests) + +def has_puppies_all(state: CollectionState, player: int, puppies_required: int) -> bool: + return state.has("All Puppies", player) + +def has_puppies_triplets(state: CollectionState, player: int, puppies_required: int) -> bool: + return state.has_from_list_unique(TRIPLE_PUPPIES, player, -(puppies_required / -3)) + +def has_puppies_individual(state: CollectionState, player: int, puppies_required: int) -> bool: + return state.has_from_list_unique(SINGLE_PUPPIES, player, puppies_required) + +def has_torn_pages(state: CollectionState, player: int, pages_required: int) -> bool: + return state.count_from_list_unique(TORN_PAGES, player) >= pages_required + +def has_all_arts(state: CollectionState, player: int) -> bool: + return state.has_all({"Fire Arts", "Blizzard Arts", "Thunder Arts", "Cure Arts", "Gravity Arts", "Stop Arts", "Aero Arts"}, player) + +def has_all_summons(state: CollectionState, player: int) -> bool: + return state.has_all({"Simba", "Bambi", "Genie", "Dumbo", "Mushu", "Tinker Bell"}, player) + +def has_all_magic_lvx(state: CollectionState, player: int, level) -> bool: + return state.has_all_counts({ + "Progressive Fire": level, + "Progressive Blizzard": level, + "Progressive Thunder": level, + "Progressive Cure": level, + "Progressive Gravity": level, + "Progressive Aero": level, + "Progressive Stop": level}, player) + +def has_offensive_magic(state: CollectionState, player: int) -> bool: + return state.has_any({"Progressive Fire", "Progressive Blizzard", "Progressive Thunder", "Progressive Gravity", "Progressive Stop"}, player) + +def has_reports(state: CollectionState, player: int, eotw_required_reports: int) -> bool: + return state.has_group_unique("Reports", player, eotw_required_reports) + +def has_final_rest_door(state: CollectionState, player: int, final_rest_door_requirement: str, final_rest_door_required_reports: int, keyblades_unlock_chests: bool, puppies_choice: str): + if final_rest_door_requirement == "reports": + return state.has_group_unique("Reports", player, final_rest_door_required_reports) + if final_rest_door_requirement == "puppies": + if puppies_choice == "individual": + return has_puppies_individual(state, player, 99) + if puppies_choice == "triplets": + return has_puppies_triplets(state, player, 99) + return has_puppies_all(state, player, 99) + if final_rest_door_requirement == "postcards": + return state.has("Postcard", player, 10) + if final_rest_door_requirement == "superbosses": + return ( + state.has_all({"Olympus Coliseum", "Neverland", "Agrabah", "Hollow Bastion", "Green Trinity", "Phil Cup", "Pegasus Cup", "Hercules Cup", "Entry Pass"}, player) + and has_emblems(state, player, keyblades_unlock_chests) + and has_all_magic_lvx(state, player, 2) + and has_defensive_tools(state, player) + and has_x_worlds(state, player, 7, keyblades_unlock_chests) + ) + +def has_defensive_tools(state: CollectionState, player: int) -> bool: + return ( + state.has_all_counts({"Progressive Cure": 2, "Leaf Bracer": 1, "Dodge Roll": 1}, player) + and state.has_any_count({"Second Chance": 1, "MP Rage": 1, "Progressive Aero": 2}, player) + ) + +def can_dumbo_skip(state: CollectionState, player: int) -> bool: + return ( + state.has("Dumbo", player) + and state.has_group("Magic", player) + ) + +def has_oogie_manor(state: CollectionState, player: int, advanced_logic: bool) -> bool: + return ( + state.has("Progressive Fire", player) + or (advanced_logic and state.has("High Jump", player, 2)) + or (advanced_logic and state.has("High Jump", player) and state.has("Progressive Glide", player)) + ) + +def set_rules(kh1world): + multiworld = kh1world.multiworld + player = kh1world.player + options = kh1world.options + eotw_required_reports = kh1world.determine_reports_required_to_open_end_of_the_world() + final_rest_door_required_reports = kh1world.determine_reports_required_to_open_final_rest_door() + final_rest_door_requirement = kh1world.options.final_rest_door.current_key + + has_puppies = has_puppies_individual + if kh1world.options.puppies == "triplets": + has_puppies = has_puppies_triplets + elif kh1world.options.puppies == "full": + has_puppies = has_puppies_all + + add_rule(kh1world.get_location("Traverse Town 1st District Candle Puzzle Chest"), + lambda state: state.has("Progressive Blizzard", player)) + add_rule(kh1world.get_location("Traverse Town Mystical House Yellow Trinity Chest"), + lambda state: ( + state.has("Progressive Fire", player) + and + ( + state.has("Yellow Trinity", player) + or (options.advanced_logic and state.has("High Jump", player)) + or state.has("High Jump", player, 2) + ) + )) + add_rule(kh1world.get_location("Traverse Town Secret Waterway White Trinity Chest"), + lambda state: state.has("White Trinity", player)) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Chest"), + lambda state: ( + state.has("Monstro", player) + and + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and has_x_worlds(state, player, 2, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Traverse Town Item Workshop Right Chest"), + lambda state: ( + state.has("Green Trinity", player) + or state.has("High Jump", player, 3) + )) + add_rule(kh1world.get_location("Traverse Town 1st District Blue Trinity Balcony Chest"), + lambda state: ( + (state.has("Blue Trinity", player) and state.has("Progressive Glide", player)) + or (options.advanced_logic and state.has("Progressive Glide", player)) + )) + add_rule(kh1world.get_location("Traverse Town Mystical House Glide Chest"), + lambda state: ( + ( + state.has("Progressive Glide", player) + or + ( + options.advanced_logic + and + ( + (state.has("High Jump", player) and state.has("Yellow Trinity", player)) + or state.has("High Jump", player, 2) + ) + and state.has("Combo Master", player) + ) + or + ( + options.advanced_logic + and state.has("Mermaid Kick", player) + ) + ) + and state.has("Progressive Fire", player) + )) + add_rule(kh1world.get_location("Traverse Town Alleyway Behind Crates Chest"), + lambda state: state.has("Red Trinity", player)) + add_rule(kh1world.get_location("Traverse Town Item Workshop Left Chest"), + lambda state: ( + state.has("Green Trinity", player) + or state.has("High Jump", player, 3) + )) + add_rule(kh1world.get_location("Wonderland Rabbit Hole Green Trinity Chest"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Wonderland Rabbit Hole Defeat Heartless 3 Chest"), + lambda state: has_x_worlds(state, player, 5, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Wonderland Bizarre Room Green Trinity Chest"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Wonderland Queen's Castle Hedge Left Red Chest"), + lambda state: ( + state.has("Footprints", player) + or state.has("High Jump", player) + or state.has("Progressive Glide", player) + )) + add_rule(kh1world.get_location("Wonderland Queen's Castle Hedge Right Blue Chest"), + lambda state: ( + state.has("Footprints", player) + or state.has("High Jump", player) + or state.has("Progressive Glide", player) + )) + add_rule(kh1world.get_location("Wonderland Queen's Castle Hedge Right Red Chest"), + lambda state: ( + state.has("Footprints", player) + or state.has("High Jump", player) + or state.has("Progressive Glide", player) + )) + add_rule(kh1world.get_location("Wonderland Lotus Forest Thunder Plant Chest"), + lambda state: ( + state.has_all({ + "Progressive Thunder", + "Footprints"}, player) + )) + add_rule(kh1world.get_location("Wonderland Lotus Forest Through the Painting Thunder Plant Chest"), + lambda state: ( + state.has_all({ + "Progressive Thunder", + "Footprints"}, player) + )) + add_rule(kh1world.get_location("Wonderland Lotus Forest Glide Chest"), + lambda state: ( + state.has("Progressive Glide", player) + or + ( + options.advanced_logic + and (state.has("High Jump", player) or can_dumbo_skip(state, player)) + and state.has("Footprints", player) + ) + )) + add_rule(kh1world.get_location("Wonderland Lotus Forest Corner Chest"), + lambda state: ( + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + ) + or options.advanced_logic + )) + add_rule(kh1world.get_location("Wonderland Bizarre Room Lamp Chest"), + lambda state: state.has("Footprints", player)) + add_rule(kh1world.get_location("Wonderland Tea Party Garden Above Lotus Forest Entrance 2nd Chest"), + lambda state: ( + state.has("Progressive Glide", player) + or + ( + options.advanced_logic + and state.has_all({ + "High Jump", + "Footprints"}, player) + ) + )) + add_rule(kh1world.get_location("Wonderland Tea Party Garden Above Lotus Forest Entrance 1st Chest"), + lambda state: ( + state.has("Progressive Glide", player) + or + ( + options.advanced_logic + and state.has_all({ + "High Jump", + "Footprints"}, player) + ) + )) + add_rule(kh1world.get_location("Wonderland Tea Party Garden Bear and Clock Puzzle Chest"), + lambda state: ( + + state.has("Footprints", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + or state.has("High Jump", player, 2) + )) + add_rule(kh1world.get_location("Wonderland Tea Party Garden Across From Bizarre Room Entrance Chest"), + lambda state: ( + state.has("Progressive Glide", player) + or + ( + state.has("High Jump", player, 3) + and state.has("Footprints", player) + ) + or + ( + options.advanced_logic + and state.has_all({ + "High Jump", + "Footprints", + "Combo Master"}, player) + ) + )) + add_rule(kh1world.get_location("Wonderland Lotus Forest Through the Painting White Trinity Chest"), + lambda state: ( + state.has_all({ + "White Trinity", + "Footprints"}, player) + )) + add_rule(kh1world.get_location("Deep Jungle Hippo's Lagoon Right Chest"), + lambda state: ( + + state.has("High Jump", player) + or state.has("Progressive Glide", player) + or options.advanced_logic + )) + add_rule(kh1world.get_location("Deep Jungle Climbing Trees Blue Trinity Chest"), + lambda state: state.has("Blue Trinity", player)) + add_rule(kh1world.get_location("Deep Jungle Cavern of Hearts White Trinity Chest"), + lambda state: ( + state.has_all({ + "White Trinity", + "Slides"}, player) + )) + add_rule(kh1world.get_location("Deep Jungle Camp Blue Trinity Chest"), + lambda state: state.has("Blue Trinity", player)) + add_rule(kh1world.get_location("Deep Jungle Waterfall Cavern Low Chest"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Waterfall Cavern Middle Chest"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Waterfall Cavern High Wall Chest"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Waterfall Cavern High Middle Chest"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Tree House Suspended Boat Chest"), + lambda state: ( + state.has("Progressive Glide", player) + or options.advanced_logic + )) + add_rule(kh1world.get_location("Agrabah Main Street High Above Palace Gates Entrance Chest"), + lambda state: ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + or (options.advanced_logic and can_dumbo_skip(state, player)) + )) + add_rule(kh1world.get_location("Agrabah Palace Gates High Opposite Palace Chest"), + lambda state: ( + state.has("High Jump", player) + or options.advanced_logic + )) + add_rule(kh1world.get_location("Agrabah Palace Gates High Close to Palace Chest"), + lambda state: ( + ( + state.has_all({ + "High Jump", + "Progressive Glide"}, player) + or + ( + options.advanced_logic + and + ( + state.has("Combo Master", player) + or can_dumbo_skip(state, player) + ) + ) + ) + or state.has("High Jump", player, 3) + or (options.advanced_logic and state.has("Progressive Glide", player)) + )) + add_rule(kh1world.get_location("Agrabah Storage Green Trinity Chest"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Entrance Tall Tower Chest"), + lambda state: ( + state.has("Progressive Glide", player) + or (options.advanced_logic and state.has("Combo Master", player)) + or (options.advanced_logic and can_dumbo_skip(state, player)) + or state.has("High Jump", player, 2) + )) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Bottomless Hall Pillar Chest"), + lambda state: ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + or options.advanced_logic + )) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Silent Chamber Blue Trinity Chest"), + lambda state: state.has("Blue Trinity", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Hidden Room Right Chest"), + lambda state: ( + state.has("Yellow Trinity", player) + or state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + )) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Hidden Room Left Chest"), + lambda state: ( + state.has("Yellow Trinity", player) + or state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + )) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Entrance White Trinity Chest"), + lambda state: state.has("White Trinity", player)) + add_rule(kh1world.get_location("Monstro Chamber 6 Other Platform Chest"), + lambda state: ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Combo Master", player)) + )) + add_rule(kh1world.get_location("Monstro Chamber 6 Platform Near Chamber 5 Entrance Chest"), + lambda state: ( + state.has("High Jump", player) + or options.advanced_logic + )) + add_rule(kh1world.get_location("Monstro Chamber 6 Raised Area Near Chamber 1 Entrance Chest"), + lambda state: ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Combo Master", player)) + )) + add_rule(kh1world.get_location("Halloween Town Moonlight Hill White Trinity Chest"), + lambda state: ( + state.has_all({ + "White Trinity", + "Forget-Me-Not"}, player) + )) + add_rule(kh1world.get_location("Halloween Town Bridge Under Bridge"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + )) + add_rule(kh1world.get_location("Halloween Town Boneyard Tombstone Puzzle Chest"), + lambda state: state.has("Forget-Me-Not", player)) + add_rule(kh1world.get_location("Halloween Town Bridge Right of Gate Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and + ( + state.has("Progressive Glide", player) + or options.advanced_logic + ) + )) + add_rule(kh1world.get_location("Halloween Town Cemetery Behind Grave Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Halloween Town Cemetery By Cat Shape Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Halloween Town Cemetery Between Graves Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Lower Iron Cage Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Upper Iron Cage Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Hollow Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Grounds Red Trinity Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not", + "Red Trinity"}, player) + )) + add_rule(kh1world.get_location("Halloween Town Guillotine Square High Tower Chest"), + lambda state: ( + state.has("High Jump", player) + or (options.advanced_logic and can_dumbo_skip(state, player)) + or (options.advanced_logic and state.has("Progressive Glide", player)) + )) + add_rule(kh1world.get_location("Halloween Town Guillotine Square Pumpkin Structure Left Chest"), + lambda state: ( + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and + ( + state.has("Progressive Glide", player) + or (options.advanced_logic and state.has("Combo Master", player)) + or state.has("High Jump", player, 2) + ) + )) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Entrance Steps Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + )) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Inside Entrance Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + )) + add_rule(kh1world.get_location("Halloween Town Bridge Left of Gate Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and + ( + state.has("Progressive Glide", player) + or state.has("High Jump", player) + or options.advanced_logic + ) + )) + add_rule(kh1world.get_location("Halloween Town Cemetery By Striped Grave Chest"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Halloween Town Guillotine Square Pumpkin Structure Right Chest"), + lambda state: ( + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and + ( + state.has("Progressive Glide", player) + or (options.advanced_logic and state.has("Combo Master", player)) + or state.has("High Jump", player, 2) + ) + )) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Right Blue Trinity Chest"), + lambda state: state.has("Blue Trinity", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Left Blue Trinity Chest"), + lambda state: state.has("Blue Trinity", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates White Trinity Chest"), + lambda state: state.has("White Trinity", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Blizzara Chest"), + lambda state: state.has("Progressive Blizzard", player, 2)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Blizzaga Chest"), + lambda state: state.has("Progressive Blizzard", player, 3)) + add_rule(kh1world.get_location("Monstro Mouth High Platform Boat Side Chest"), + lambda state: ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + )) + add_rule(kh1world.get_location("Monstro Mouth High Platform Across from Boat Chest"), + lambda state: ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + )) + add_rule(kh1world.get_location("Monstro Mouth Green Trinity Top of Boat Chest"), + lambda state: ( + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + ) + and state.has("Green Trinity", player) + )) + add_rule(kh1world.get_location("Monstro Chamber 5 Platform Chest"), + lambda state: state.has("High Jump", player)) + add_rule(kh1world.get_location("Monstro Chamber 3 Platform Above Chamber 2 Entrance Chest"), + lambda state: ( + state.has("High Jump", player) + or options.advanced_logic + )) + add_rule(kh1world.get_location("Monstro Chamber 3 Platform Near Chamber 6 Entrance Chest"), + lambda state: ( + state.has("High Jump", player) + or options.advanced_logic + )) + add_rule(kh1world.get_location("Monstro Chamber 5 Atop Barrel Chest"), + lambda state: ( + state.has("High Jump", player) + or options.advanced_logic + )) + add_rule(kh1world.get_location("Neverland Pirate Ship Deck White Trinity Chest"), + lambda state: ( + state.has_all({ + "White Trinity", + "Green Trinity"}, player) + )) + add_rule(kh1world.get_location("Neverland Pirate Ship Crows Nest Chest"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Neverland Hold Yellow Trinity Right Blue Chest"), + lambda state: state.has("Yellow Trinity", player)) + add_rule(kh1world.get_location("Neverland Hold Yellow Trinity Left Blue Chest"), + lambda state: state.has("Yellow Trinity", player)) + add_rule(kh1world.get_location("Neverland Cabin Chest"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Neverland Hold Flight 1st Chest"), + lambda state: ( + state.has("Green Trinity", player) + or state.has("Progressive Glide", player) + or state.has("High Jump", player, 3) + )) + add_rule(kh1world.get_location("Neverland Clock Tower Chest"), + lambda state: ( + state.has("Green Trinity", player) + and has_all_magic_lvx(state, player, 2) + )) + add_rule(kh1world.get_location("Neverland Hold Flight 2nd Chest"), + lambda state: ( + state.has("Green Trinity", player) + or state.has("Progressive Glide", player) + or state.has("High Jump", player, 3) + )) + add_rule(kh1world.get_location("Neverland Hold Yellow Trinity Green Chest"), + lambda state: state.has("Yellow Trinity", player)) + add_rule(kh1world.get_location("Neverland Captain's Cabin Chest"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls Under Water 2nd Chest"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls Floating Platform Near Save Chest"), + lambda state: ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + or state.has("Progressive Blizzard", player) + )) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls Floating Platform Near Bubble Chest"), + lambda state: ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + or state.has("Progressive Blizzard", player) + )) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls High Platform Chest"), + lambda state: ( + state.has("Progressive Glide", player) + or (state.has("Progressive Blizzard", player) and has_emblems(state, player, options.keyblades_unlock_chests)) + or (options.advanced_logic and state.has("Combo Master", player)) + )) + add_rule(kh1world.get_location("Hollow Bastion Castle Gates Gravity Chest"), + lambda state: ( + state.has("Progressive Gravity", player) + and + ( + has_emblems(state, player, options.keyblades_unlock_chests) + or (options.advanced_logic and state.has("High Jump", player, 2) and state.has("Progressive Glide", player)) + or (options.advanced_logic and can_dumbo_skip(state, player) and state.has("Progressive Glide", player)) + ) + )) + add_rule(kh1world.get_location("Hollow Bastion Castle Gates Freestanding Pillar Chest"), + lambda state: ( + has_emblems(state, player, options.keyblades_unlock_chests) + or state.has("High Jump", player, 2) + or (options.advanced_logic and can_dumbo_skip(state, player)) + )) + add_rule(kh1world.get_location("Hollow Bastion Castle Gates High Pillar Chest"), + lambda state: ( + has_emblems(state, player, options.keyblades_unlock_chests) + or state.has("High Jump", player, 2) + or (options.advanced_logic and can_dumbo_skip(state, player)) + )) + add_rule(kh1world.get_location("Hollow Bastion Great Crest Lower Chest"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Great Crest After Battle Platform Chest"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion High Tower 2nd Gravity Chest"), + lambda state: ( + state.has("Progressive Gravity", player) + and has_emblems(state, player, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Hollow Bastion High Tower 1st Gravity Chest"), + lambda state: ( + state.has("Progressive Gravity", player) + and has_emblems(state, player, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Hollow Bastion High Tower Above Sliding Blocks Chest"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Library Node After High Tower Switch Gravity Chest"), + lambda state: ( + state.has("Progressive Gravity", player) + and has_emblems(state, player, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Library Node Gravity Chest"), + lambda state: state.has("Progressive Gravity", player)) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Under High Tower Sliding Blocks Chest"), + lambda state: ( + has_emblems(state, player, options.keyblades_unlock_chests) + and state.has_all({ + "Progressive Glide", + "Progressive Gravity"}, player) + )) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Outside Library Gravity Chest"), + lambda state: state.has("Progressive Gravity", player)) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Heartless Sigil Door Gravity Chest"), + lambda state: ( + state.has("Progressive Gravity", player) + and has_emblems(state, player, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Hollow Bastion Waterway Blizzard on Bubble Chest"), + lambda state: ( + (state.has("Progressive Blizzard", player) and state.has("High Jump", player)) + or state.has("High Jump", player, 3) + )) + add_rule(kh1world.get_location("Hollow Bastion Grand Hall Steps Right Side Chest"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Grand Hall Oblivion Chest"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Grand Hall Left of Gate Chest"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Entrance Hall Left of Emblem Door Chest"), + lambda state: ( + state.has("High Jump", player) + or + ( + options.advanced_logic + and can_dumbo_skip(state, player) + and has_emblems(state, player, options.keyblades_unlock_chests) + ) + )) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls White Trinity Chest"), + lambda state: state.has("White Trinity", player)) + add_rule(kh1world.get_location("End of the World Giant Crevasse 5th Chest"), + lambda state: ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + )) + add_rule(kh1world.get_location("End of the World Giant Crevasse 1st Chest"), + lambda state: ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + )) + add_rule(kh1world.get_location("End of the World Giant Crevasse 4th Chest"), + lambda state: ( + ( + options.advanced_logic + and state.has("High Jump", player) + and state.has("Combo Master", player) + ) + or state.has("Progressive Glide", player) + )) + add_rule(kh1world.get_location("End of the World World Terminus Agrabah Chest"), + lambda state: ( + state.has("High Jump", player) + or + ( + options.advanced_logic + and can_dumbo_skip(state, player) + and state.has("Progressive Glide", player) + ) + )) + add_rule(kh1world.get_location("Monstro Chamber 6 White Trinity Chest"), + lambda state: state.has("White Trinity", player)) + add_rule(kh1world.get_location("Traverse Town Kairi Secret Waterway Oathkeeper Event"), + lambda state: ( + has_emblems(state, player, options.keyblades_unlock_chests) + and state.has("Hollow Bastion", player) + and has_x_worlds(state, player, 5, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Deep Jungle Defeat Sabor White Fang Event"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Defeat Clayton Cure Event"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Seal Keyhole Jungle King Event"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Seal Keyhole Red Trinity Event"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Olympus Coliseum Defeat Cerberus Inferno Band Event"), + lambda state: state.has("Entry Pass", player)) + add_rule(kh1world.get_location("Olympus Coliseum Cloud Sonic Blade Event"), + lambda state: state.has("Entry Pass", player)) + add_rule(kh1world.get_location("Wonderland Defeat Trickmaster Blizzard Event"), + lambda state: state.has("Footprints", player)) + add_rule(kh1world.get_location("Wonderland Defeat Trickmaster Ifrit's Horn Event"), + lambda state: state.has("Footprints", player)) + add_rule(kh1world.get_location("Monstro Defeat Parasite Cage II Stop Event"), + lambda state: ( + state.has("High Jump", player) + or + ( + options.advanced_logic + and state.has("Progressive Glide", player) + ) + )) + add_rule(kh1world.get_location("Halloween Town Defeat Oogie Boogie Holy Circlet Event"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Halloween Town Defeat Oogie's Manor Gravity Event"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Halloween Town Seal Keyhole Pumpkinhead Event"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not"}, player) + and has_oogie_manor(state, player, options.advanced_logic) + )) + add_rule(kh1world.get_location("Neverland Defeat Anti Sora Raven's Claw Event"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Neverland Encounter Hook Cure Event"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Neverland Seal Keyhole Fairy Harp Event"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Neverland Seal Keyhole Tinker Bell Event"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Neverland Seal Keyhole Glide Event"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Neverland Defeat Captain Hook Ars Arcanum Event"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Hollow Bastion Defeat Maleficent Donald Cheer Event"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Defeat Dragon Maleficent Fireglow Event"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Defeat Riku II Ragnarok Event"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Defeat Behemoth Omega Arts Event"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Speak to Princesses Fire Event"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 01 Event"), + lambda state: state.has("Postcard", player)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 02 Event"), + lambda state: state.has("Postcard", player, 2)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 03 Event"), + lambda state: state.has("Postcard", player, 3)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 04 Event"), + lambda state: state.has("Postcard", player, 4)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 05 Event"), + lambda state: state.has("Postcard", player, 5)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 06 Event"), + lambda state: state.has("Postcard", player, 6)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 07 Event"), + lambda state: state.has("Postcard", player, 7)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 08 Event"), + lambda state: state.has("Postcard", player, 8)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 09 Event"), + lambda state: state.has("Postcard", player, 9)) + add_rule(kh1world.get_location("Traverse Town Mail Postcard 10 Event"), + lambda state: state.has("Postcard", player, 10)) + add_rule(kh1world.get_location("Traverse Town Defeat Opposite Armor Aero Event"), + lambda state: state.has("Red Trinity", player)) + add_rule(kh1world.get_location("Hollow Bastion Speak with Aerith Ansem's Report 2"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Speak with Aerith Ansem's Report 4"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Defeat Maleficent Ansem's Report 5"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Speak with Aerith Ansem's Report 6"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Halloween Town Defeat Oogie Boogie Ansem's Report 7"), + lambda state: ( + state.has_all({ + "Jack-In-The-Box", + "Forget-Me-Not", + "Progressive Fire"}, player) + )) + add_rule(kh1world.get_location("Neverland Defeat Hook Ansem's Report 9"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Hollow Bastion Speak with Aerith Ansem's Report 10"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Geppetto Reward 1"), + lambda state: ( + state.has("Monstro", player) + and + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and has_x_worlds(state, player, 2, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Geppetto Reward 2"), + lambda state: ( + state.has("Monstro", player) + and + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and has_x_worlds(state, player, 2, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Geppetto Reward 3"), + lambda state: ( + state.has("Monstro", player) + and + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and has_x_worlds(state, player, 2, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Geppetto Reward 4"), + lambda state: ( + state.has("Monstro", player) + and + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and has_x_worlds(state, player, 2, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Geppetto Reward 5"), + lambda state: ( + state.has("Monstro", player) + and + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and has_x_worlds(state, player, 2, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Geppetto All Summons Reward"), + lambda state: ( + state.has("Monstro", player) + and + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and has_all_summons(state, player) + and has_x_worlds(state, player, 2, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Talk to Pinocchio"), + lambda state: ( + state.has("Monstro", player) + and + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and has_x_worlds(state, player, 2, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Traverse Town Magician's Study Obtained All Arts Items"), + lambda state: ( + has_all_magic_lvx(state, player, 1) + and has_all_arts(state, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Traverse Town Magician's Study Obtained All LV1 Magic"), + lambda state: has_all_magic_lvx(state, player, 1)) + add_rule(kh1world.get_location("Traverse Town Magician's Study Obtained All LV3 Magic"), + lambda state: has_all_magic_lvx(state, player, 3)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 10 Puppies"), + lambda state: has_puppies(state, player, 10)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 20 Puppies"), + lambda state: has_puppies(state, player, 20)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 30 Puppies"), + lambda state: has_puppies(state, player, 30)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 40 Puppies"), + lambda state: has_puppies(state, player, 40)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 50 Puppies Reward 1"), + lambda state: has_puppies(state, player, 50)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 50 Puppies Reward 2"), + lambda state: has_puppies(state, player, 50)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 60 Puppies"), + lambda state: has_puppies(state, player, 60)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 70 Puppies"), + lambda state: has_puppies(state, player, 70)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 80 Puppies"), + lambda state: has_puppies(state, player, 80)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 90 Puppies"), + lambda state: has_puppies(state, player, 90)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 99 Puppies Reward 1"), + lambda state: has_puppies(state, player, 99)) + add_rule(kh1world.get_location("Traverse Town Piano Room Return 99 Puppies Reward 2"), + lambda state: has_puppies(state, player, 99)) + add_rule(kh1world.get_location("Neverland Hold Aero Chest"), + lambda state: state.has("Yellow Trinity", player)) + add_rule(kh1world.get_location("Deep Jungle Camp Hi-Potion Experiment"), + lambda state: state.has("Progressive Fire", player)) + add_rule(kh1world.get_location("Deep Jungle Camp Ether Experiment"), + lambda state: state.has("Progressive Blizzard", player)) + add_rule(kh1world.get_location("Deep Jungle Camp Replication Experiment"), + lambda state: state.has("Progressive Blizzard", player)) + add_rule(kh1world.get_location("Deep Jungle Cliff Save Gorillas"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Tree House Save Gorillas"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Camp Save Gorillas"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Bamboo Thicket Save Gorillas"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Climbing Trees Save Gorillas"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Jungle Slider 10 Fruits"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Jungle Slider 20 Fruits"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Jungle Slider 30 Fruits"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Jungle Slider 40 Fruits"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Deep Jungle Jungle Slider 50 Fruits"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Wonderland Bizarre Room Read Book"), + lambda state: state.has("Footprints", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Green Trinity"), + lambda state: state.has("Green Trinity", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Hero's License Event"), + lambda state: state.has("Entry Pass", player)) + add_rule(kh1world.get_location("Deep Jungle Cavern of Hearts Navi-G Piece Event"), + lambda state: state.has("Slides", player)) + add_rule(kh1world.get_location("Wonderland Bizarre Room Navi-G Piece Event"), + lambda state: state.has("Footprints", player)) + add_rule(kh1world.get_location("Traverse Town Synth Log"), + lambda state: ( + state.has("Empty Bottle", player, 6) + and + ( + state.has("Green Trinity", player) + or state.has("High Jump", player, 3) + ) + )) + add_rule(kh1world.get_location("Traverse Town Synth Cloth"), + lambda state: ( + state.has("Empty Bottle", player, 6) + and + ( + state.has("Green Trinity", player) + or state.has("High Jump", player, 3) + ) + )) + add_rule(kh1world.get_location("Traverse Town Synth Rope"), + lambda state: ( + state.has("Empty Bottle", player, 6) + and + ( + state.has("Green Trinity", player) + or state.has("High Jump", player, 3) + ) + )) + add_rule(kh1world.get_location("Traverse Town Synth Seagull Egg"), + lambda state: ( + state.has("Empty Bottle", player, 6) + and + ( + state.has("Green Trinity", player) + or state.has("High Jump", player, 3) + ) + )) + add_rule(kh1world.get_location("Traverse Town Synth Fish"), + lambda state: ( + state.has("Empty Bottle", player, 6) + and + ( + state.has("Green Trinity", player) + or state.has("High Jump", player, 3) + ) + )) + add_rule(kh1world.get_location("Traverse Town Synth Mushroom"), + lambda state: ( + state.has("Empty Bottle", player, 6) + and + ( + state.has("Green Trinity", player) + or state.has("High Jump", player, 3) + ) + )) + add_rule(kh1world.get_location("Traverse Town Gizmo Shop Postcard 1"), + lambda state: state.has("Progressive Thunder", player)) + add_rule(kh1world.get_location("Traverse Town Gizmo Shop Postcard 2"), + lambda state: state.has("Progressive Thunder", player)) + add_rule(kh1world.get_location("Traverse Town Item Workshop Postcard"), + lambda state: ( + state.has("Green Trinity", player) + or state.has("High Jump", player, 3) + )) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Postcard"), + lambda state: ( + state.has("Monstro", player) + and + ( + state.has("High Jump", player) + or (options.advanced_logic and state.has("Progressive Glide", player)) + ) + and has_x_worlds(state, player, 2, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Hollow Bastion Entrance Hall Emblem Piece (Flame)"), + lambda state: ( + ( + state.has("Theon Vol. 6", player) + or state.has("High Jump", player, 3) + or has_emblems(state, player, options.keyblades_unlock_chests) + ) + and state.has("Progressive Fire", player) + and + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + or state.has("Progressive Thunder", player) + or options.advanced_logic + ) + )) + add_rule(kh1world.get_location("Hollow Bastion Entrance Hall Emblem Piece (Chest)"), + lambda state: ( + state.has("Theon Vol. 6", player) + or state.has("High Jump", player, 3) + or has_emblems(state, player, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Hollow Bastion Entrance Hall Emblem Piece (Statue)"), + lambda state: ( + ( + state.has("Theon Vol. 6", player) + or state.has("High Jump", player, 3) + or has_emblems(state, player, options.keyblades_unlock_chests) + ) + and state.has("Red Trinity", player) + )) + add_rule(kh1world.get_location("Hollow Bastion Entrance Hall Emblem Piece (Fountain)"), + lambda state: ( + state.has("Theon Vol. 6", player) + or state.has("High Jump", player, 3) + or has_emblems(state, player, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Hollow Bastion Library Speak to Belle Divine Rose"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + add_rule(kh1world.get_location("Hollow Bastion Library Speak to Aerith Cure"), + lambda state: has_emblems(state, player, options.keyblades_unlock_chests)) + if options.hundred_acre_wood: + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Left Cliff Chest"), + lambda state: ( + has_torn_pages(state, player, 4) + and + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + ) + )) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Right Tree Alcove Chest"), + lambda state: ( + has_torn_pages(state, player, 4) + and + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + ) + )) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Under Giant Pot Chest"), + lambda state: has_torn_pages(state, player, 4)) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Turn in Rare Nut 1"), + lambda state: has_torn_pages(state, player, 4)) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Turn in Rare Nut 2"), + lambda state: ( + has_torn_pages(state, player, 4) + and + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + ) + )) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Turn in Rare Nut 3"), + lambda state: ( + has_torn_pages(state, player, 4) + and + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + ) + )) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Turn in Rare Nut 4"), + lambda state: ( + has_torn_pages(state, player, 4) + and + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + ) + )) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Turn in Rare Nut 5"), + lambda state: ( + has_torn_pages(state, player, 4) + and + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + ) + )) + add_rule(kh1world.get_location("100 Acre Wood Pooh's House Owl Cheer"), + lambda state: has_torn_pages(state, player, 5)) + add_rule(kh1world.get_location("100 Acre Wood Convert Torn Page 1"), + lambda state: has_torn_pages(state, player, 1)) + add_rule(kh1world.get_location("100 Acre Wood Convert Torn Page 2"), + lambda state: has_torn_pages(state, player, 2)) + add_rule(kh1world.get_location("100 Acre Wood Convert Torn Page 3"), + lambda state: has_torn_pages(state, player, 3)) + add_rule(kh1world.get_location("100 Acre Wood Convert Torn Page 4"), + lambda state: has_torn_pages(state, player, 4)) + add_rule(kh1world.get_location("100 Acre Wood Convert Torn Page 5"), + lambda state: has_torn_pages(state, player, 5)) + add_rule(kh1world.get_location("100 Acre Wood Pooh's House Start Fire"), + lambda state: has_torn_pages(state, player, 3)) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Break Log"), + lambda state: has_torn_pages(state, player, 4)) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Fall Through Top of Tree Next to Pooh"), + lambda state: ( + has_torn_pages(state, player, 4) + and + ( + state.has("High Jump", player) + or state.has("Progressive Glide", player) + ) + )) + if options.atlantica: + add_rule(kh1world.get_location("Atlantica Ursula's Lair Use Fire on Urchin Chest"), + lambda state: ( + state.has_all({ + "Progressive Fire", + "Crystal Trident"}, player) + )) + add_rule(kh1world.get_location("Atlantica Triton's Palace White Trinity Chest"), + lambda state: state.has("White Trinity", player)) + add_rule(kh1world.get_location("Atlantica Defeat Ursula I Mermaid Kick Event"), + lambda state: ( + has_offensive_magic(state, player) + and state.has("Crystal Trident", player) + )) + add_rule(kh1world.get_location("Atlantica Defeat Ursula II Thunder Event"), + lambda state: ( + state.has("Mermaid Kick", player) + and has_offensive_magic(state, player) + and state.has("Crystal Trident", player) + )) + add_rule(kh1world.get_location("Atlantica Seal Keyhole Crabclaw Event"), + lambda state: ( + state.has("Mermaid Kick", player) + and has_offensive_magic(state, player) + and state.has("Crystal Trident", player) + )) + add_rule(kh1world.get_location("Atlantica Undersea Gorge Blizzard Clam"), + lambda state: state.has("Progressive Blizzard", player)) + add_rule(kh1world.get_location("Atlantica Undersea Valley Fire Clam"), + lambda state: state.has("Progressive Fire", player)) + add_rule(kh1world.get_location("Atlantica Triton's Palace Thunder Clam"), + lambda state: state.has("Progressive Thunder", player)) + add_rule(kh1world.get_location("Atlantica Cavern Nook Clam"), + lambda state: state.has("Crystal Trident", player)) + add_rule(kh1world.get_location("Atlantica Defeat Ursula II Ansem's Report 3"), + lambda state: ( + state.has_all({ + "Mermaid Kick", + "Crystal Trident"}, player) + and has_offensive_magic(state, player) + )) + if options.cups: + add_rule(kh1world.get_location("Olympus Coliseum Defeat Hades Ansem's Report 8"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Complete Phil Cup"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Entry Pass"}, player) + )) + add_rule(kh1world.get_location("Complete Phil Cup Solo"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Entry Pass"}, player) + )) + add_rule(kh1world.get_location("Complete Phil Cup Time Trial"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Entry Pass"}, player) + )) + add_rule(kh1world.get_location("Complete Pegasus Cup"), + lambda state: ( + state.has_all({ + "Pegasus Cup", + "Entry Pass"}, player) + )) + add_rule(kh1world.get_location("Complete Pegasus Cup Solo"), + lambda state: ( + state.has_all({ + "Pegasus Cup", + "Entry Pass"}, player) + )) + add_rule(kh1world.get_location("Complete Pegasus Cup Time Trial"), + lambda state: ( + state.has_all({ + "Pegasus Cup", + "Entry Pass"}, player) + )) + add_rule(kh1world.get_location("Complete Hercules Cup"), + lambda state: ( + state.has_all({ + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 4, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Complete Hercules Cup Solo"), + lambda state: ( + state.has_all({ + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 4, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Complete Hercules Cup Time Trial"), + lambda state: ( + state.has_all({ + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 4, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Complete Hades Cup"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Complete Hades Cup Solo"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Complete Hades Cup Time Trial"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Hades Cup Defeat Cloud and Leon Event"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Hades Cup Defeat Yuffie Event"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Hades Cup Defeat Cerberus Event"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Hades Cup Defeat Behemoth Event"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Hades Cup Defeat Hades Event"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Hercules Cup Defeat Cloud Event"), + lambda state: ( + state.has_all({ + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 4, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Hercules Cup Yellow Trinity Event"), + lambda state: ( + state.has_all({ + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 4, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Olympus Coliseum Defeat Ice Titan Diamond Dust Event"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass", + "Guard"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Olympus Coliseum Gates Purple Jar After Defeating Hades"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Olympus Coliseum Olympia Chest"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 4, options.keyblades_unlock_chests) + )) + if options.super_bosses: + add_rule(kh1world.get_location("Neverland Defeat Phantom Stop Event"), + lambda state: ( + state.has("Green Trinity", player) + and has_all_magic_lvx(state, player, 2) + and has_defensive_tools(state, player) + and has_emblems(state, player, options.keyblades_unlock_chests) + )) + add_rule(kh1world.get_location("Agrabah Defeat Kurt Zisa Ansem's Report 11"), + lambda state: ( + has_emblems(state, player, options.keyblades_unlock_chests) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Agrabah Defeat Kurt Zisa Zantetsuken Event"), + lambda state: ( + has_emblems(state, player, options.keyblades_unlock_chests) and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) and has_defensive_tools(state, player) + )) + if options.super_bosses or options.goal.current_key == "sephiroth": + add_rule(kh1world.get_location("Olympus Coliseum Defeat Sephiroth Ansem's Report 12"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Olympus Coliseum Defeat Sephiroth One-Winged Angel Event"), + lambda state: ( + state.has_all({ + "Phil Cup", + "Pegasus Cup", + "Hercules Cup", + "Entry Pass"}, player) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + if options.super_bosses or options.goal.current_key == "unknown": + add_rule(kh1world.get_location("Hollow Bastion Defeat Unknown Ansem's Report 13"), + lambda state: ( + has_emblems(state, player, options.keyblades_unlock_chests) + and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + add_rule(kh1world.get_location("Hollow Bastion Defeat Unknown EXP Necklace Event"), + lambda state: ( + has_emblems(state, player, options.keyblades_unlock_chests) and has_x_worlds(state, player, 7, options.keyblades_unlock_chests) + and has_defensive_tools(state, player) + )) + for i in range(options.level_checks): + add_rule(kh1world.get_location("Level " + str(i+1).rjust(3,'0')), + lambda state, level_num=i: ( + has_x_worlds(state, player, min(((level_num//10)*2), 8), options.keyblades_unlock_chests) + )) + if options.goal.current_key == "final_ansem": + add_rule(kh1world.get_location("Final Ansem"), + lambda state: ( + has_final_rest_door(state, player, final_rest_door_requirement, final_rest_door_required_reports, options.keyblades_unlock_chests, options.puppies) + )) + if options.keyblades_unlock_chests: + add_rule(kh1world.get_location("Traverse Town 1st District Candle Puzzle Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town 1st District Accessory Shop Roof Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town 2nd District Boots and Shoes Awning Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town 2nd District Rooftop Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town 2nd District Gizmo Shop Facade Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Alleyway Balcony Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Alleyway Blue Room Awning Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Alleyway Corner Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Green Room Clock Puzzle Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Green Room Table Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Red Room Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Mystical House Yellow Trinity Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Accessory Shop Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Secret Waterway White Trinity Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Geppetto's House Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Item Workshop Right Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town 1st District Blue Trinity Balcony Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Mystical House Glide Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Alleyway Behind Crates Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Item Workshop Left Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Traverse Town Secret Waterway Near Stairs Chest"), + lambda state: state.has("Lionheart", player)) + add_rule(kh1world.get_location("Wonderland Rabbit Hole Green Trinity Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Rabbit Hole Defeat Heartless 1 Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Rabbit Hole Defeat Heartless 2 Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Rabbit Hole Defeat Heartless 3 Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Bizarre Room Green Trinity Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Queen's Castle Hedge Left Red Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Queen's Castle Hedge Right Blue Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Queen's Castle Hedge Right Red Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Lotus Forest Thunder Plant Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Lotus Forest Through the Painting Thunder Plant Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Lotus Forest Glide Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Lotus Forest Nut Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Lotus Forest Corner Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Bizarre Room Lamp Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Tea Party Garden Above Lotus Forest Entrance 2nd Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Tea Party Garden Above Lotus Forest Entrance 1st Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Tea Party Garden Bear and Clock Puzzle Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Tea Party Garden Across From Bizarre Room Entrance Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Wonderland Lotus Forest Through the Painting White Trinity Chest"), + lambda state: state.has("Lady Luck", player)) + add_rule(kh1world.get_location("Deep Jungle Tree House Beneath Tree House Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Tree House Rooftop Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Hippo's Lagoon Center Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Hippo's Lagoon Left Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Hippo's Lagoon Right Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Vines Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Vines 2 Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Climbing Trees Blue Trinity Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Tunnel Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Cavern of Hearts White Trinity Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Camp Blue Trinity Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Tent Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Waterfall Cavern Low Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Waterfall Cavern Middle Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Waterfall Cavern High Wall Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Waterfall Cavern High Middle Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Cliff Right Cliff Left Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Cliff Right Cliff Right Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Deep Jungle Tree House Suspended Boat Chest"), + lambda state: state.has("Jungle King", player)) + add_rule(kh1world.get_location("Agrabah Plaza By Storage Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Plaza Raised Terrace Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Plaza Top Corner Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Alley Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Bazaar Across Windows Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Bazaar High Corner Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Main Street Right Palace Entrance Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Main Street High Above Alley Entrance Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Main Street High Above Palace Gates Entrance Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Palace Gates Low Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Palace Gates High Opposite Palace Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Palace Gates High Close to Palace Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Storage Green Trinity Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Storage Behind Barrel Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Entrance Left Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Entrance Tall Tower Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Hall High Left Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Hall Near Bottomless Hall Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Bottomless Hall Raised Platform Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Bottomless Hall Pillar Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Bottomless Hall Across Chasm Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Treasure Room Across Platforms Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Treasure Room Small Treasure Pile Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Treasure Room Large Treasure Pile Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Treasure Room Above Fire Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Relic Chamber Jump from Stairs Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Relic Chamber Stairs Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Dark Chamber Abu Gem Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Dark Chamber Across from Relic Chamber Entrance Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Dark Chamber Bridge Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Dark Chamber Near Save Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Silent Chamber Blue Trinity Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Hidden Room Right Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Hidden Room Left Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Aladdin's House Main Street Entrance Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Aladdin's House Plaza Entrance Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Agrabah Cave of Wonders Entrance White Trinity Chest"), + lambda state: state.has("Three Wishes", player)) + add_rule(kh1world.get_location("Monstro Chamber 6 Other Platform Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 6 Platform Near Chamber 5 Entrance Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 6 Raised Area Near Chamber 1 Entrance Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 6 Low Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Halloween Town Moonlight Hill White Trinity Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Bridge Under Bridge"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Boneyard Tombstone Puzzle Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Bridge Right of Gate Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Cemetery Behind Grave Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Cemetery By Cat Shape Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Cemetery Between Graves Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Lower Iron Cage Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Upper Iron Cage Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Hollow Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Grounds Red Trinity Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Guillotine Square High Tower Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Guillotine Square Pumpkin Structure Left Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Entrance Steps Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Oogie's Manor Inside Entrance Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Bridge Left of Gate Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Cemetery By Striped Grave Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Guillotine Square Under Jack's House Stairs Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Halloween Town Guillotine Square Pumpkin Structure Right Chest"), + lambda state: state.has("Pumpkinhead", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Left Behind Columns Chest"), + lambda state: state.has("Olympia", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Right Blue Trinity Chest"), + lambda state: state.has("Olympia", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Left Blue Trinity Chest"), + lambda state: state.has("Olympia", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates White Trinity Chest"), + lambda state: state.has("Olympia", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Blizzara Chest"), + lambda state: state.has("Olympia", player)) + add_rule(kh1world.get_location("Olympus Coliseum Coliseum Gates Blizzaga Chest"), + lambda state: state.has("Olympia", player)) + add_rule(kh1world.get_location("Monstro Mouth Boat Deck Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Mouth High Platform Boat Side Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Mouth High Platform Across from Boat Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Mouth Near Ship Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Mouth Green Trinity Top of Boat Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 2 Ground Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 2 Platform Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 5 Platform Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 3 Ground Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 3 Platform Above Chamber 2 Entrance Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 3 Near Chamber 6 Entrance Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 3 Platform Near Chamber 6 Entrance Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Mouth High Platform Near Teeth Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 5 Atop Barrel Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 5 Low 2nd Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Monstro Chamber 5 Low 1st Chest"), + lambda state: state.has("Wishing Star", player)) + add_rule(kh1world.get_location("Neverland Pirate Ship Deck White Trinity Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Pirate Ship Crows Nest Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Hold Yellow Trinity Right Blue Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Hold Yellow Trinity Left Blue Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Galley Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Cabin Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Hold Flight 1st Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Clock Tower Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Hold Flight 2nd Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Hold Yellow Trinity Green Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Neverland Captain's Cabin Chest"), + lambda state: state.has("Fairy Harp", player)) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls Water's Surface Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls Under Water 1st Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls Under Water 2nd Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls Floating Platform Near Save Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls Floating Platform Near Bubble Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls High Platform Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Castle Gates Gravity Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Castle Gates Freestanding Pillar Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Castle Gates High Pillar Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Great Crest Lower Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Great Crest After Battle Platform Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion High Tower 2nd Gravity Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion High Tower 1st Gravity Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion High Tower Above Sliding Blocks Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Library Top of Bookshelf Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Library Node After High Tower Switch Gravity Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Library Node Gravity Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Under High Tower Sliding Blocks Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Outside Library Gravity Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Lift Stop Heartless Sigil Door Gravity Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Base Level Bubble Under the Wall Platform Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Base Level Platform Near Entrance Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Base Level Near Crystal Switch Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Waterway Near Save Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Waterway Blizzard on Bubble Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Waterway Unlock Passage from Base Level Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Dungeon By Candles Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Dungeon Corner Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Grand Hall Steps Right Side Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Grand Hall Oblivion Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Grand Hall Left of Gate Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Entrance Hall Left of Emblem Door Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("Hollow Bastion Rising Falls White Trinity Chest"), + lambda state: state.has("Divine Rose", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 1st Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 2nd Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 3rd Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 4th Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 5th Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 6th Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 10th Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 9th Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 8th Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Dimension 7th Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Giant Crevasse 3rd Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Giant Crevasse 5th Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Giant Crevasse 1st Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Giant Crevasse 4th Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Giant Crevasse 2nd Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World World Terminus Traverse Town Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World World Terminus Wonderland Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World World Terminus Olympus Coliseum Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World World Terminus Deep Jungle Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World World Terminus Agrabah Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World World Terminus Halloween Town Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World World Terminus Neverland Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World World Terminus 100 Acre Wood Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("End of the World Final Rest Chest"), + lambda state: state.has("Oblivion", player)) + add_rule(kh1world.get_location("Monstro Chamber 6 White Trinity Chest"), + lambda state: state.has("Oblivion", player)) + if options.hundred_acre_wood: + add_rule(kh1world.get_location("100 Acre Wood Meadow Inside Log Chest"), + lambda state: state.has("Oathkeeper", player)) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Left Cliff Chest"), + lambda state: state.has("Oathkeeper", player)) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Right Tree Alcove Chest"), + lambda state: state.has("Oathkeeper", player)) + add_rule(kh1world.get_location("100 Acre Wood Bouncing Spot Under Giant Pot Chest"), + lambda state: state.has("Oathkeeper", player)) + + + add_rule(kh1world.get_entrance("Wonderland"), + lambda state: state.has("Wonderland", player) and has_x_worlds(state, player, 2, options.keyblades_unlock_chests)) + add_rule(kh1world.get_entrance("Olympus Coliseum"), + lambda state: state.has("Olympus Coliseum", player) and has_x_worlds(state, player, 2, options.keyblades_unlock_chests)) + add_rule(kh1world.get_entrance("Deep Jungle"), + lambda state: state.has("Deep Jungle", player) and has_x_worlds(state, player, 2, options.keyblades_unlock_chests)) + add_rule(kh1world.get_entrance("Agrabah"), + lambda state: state.has("Agrabah", player) and has_x_worlds(state, player, 2, options.keyblades_unlock_chests)) + add_rule(kh1world.get_entrance("Monstro"), + lambda state: state.has("Monstro", player) and has_x_worlds(state, player, 2, options.keyblades_unlock_chests)) + if options.atlantica: + add_rule(kh1world.get_entrance("Atlantica"), + lambda state: state.has("Atlantica", player) and has_x_worlds(state, player, 2, options.keyblades_unlock_chests)) + add_rule(kh1world.get_entrance("Halloween Town"), + lambda state: state.has("Halloween Town", player) and has_x_worlds(state, player, 2, options.keyblades_unlock_chests)) + add_rule(kh1world.get_entrance("Neverland"), + lambda state: state.has("Neverland", player) and has_x_worlds(state, player, 3, options.keyblades_unlock_chests)) + add_rule(kh1world.get_entrance("Hollow Bastion"), + lambda state: state.has("Hollow Bastion", player) and has_x_worlds(state, player, 5, options.keyblades_unlock_chests)) + add_rule(kh1world.get_entrance("End of the World"), + lambda state: has_x_worlds(state, player, 7, options.keyblades_unlock_chests) and (has_reports(state, player, eotw_required_reports) or state.has("End of the World", player))) + add_rule(kh1world.get_entrance("100 Acre Wood"), + lambda state: state.has("Progressive Fire", player)) + + multiworld.completion_condition[player] = lambda state: state.has("Victory", player) diff --git a/worlds/kh1/__init__.py b/worlds/kh1/__init__.py new file mode 100644 index 000000000000..63b457556894 --- /dev/null +++ b/worlds/kh1/__init__.py @@ -0,0 +1,282 @@ +import logging +from typing import List + +from BaseClasses import Tutorial +from worlds.AutoWorld import WebWorld, World +from .Items import KH1Item, KH1ItemData, event_item_table, get_items_by_category, item_table, item_name_groups +from .Locations import KH1Location, location_table, get_locations_by_category, location_name_groups +from .Options import KH1Options, kh1_option_groups +from .Regions import create_regions +from .Rules import set_rules +from .Presets import kh1_option_presets +from worlds.LauncherComponents import Component, components, Type, launch_subprocess + + +def launch_client(): + from .Client import launch + launch_subprocess(launch, name="KH1 Client") + + +components.append(Component("KH1 Client", "KH1Client", func=launch_client, component_type=Type.CLIENT)) + + +class KH1Web(WebWorld): + theme = "ocean" + tutorials = [Tutorial( + "Multiworld Setup Guide", + "A guide to setting up the Kingdom Hearts Randomizer software on your computer." + "This guide covers single-player, multiworld, and related software.", + "English", + "kh1_en.md", + "kh1/en", + ["Gicu"] + )] + option_groups = kh1_option_groups + options_presets = kh1_option_presets + + +class KH1World(World): + """ + Kingdom Hearts is an action RPG following Sora on his journey + through many worlds to find Riku and Kairi. + """ + game = "Kingdom Hearts" + options_dataclass = KH1Options + options: KH1Options + topology_present = True + web = KH1Web() + + item_name_to_id = {name: data.code for name, data in item_table.items()} + location_name_to_id = {name: data.code for name, data in location_table.items()} + item_name_groups = item_name_groups + location_name_groups = location_name_groups + fillers = {} + fillers.update(get_items_by_category("Item")) + fillers.update(get_items_by_category("Camping")) + fillers.update(get_items_by_category("Stat Ups")) + + def create_items(self): + self.place_predetermined_items() + # Handle starting worlds + starting_worlds = [] + if self.options.starting_worlds > 0: + possible_starting_worlds = ["Wonderland", "Olympus Coliseum", "Deep Jungle", "Agrabah", "Monstro", "Halloween Town", "Neverland", "Hollow Bastion"] + if self.options.atlantica: + possible_starting_worlds.append("Atlantica") + if self.options.end_of_the_world_unlock == "item": + possible_starting_worlds.append("End of the World") + starting_worlds = self.random.sample(possible_starting_worlds, min(self.options.starting_worlds.value, len(possible_starting_worlds))) + for starting_world in starting_worlds: + self.multiworld.push_precollected(self.create_item(starting_world)) + + item_pool: List[KH1Item] = [] + possible_level_up_item_pool = [] + level_up_item_pool = [] + + # Calculate Level Up Items + # Fill pool with mandatory items + for _ in range(self.options.item_slot_increase): + level_up_item_pool.append("Item Slot Increase") + for _ in range(self.options.accessory_slot_increase): + level_up_item_pool.append("Accessory Slot Increase") + + # Create other pool + for _ in range(self.options.strength_increase): + possible_level_up_item_pool.append("Strength Increase") + for _ in range(self.options.defense_increase): + possible_level_up_item_pool.append("Defense Increase") + for _ in range(self.options.hp_increase): + possible_level_up_item_pool.append("Max HP Increase") + for _ in range(self.options.mp_increase): + possible_level_up_item_pool.append("Max MP Increase") + for _ in range(self.options.ap_increase): + possible_level_up_item_pool.append("Max AP Increase") + + # Fill remaining pool with items from other pool + self.random.shuffle(possible_level_up_item_pool) + level_up_item_pool = level_up_item_pool + possible_level_up_item_pool[:(100 - len(level_up_item_pool))] + + level_up_locations = list(get_locations_by_category("Levels").keys()) + self.random.shuffle(level_up_item_pool) + current_level_for_placing_stats = self.options.force_stats_on_levels.value + while len(level_up_item_pool) > 0 and current_level_for_placing_stats <= self.options.level_checks: + self.get_location(level_up_locations[current_level_for_placing_stats - 1]).place_locked_item(self.create_item(level_up_item_pool.pop())) + current_level_for_placing_stats += 1 + + # Calculate prefilled locations and items + prefilled_items = [] + if self.options.vanilla_emblem_pieces: + prefilled_items = prefilled_items + ["Emblem Piece (Flame)", "Emblem Piece (Chest)", "Emblem Piece (Fountain)", "Emblem Piece (Statue)"] + + total_locations = len(self.multiworld.get_unfilled_locations(self.player)) + + non_filler_item_categories = ["Key", "Magic", "Worlds", "Trinities", "Cups", "Summons", "Abilities", "Shared Abilities", "Keyblades", "Accessory", "Weapons", "Puppies"] + if self.options.hundred_acre_wood: + non_filler_item_categories.append("Torn Pages") + for name, data in item_table.items(): + quantity = data.max_quantity + if data.category not in non_filler_item_categories: + continue + if name in starting_worlds: + continue + if data.category == "Puppies": + if self.options.puppies == "triplets" and "-" in name: + item_pool += [self.create_item(name) for _ in range(quantity)] + if self.options.puppies == "individual" and "Puppy" in name: + item_pool += [self.create_item(name) for _ in range(0, quantity)] + if self.options.puppies == "full" and name == "All Puppies": + item_pool += [self.create_item(name) for _ in range(0, quantity)] + elif name == "Atlantica": + if self.options.atlantica: + item_pool += [self.create_item(name) for _ in range(0, quantity)] + elif name == "Mermaid Kick": + if self.options.atlantica: + if self.options.extra_shared_abilities: + item_pool += [self.create_item(name) for _ in range(0, 2)] + else: + item_pool += [self.create_item(name) for _ in range(0, quantity)] + elif name == "Crystal Trident": + if self.options.atlantica: + item_pool += [self.create_item(name) for _ in range(0, quantity)] + elif name == "High Jump": + if self.options.extra_shared_abilities: + item_pool += [self.create_item(name) for _ in range(0, 3)] + else: + item_pool += [self.create_item(name) for _ in range(0, quantity)] + elif name == "Progressive Glide": + if self.options.extra_shared_abilities: + item_pool += [self.create_item(name) for _ in range(0, 4)] + else: + item_pool += [self.create_item(name) for _ in range(0, quantity)] + elif name == "End of the World": + if self.options.end_of_the_world_unlock.current_key == "item": + item_pool += [self.create_item(name) for _ in range(0, quantity)] + elif name == "EXP Zero": + if self.options.exp_zero_in_pool: + item_pool += [self.create_item(name) for _ in range(0, quantity)] + elif name not in prefilled_items: + item_pool += [self.create_item(name) for _ in range(0, quantity)] + + for i in range(self.determine_reports_in_pool()): + item_pool += [self.create_item("Ansem's Report " + str(i+1))] + + while len(item_pool) < total_locations and len(level_up_item_pool) > 0: + item_pool += [self.create_item(level_up_item_pool.pop())] + + # Fill any empty locations with filler items. + while len(item_pool) < total_locations: + item_pool.append(self.create_item(self.get_filler_item_name())) + + self.multiworld.itempool += item_pool + + def place_predetermined_items(self) -> None: + goal_dict = { + "sephiroth": "Olympus Coliseum Defeat Sephiroth Ansem's Report 12", + "unknown": "Hollow Bastion Defeat Unknown Ansem's Report 13", + "postcards": "Traverse Town Mail Postcard 10 Event", + "final_ansem": "Final Ansem", + "puppies": "Traverse Town Piano Room Return 99 Puppies Reward 2", + "final_rest": "End of the World Final Rest Chest" + } + self.get_location(goal_dict[self.options.goal.current_key]).place_locked_item(self.create_item("Victory")) + if self.options.vanilla_emblem_pieces: + self.get_location("Hollow Bastion Entrance Hall Emblem Piece (Flame)").place_locked_item(self.create_item("Emblem Piece (Flame)")) + self.get_location("Hollow Bastion Entrance Hall Emblem Piece (Statue)").place_locked_item(self.create_item("Emblem Piece (Statue)")) + self.get_location("Hollow Bastion Entrance Hall Emblem Piece (Fountain)").place_locked_item(self.create_item("Emblem Piece (Fountain)")) + self.get_location("Hollow Bastion Entrance Hall Emblem Piece (Chest)").place_locked_item(self.create_item("Emblem Piece (Chest)")) + + def get_filler_item_name(self) -> str: + weights = [data.weight for data in self.fillers.values()] + return self.random.choices([filler for filler in self.fillers.keys()], weights)[0] + + def fill_slot_data(self) -> dict: + slot_data = {"xpmult": int(self.options.exp_multiplier)/16, + "required_reports_eotw": self.determine_reports_required_to_open_end_of_the_world(), + "required_reports_door": self.determine_reports_required_to_open_final_rest_door(), + "door": self.options.final_rest_door.current_key, + "seed": self.multiworld.seed_name, + "advanced_logic": bool(self.options.advanced_logic), + "hundred_acre_wood": bool(self.options.hundred_acre_wood), + "atlantica": bool(self.options.atlantica), + "goal": str(self.options.goal.current_key)} + if self.options.randomize_keyblade_stats: + min_str_bonus = min(self.options.keyblade_min_str.value, self.options.keyblade_max_str.value) + max_str_bonus = max(self.options.keyblade_min_str.value, self.options.keyblade_max_str.value) + self.options.keyblade_min_str.value = min_str_bonus + self.options.keyblade_max_str.value = max_str_bonus + min_mp_bonus = min(self.options.keyblade_min_mp.value, self.options.keyblade_max_mp.value) + max_mp_bonus = max(self.options.keyblade_min_mp.value, self.options.keyblade_max_mp.value) + self.options.keyblade_min_mp.value = min_mp_bonus + self.options.keyblade_max_mp.value = max_mp_bonus + slot_data["keyblade_stats"] = "" + for i in range(22): + if i < 4 and self.options.bad_starting_weapons: + slot_data["keyblade_stats"] = slot_data["keyblade_stats"] + "1,0," + else: + str_bonus = int(self.random.randint(min_str_bonus, max_str_bonus)) + mp_bonus = int(self.random.randint(min_mp_bonus, max_mp_bonus)) + slot_data["keyblade_stats"] = slot_data["keyblade_stats"] + str(str_bonus) + "," + str(mp_bonus) + "," + slot_data["keyblade_stats"] = slot_data["keyblade_stats"][:-1] + if self.options.donald_death_link: + slot_data["donalddl"] = "" + if self.options.goofy_death_link: + slot_data["goofydl"] = "" + if self.options.keyblades_unlock_chests: + slot_data["chestslocked"] = "" + else: + slot_data["chestsunlocked"] = "" + if self.options.interact_in_battle: + slot_data["interactinbattle"] = "" + return slot_data + + def create_item(self, name: str) -> KH1Item: + data = item_table[name] + return KH1Item(name, data.classification, data.code, self.player) + + def create_event(self, name: str) -> KH1Item: + data = event_item_table[name] + return KH1Item(name, data.classification, data.code, self.player) + + def set_rules(self): + set_rules(self) + + def create_regions(self): + create_regions(self.multiworld, self.player, self.options) + + def generate_early(self): + value_names = ["Reports to Open End of the World", "Reports to Open Final Rest Door", "Reports in Pool"] + initial_report_settings = [self.options.required_reports_eotw.value, self.options.required_reports_door.value, self.options.reports_in_pool.value] + self.change_numbers_of_reports_to_consider() + new_report_settings = [self.options.required_reports_eotw.value, self.options.required_reports_door.value, self.options.reports_in_pool.value] + for i in range(3): + if initial_report_settings[i] != new_report_settings[i]: + logging.info(f"{self.player_name}'s value {initial_report_settings[i]} for \"{value_names[i]}\" was invalid\n" + f"Setting \"{value_names[i]}\" value to {new_report_settings[i]}") + + def change_numbers_of_reports_to_consider(self) -> None: + if self.options.end_of_the_world_unlock == "reports" and self.options.final_rest_door == "reports": + self.options.required_reports_eotw.value, self.options.required_reports_door.value, self.options.reports_in_pool.value = sorted( + [self.options.required_reports_eotw.value, self.options.required_reports_door.value, self.options.reports_in_pool.value]) + + elif self.options.end_of_the_world_unlock == "reports": + self.options.required_reports_eotw.value, self.options.reports_in_pool.value = sorted( + [self.options.required_reports_eotw.value, self.options.reports_in_pool.value]) + + elif self.options.final_rest_door == "reports": + self.options.required_reports_door.value, self.options.reports_in_pool.value = sorted( + [self.options.required_reports_door.value, self.options.reports_in_pool.value]) + + def determine_reports_in_pool(self) -> int: + if self.options.end_of_the_world_unlock == "reports" or self.options.final_rest_door == "reports": + return self.options.reports_in_pool.value + return 0 + + def determine_reports_required_to_open_end_of_the_world(self) -> int: + if self.options.end_of_the_world_unlock == "reports": + return self.options.required_reports_eotw.value + return 14 + + def determine_reports_required_to_open_final_rest_door(self) -> int: + if self.options.final_rest_door == "reports": + return self.options.required_reports_door.value + return 14 diff --git a/worlds/kh1/docs/en_Kingdom Hearts.md b/worlds/kh1/docs/en_Kingdom Hearts.md new file mode 100644 index 000000000000..5167505efbbd --- /dev/null +++ b/worlds/kh1/docs/en_Kingdom Hearts.md @@ -0,0 +1,88 @@ +# Kingdom Hearts (PC) + +## Where is the options page? + +The [player options page for this game](../player-options) contains most of the options you need to +configure and export a config file. + +## What does randomization do to this game? + +The Kingdom Hearts AP Randomizer randomizes most rewards in the game and adds several items which are used to unlock worlds, Olympus Coliseum cups, and world progression. + +Worlds can only be accessed by finding the corresponding item. For example, you need to find the `Monstro` item to enter Monstro. + +The default goal is to enter End of the World and defeat Final Ansem. + +## What items and locations get shuffled? + +### Items + +Any weapon, accessory, spell, trinity, summon, world, key item, stat up, consumable, or ability can be found in any location. + +### Locations + +Locations the player can find items include chests, event rewards, Atlantica clams, level up rewards, 101 Dalmatian rewards, and postcard rewards. + +## Which items can be in another player's world? + +Any of the items which can be shuffled may also be placed into another player's world. It is possible to choose to limit +certain items to your own world. +## When the player receives an item, what happens? + +When the player receives an item, your client will display a message displaying the item you have obtained. You will also see a notification in the "LEVEL UP" box. + +## What do I do if I encounter a bug with the game? + +Please reach out to Gicu#7034 on Discord. + +## How do I progress in a certain world? + +### The evidence boxes aren't spawning in Wonderland. + +Find `Footprints` in the multiworld. + +### I can't enter any cups in Olympus Coliseum. + +Firstly, find `Entry Pass` in the multiworld. Additionally, `Phil Cup`, `Pegasus Cup`, and `Hercules Cup` are all multiworld items. Finding all 3 grant you access to the Hades Cup and the Platinum Match. Clearing all cups lets you challenge Ice Titan. + +### The slides aren't spawning in Deep Jungle. + +Find `Slides` in the multiworld. + +### I can't progress in Atlantica. +Find `Crystal Trident` in the multiworld. + +### I can't progress in Halloween Town. + +Find `Forget-Me-Not` and `Jack-in-the-Box` in the multiworld. + +### The Hollow Bastion Library is missing a book. + +Find `Theon Vol. 6` in the multiworld. + +## How do I enter the End of the World? + +You can enter End of the World by obtaining a number of Ansem's Reports or by finding `End of the World` in the multiworld, depending on your options. + +## Credits +This is a collaborative effort from several individuals in the Kingdom Hearts community, but most of all, denhonator. + +Denho's original KH rando laid the foundation for the work here and makes everything here possible, so thank you Denho for such a blast of a randomizer. + +Other credits include: + +Sonicshadowsilver2 for their work finding many memory addresses, working to identify and resolve bugs, and converting the code base to the latest EGS update. + +Shananas and the rest of the OpenKH team for providing such an amazing tool for us to utilize on this project. + +TopazTK for their work on the `Show Prompt` method and Krujo for their implementation of the method in AP. + +JaredWeakStrike for helping clean up my mess of code. + +KSX for their `Interact in Battle` code. + +RavSpect for their title screen image edit. + +SunCatMC for their work on ChecksFinder, which I used as a basis for game-to-client communication. + +ThePhar for their work on Rogue Legacy AP, which I used as a basis for the apworld creation. diff --git a/worlds/kh1/docs/kh1_en.md b/worlds/kh1/docs/kh1_en.md new file mode 100644 index 000000000000..522da20b0dc9 --- /dev/null +++ b/worlds/kh1/docs/kh1_en.md @@ -0,0 +1,54 @@ +# Kingdom Hearts Randomizer Setup Guide + +## Setting up the required mods + +BEFORE MODDING, PLEASE INSTALL AND RUN KH1 AT LEAST ONCE. + +1. Install OpenKH and the LUA Backend + + Download the [latest release of OpenKH](https://github.com/OpenKH/OpenKh/releases/tag/latest) + + Extract the files to a directory of your choosing. + + Open `OpenKh.Tools.ModsManager.exe` and run first time set up + + When prompted for game edition, choose `PC Release`, select which platform you're using (EGS or Steam), navigate to your `Kingdom Hearts I.5 + II.5` installation folder in the path box and click `Next` + + When prompted, install Panacea, then click `Next` + + When prompted, check KH1 plus any other AP game you play and click `Install and configure LUA backend`, then click `Next` + + Extracting game data for KH1 is unnecessary, but you may want to extract data for KH2 if you plan on playing KH2 AP + + Click `Finish` + +2. Open `OpenKh.Tools.ModsManager.exe` + +3. Click the drop-down menu at the top-right and choose `Kingdom Hearts 1` + +4. Click `Mods>Install a New Mod` + +5. In `Add a new mod from GitHub` paste `gaithern/KH-1FM-AP-LUA` + +6. Click `Install` + +7. Navigate to Mod Loader and click `Build and Run` + + +## Configuring your YAML file + +### What is a YAML file and why do I need one? + +Your YAML file contains a set of configuration options which provide the generator with information about how it should +generate your game. Each player of a multiworld will provide their own YAML file. This setup allows each player to enjoy +an experience customized for their taste, and different players in the same multiworld can all have different options. + +### Where do I get a YAML file? + +you can customize your settings by visiting the [Kingdom Hearts Options Page](/games/Kingdom%20Hearts/player-options). + +## Connect to the MultiWorld + +For first-time players, it is recommended to open your KH1 Client first before opening the game. + +On the title screen, open your KH1 Client and connect to your multiworld. diff --git a/worlds/kh1/test/__init__.py b/worlds/kh1/test/__init__.py new file mode 100644 index 000000000000..960b527f8b8a --- /dev/null +++ b/worlds/kh1/test/__init__.py @@ -0,0 +1,5 @@ +from test.bases import WorldTestBase + + +class KH1TestBase(WorldTestBase): + game = "Kingdom Hearts" diff --git a/worlds/kh1/test/test_goal.py b/worlds/kh1/test/test_goal.py new file mode 100644 index 000000000000..6b501404feee --- /dev/null +++ b/worlds/kh1/test/test_goal.py @@ -0,0 +1,33 @@ +from . import KH1TestBase + +class TestDefault(KH1TestBase): + options = {} + +class TestSephiroth(KH1TestBase): + options = { + "Goal": 0, + } + +class TestUnknown(KH1TestBase): + options = { + "Goal": 1, + } + +class TestPostcards(KH1TestBase): + options = { + "Goal": 2, + } + +class TestFinalAnsem(KH1TestBase): + options = { + "Goal": 3, + } + +class TestPuppies(KH1TestBase): + options = { + "Goal": 4, + } +class TestFinalRest(KH1TestBase): + options = { + "Goal": 5, + } From 9277cb39efcca4e53ecca75c96436bd19eb0993a Mon Sep 17 00:00:00 2001 From: Mysteryem Date: Mon, 19 Aug 2024 05:44:06 +0100 Subject: [PATCH 08/60] Core: Fix incorrect default state checked in MultiWorld.can_beat_game (#3813) `MultiWorld.can_beat_game()` with no arguments would initially check if `self.state` is beatable, but then would create an empty state, `state = CollectionState(self)`, to sweep spheres from to determine if the game is beatable. The issue was that `self.state` and the new empty state could be different. Currently, it seems that everywhere in Archipelago's codebase that calls `MultiWorld.can_beat_game()` with no arguments or `starting_state=None` has a `self.state` that only contains precollected items, so the new empty state happens to result in an equivalent state, but this should not be relied upon to always be the case. This patch changes `can_beat_game()` to initially check if the new empty state is beatable instead of `self.state`. This appears to be a bug introduced way back in 27b6dd8bd761 Fixes #3742 --- BaseClasses.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 68b410010e9d..1188e72261f6 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -541,9 +541,9 @@ def can_beat_game(self, starting_state: Optional[CollectionState] = None) -> boo return True state = starting_state.copy() else: - if self.has_beaten_game(self.state): - return True state = CollectionState(self) + if self.has_beaten_game(state): + return True prog_locations = {location for location in self.get_locations() if location.item and location.item.advancement and location not in state.locations_checked} From 182f7e24e5e460a28a51c04e9e57e2df9964841c Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Mon, 19 Aug 2024 07:49:06 +0200 Subject: [PATCH 09/60] The Witness: Fix Tunnels Theater Flower EP Access Logic + Add Unit Test for it (and Expert PP2) (#3807) * Tunnels Theater Flowers fix + Flowers&PP2 Unit Tests * copypaste * Can just do it like this * This is even better probably * Also do some cleanup :3 * God damnit --- worlds/witness/rules.py | 50 ++++++--------- worlds/witness/test/test_weird_traversals.py | 66 ++++++++++++++++++++ 2 files changed, 84 insertions(+), 32 deletions(-) create mode 100644 worlds/witness/test/test_weird_traversals.py diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py index 12a9a1ed4b59..fc4e638e36c3 100644 --- a/worlds/witness/rules.py +++ b/worlds/witness/rules.py @@ -74,10 +74,10 @@ def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: """ player = world.player - player_regions = world.player_regions + two_way_entrance_register = world.player_regions.two_way_entrance_register front_access = ( - any(e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep 2nd Pressure Plate", "Keep"]) + any(e.can_reach(state) for e in two_way_entrance_register["Keep 2nd Pressure Plate", "Keep"]) and state.can_reach_region("Keep", player) ) @@ -88,7 +88,7 @@ def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: # Front access works. Now, we need to check for the many ways to access PP2 from the back. # All of those ways lead through the PP3 exit door from PP4. So we check this first. - fourth_to_third = any(e.can_reach(state) for e in player_regions.two_way_entrance_register[ + fourth_to_third = any(e.can_reach(state) for e in two_way_entrance_register[ "Keep 3rd Pressure Plate", "Keep 4th Pressure Plate" ]) @@ -100,7 +100,7 @@ def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: # The shadows shortcut is the simplest way. shadows_shortcut = ( - any(e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep 4th Pressure Plate", "Shadows"]) + any(e.can_reach(state) for e in two_way_entrance_register["Keep 4th Pressure Plate", "Shadows"]) ) if shadows_shortcut: @@ -108,9 +108,7 @@ def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: # We don't have the Shadows shortcut. This means we need to come in through the PP4 exit door instead. - tower_to_pp4 = any( - e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep 4th Pressure Plate", "Keep Tower"] - ) + tower_to_pp4 = any(e.can_reach(state) for e in two_way_entrance_register["Keep 4th Pressure Plate", "Keep Tower"]) # If we don't have the PP4 exit door, we've run out of options. if not tower_to_pp4: @@ -119,7 +117,7 @@ def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: # We have the PP4 exit door. If we can get to Keep Tower from behind, we can do PP2. # The simplest way would be the Tower Shortcut. - tower_shortcut = any(e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep", "Keep Tower"]) + tower_shortcut = any(e.can_reach(state) for e in two_way_entrance_register["Keep", "Keep Tower"]) if tower_shortcut: return True @@ -128,18 +126,14 @@ def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: # Getting to Keep Tower through the hedge mazes. This can be done in a multitude of ways. # No matter what, though, we would need Hedge Maze 4 Exit to Keep Tower. - tower_access_from_hedges = any( - e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep 4th Maze", "Keep Tower"] - ) + tower_access_from_hedges = any(e.can_reach(state) for e in two_way_entrance_register["Keep 4th Maze", "Keep Tower"]) if not tower_access_from_hedges: return False # We can reach Keep Tower from Hedge Maze 4. If we now have the Hedge 4 Shortcut, we are immediately good. - hedge_4_shortcut = any( - e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep 4th Maze", "Keep"] - ) + hedge_4_shortcut = any(e.can_reach(state) for e in two_way_entrance_register["Keep 4th Maze", "Keep"]) # If we have the hedge 4 shortcut, that works. if hedge_4_shortcut: @@ -147,27 +141,21 @@ def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: # We don't have the hedge 4 shortcut. This means we would now need to come through Hedge Maze 3. - hedge_3_to_4 = any( - e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep 4th Maze", "Keep 3rd Maze"] - ) + hedge_3_to_4 = any(e.can_reach(state) for e in two_way_entrance_register["Keep 4th Maze", "Keep 3rd Maze"]) if not hedge_3_to_4: return False # We can get to Hedge 4 from Hedge 3. If we have the Hedge 3 Shortcut, we're good. - hedge_3_shortcut = any( - e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep 3rd Maze", "Keep"] - ) + hedge_3_shortcut = any(e.can_reach(state) for e in two_way_entrance_register["Keep 3rd Maze", "Keep"]) if hedge_3_shortcut: return True # We don't have Hedge 3 Shortcut. This means we would now need to come through Hedge Maze 2. - hedge_2_to_3 = any( - e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep 3rd Maze", "Keep 2nd Maze"] - ) + hedge_2_to_3 = any(e.can_reach(state) for e in two_way_entrance_register["Keep 3rd Maze", "Keep 2nd Maze"]) if not hedge_2_to_3: return False @@ -175,9 +163,7 @@ def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: # We can get to Hedge 3 from Hedge 2. If we can get from Keep to Hedge 2, we're good. # This covers both Hedge 1 Exit and Hedge 2 Shortcut, because Hedge 1 is just part of the Keep region. - return any( - e.can_reach(state) for e in player_regions.two_way_entrance_register["Keep 2nd Maze", "Keep"] - ) + return any(e.can_reach(state) for e in two_way_entrance_register["Keep 2nd Maze", "Keep"]) def _can_do_theater_to_tunnels(state: CollectionState, world: "WitnessWorld") -> bool: @@ -189,11 +175,11 @@ def _can_do_theater_to_tunnels(state: CollectionState, world: "WitnessWorld") -> # Checking for access to Theater is not necessary, as solvability of Tutorial Video is checked in the other half # of the Theater Flowers EP condition. - player_regions = world.player_regions + two_way_entrance_register = world.player_regions.two_way_entrance_register direct_access = ( - any(e.can_reach(state) for e in player_regions.two_way_entrance_register["Tunnels", "Windmill Interior"]) - and any(e.can_reach(state) for e in player_regions.two_way_entrance_register["Theater", "Windmill Interior"]) + any(e.can_reach(state) for e in two_way_entrance_register["Tunnels", "Windmill Interior"]) + and any(e.can_reach(state) for e in two_way_entrance_register["Theater", "Windmill Interior"]) ) if direct_access: @@ -210,9 +196,9 @@ def _can_do_theater_to_tunnels(state: CollectionState, world: "WitnessWorld") -> # We also need a way from Town to Tunnels. return ( - any(e.can_reach(state) for e in player_regions.two_way_entrance_register["Tunnels", "Windmill Interior"]) - and any(e.can_reach(state) for e in player_regions.two_way_entrance_register["Town", "Windmill Interior"]) - or any(e.can_reach(state) for e in player_regions.two_way_entrance_register["Tunnels", "Town"]) + any(e.can_reach(state) for e in two_way_entrance_register["Tunnels", "Windmill Interior"]) + and any(e.can_reach(state) for e in two_way_entrance_register["Outside Windmill", "Windmill Interior"]) + or any(e.can_reach(state) for e in two_way_entrance_register["Tunnels", "Town"]) ) diff --git a/worlds/witness/test/test_weird_traversals.py b/worlds/witness/test/test_weird_traversals.py new file mode 100644 index 000000000000..47b69b01fb4a --- /dev/null +++ b/worlds/witness/test/test_weird_traversals.py @@ -0,0 +1,66 @@ +from ..test import WitnessTestBase + + +class TestWeirdTraversalRequirements(WitnessTestBase): + options = { + "shuffle_vault_boxes": True, + "shuffle_symbols": False, + "shuffle_EPs": "individual", + "EP_difficulty": "tedious", + "shuffle_doors": "doors", + "door_groupings": "off", + "puzzle_randomization": "sigma_expert", + } + + def test_weird_traversal_requirements(self) -> None: + """ + Test that Tunnels Theater Flowers EP and Expert PP2 consider all valid paths logically. + """ + + with self.subTest("Tunnels Theater Flowers EP"): + self.assertAccessDependency( + ["Tunnels Theater Flowers EP"], + [ + ["Theater Exit Left (Door)", "Windmill Entry (Door)", "Tunnels Theater Shortcut (Door)"], + ["Theater Exit Right (Door)", "Windmill Entry (Door)", "Tunnels Theater Shortcut (Door)"], + ["Theater Exit Left (Door)", "Tunnels Town Shortcut (Door)"], + ["Theater Exit Right (Door)", "Tunnels Town Shortcut (Door)"], + ["Theater Entry (Door)", "Tunnels Theater Shortcut (Door)"], + ["Theater Entry (Door)", "Windmill Entry (Door)", "Tunnels Town Shortcut (Door)"], + ], + only_check_listed=True, + ) + + with self.subTest("Expert Keep Pressure Plates 2"): + # Always necessary + self.assertAccessDependency( + ["Keep Pressure Plates 2"], + [["Keep Pressure Plates 1 Exit (Door)"]], + only_check_listed=True, + ) + + # Always necessary + self.assertAccessDependency( + ["Keep Pressure Plates 2"], + [["Keep Pressure Plates 3 Exit (Door)"]], + only_check_listed=True, + ) + + # All the possible "Exit methods" from PP3 + self.assertAccessDependency( + ["Keep Pressure Plates 2"], + [ + ["Keep Shadows Shortcut (Door)"], + ["Keep Pressure Plates 4 Exit (Door)", "Keep Tower Shortcut (Door)"], + ["Keep Pressure Plates 4 Exit (Door)", "Keep Hedge Maze 4 Exit (Door)", + "Keep Hedge Maze 4 Shortcut (Door)"], + ["Keep Pressure Plates 4 Exit (Door)", "Keep Hedge Maze 4 Exit (Door)", + "Keep Hedge Maze 3 Exit (Door)", "Keep Hedge Maze 3 Shortcut (Door)"], + ["Keep Pressure Plates 4 Exit (Door)", "Keep Hedge Maze 4 Exit (Door)", + "Keep Hedge Maze 3 Exit (Door)", "Keep Hedge Maze 2 Exit (Door)", + "Keep Hedge Maze 2 Shortcut (Door)"], + ["Keep Pressure Plates 4 Exit (Door)", "Keep Hedge Maze 4 Exit (Door)", + "Keep Hedge Maze 3 Exit (Door)", "Keep Hedge Maze 2 Exit (Door)", "Keep Hedge Maze 1 Exit (Door)"], + ], + only_check_listed=True, + ) From 1e8a8e7482d4412f13a98121d208399fb48da3e1 Mon Sep 17 00:00:00 2001 From: Doug Hoskisson Date: Mon, 19 Aug 2024 11:37:36 -0700 Subject: [PATCH 10/60] Docs: `NetworkItem.player` (#3811) * Docs: `NetworkItem.player` In many contexts, it's difficult to tell whether this is the sending player or the receiving player. * correct player info * Update NetUtils.py Co-authored-by: Aaron Wagener --------- Co-authored-by: Aaron Wagener --- NetUtils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/NetUtils.py b/NetUtils.py index f79773728cd6..c451fa3f8460 100644 --- a/NetUtils.py +++ b/NetUtils.py @@ -79,6 +79,7 @@ class NetworkItem(typing.NamedTuple): item: int location: int player: int + """ Sending player, except in LocationInfo (from LocationScouts), where it is the receiving player. """ flags: int = 0 From c010c8c938921da9d58c0522d40f09f4c72ee223 Mon Sep 17 00:00:00 2001 From: KonoTyran Date: Mon, 19 Aug 2024 15:58:30 -0700 Subject: [PATCH 11/60] Minecraft: Update to new options system. (#3765) * Move to new options system. switch to using self.random reformat rules file. * further reformats * fix tests to use new options system. * fix slot data to not use self.multiworld * I hate python * new starting_items docstring to prepare for 1.20.5+ item components. fix invalid json being output to starting_items * more typing fixes. * stupid quotes around type declarations * removed unused variable in ItemPool.py change null check in Structures.py * update rules "self" variable to a "world: MinecraftWorld" variable * get key, and not value for required bosses. --- worlds/minecraft/ItemPool.py | 37 +- worlds/minecraft/Options.py | 59 ++- worlds/minecraft/Rules.py | 663 +++++++++++++++++---------- worlds/minecraft/Structures.py | 28 +- worlds/minecraft/__init__.py | 38 +- worlds/minecraft/test/TestOptions.py | 12 +- worlds/minecraft/test/__init__.py | 4 +- 7 files changed, 525 insertions(+), 316 deletions(-) diff --git a/worlds/minecraft/ItemPool.py b/worlds/minecraft/ItemPool.py index 78eeffca80f5..19bb70ed6402 100644 --- a/worlds/minecraft/ItemPool.py +++ b/worlds/minecraft/ItemPool.py @@ -1,10 +1,14 @@ from math import ceil from typing import List -from BaseClasses import MultiWorld, Item -from worlds.AutoWorld import World +from BaseClasses import Item from . import Constants +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from . import MinecraftWorld + def get_junk_item_names(rand, k: int) -> str: junk_weights = Constants.item_info["junk_weights"] @@ -14,39 +18,38 @@ def get_junk_item_names(rand, k: int) -> str: k=k) return junk -def build_item_pool(mc_world: World) -> List[Item]: - multiworld = mc_world.multiworld - player = mc_world.player +def build_item_pool(world: "MinecraftWorld") -> List[Item]: + multiworld = world.multiworld + player = world.player itempool = [] total_location_count = len(multiworld.get_unfilled_locations(player)) required_pool = Constants.item_info["required_pool"] - junk_weights = Constants.item_info["junk_weights"] # Add required progression items for item_name, num in required_pool.items(): - itempool += [mc_world.create_item(item_name) for _ in range(num)] + itempool += [world.create_item(item_name) for _ in range(num)] # Add structure compasses - if multiworld.structure_compasses[player]: - compasses = [name for name in mc_world.item_name_to_id if "Structure Compass" in name] + if world.options.structure_compasses: + compasses = [name for name in world.item_name_to_id if "Structure Compass" in name] for item_name in compasses: - itempool.append(mc_world.create_item(item_name)) + itempool.append(world.create_item(item_name)) # Dragon egg shards - if multiworld.egg_shards_required[player] > 0: - num = multiworld.egg_shards_available[player] - itempool += [mc_world.create_item("Dragon Egg Shard") for _ in range(num)] + if world.options.egg_shards_required > 0: + num = world.options.egg_shards_available + itempool += [world.create_item("Dragon Egg Shard") for _ in range(num)] # Bee traps - bee_trap_percentage = multiworld.bee_traps[player] * 0.01 + bee_trap_percentage = world.options.bee_traps * 0.01 if bee_trap_percentage > 0: bee_trap_qty = ceil(bee_trap_percentage * (total_location_count - len(itempool))) - itempool += [mc_world.create_item("Bee Trap") for _ in range(bee_trap_qty)] + itempool += [world.create_item("Bee Trap") for _ in range(bee_trap_qty)] # Fill remaining itempool with randomly generated junk - junk = get_junk_item_names(multiworld.random, total_location_count - len(itempool)) - itempool += [mc_world.create_item(name) for name in junk] + junk = get_junk_item_names(world.random, total_location_count - len(itempool)) + itempool += [world.create_item(name) for name in junk] return itempool diff --git a/worlds/minecraft/Options.py b/worlds/minecraft/Options.py index 9407097b4638..7d1377233e4c 100644 --- a/worlds/minecraft/Options.py +++ b/worlds/minecraft/Options.py @@ -1,6 +1,7 @@ -import typing -from Options import Choice, Option, Toggle, DefaultOnToggle, Range, OptionList, DeathLink, PlandoConnections +from Options import Choice, Toggle, DefaultOnToggle, Range, OptionList, DeathLink, PlandoConnections, \ + PerGameCommonOptions from .Constants import region_info +from dataclasses import dataclass class AdvancementGoal(Range): @@ -55,7 +56,7 @@ class StructureCompasses(DefaultOnToggle): display_name = "Structure Compasses" -class BeeTraps(Range): +class BeeTraps(Range): """Replaces a percentage of junk items with bee traps, which spawn multiple angered bees around every player when received.""" display_name = "Bee Trap Percentage" @@ -94,7 +95,20 @@ class SendDefeatedMobs(Toggle): class StartingItems(OptionList): - """Start with these items. Each entry should be of this format: {item: "item_name", amount: #, nbt: "nbt_string"}""" + """Start with these items. Each entry should be of this format: {item: "item_name", amount: #} + `item` can include components, and should be in an identical format to a `/give` command with + `"` escaped for json reasons. + + `amount` is optional and will default to 1 if omitted. + + example: + ``` + starting_items: [ + { "item": "minecraft:stick[minecraft:custom_name=\"{'text':'pointy stick'}\"]" }, + { "item": "minecraft:arrow[minecraft:rarity=epic]", amount: 64 } + ] + ``` + """ display_name = "Starting Items" @@ -109,22 +123,21 @@ def can_connect(cls, entrance, exit): return True -minecraft_options: typing.Dict[str, type(Option)] = { - "plando_connections": MCPlandoConnections, - "advancement_goal": AdvancementGoal, - "egg_shards_required": EggShardsRequired, - "egg_shards_available": EggShardsAvailable, - "required_bosses": BossGoal, - - "shuffle_structures": ShuffleStructures, - "structure_compasses": StructureCompasses, - - "combat_difficulty": CombatDifficulty, - "include_hard_advancements": HardAdvancements, - "include_unreasonable_advancements": UnreasonableAdvancements, - "include_postgame_advancements": PostgameAdvancements, - "bee_traps": BeeTraps, - "send_defeated_mobs": SendDefeatedMobs, - "death_link": DeathLink, - "starting_items": StartingItems, -} +@dataclass +class MinecraftOptions(PerGameCommonOptions): + plando_connections: MCPlandoConnections + advancement_goal: AdvancementGoal + egg_shards_required: EggShardsRequired + egg_shards_available: EggShardsAvailable + required_bosses: BossGoal + shuffle_structures: ShuffleStructures + structure_compasses: StructureCompasses + + combat_difficulty: CombatDifficulty + include_hard_advancements: HardAdvancements + include_unreasonable_advancements: UnreasonableAdvancements + include_postgame_advancements: PostgameAdvancements + bee_traps: BeeTraps + send_defeated_mobs: SendDefeatedMobs + death_link: DeathLink + starting_items: StartingItems diff --git a/worlds/minecraft/Rules.py b/worlds/minecraft/Rules.py index dae4241b992c..9a7be09a4a84 100644 --- a/worlds/minecraft/Rules.py +++ b/worlds/minecraft/Rules.py @@ -1,276 +1,471 @@ -import typing -from collections.abc import Callable - from BaseClasses import CollectionState from worlds.generic.Rules import exclusion_rules -from worlds.AutoWorld import World from . import Constants +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from . import MinecraftWorld + # Helper functions # moved from logicmixin -def has_iron_ingots(state: CollectionState, player: int) -> bool: +def has_iron_ingots(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: return state.has('Progressive Tools', player) and state.has('Progressive Resource Crafting', player) -def has_copper_ingots(state: CollectionState, player: int) -> bool: + +def has_copper_ingots(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: return state.has('Progressive Tools', player) and state.has('Progressive Resource Crafting', player) -def has_gold_ingots(state: CollectionState, player: int) -> bool: - return state.has('Progressive Resource Crafting', player) and (state.has('Progressive Tools', player, 2) or state.can_reach('The Nether', 'Region', player)) -def has_diamond_pickaxe(state: CollectionState, player: int) -> bool: - return state.has('Progressive Tools', player, 3) and has_iron_ingots(state, player) +def has_gold_ingots(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + return (state.has('Progressive Resource Crafting', player) + and ( + state.has('Progressive Tools', player, 2) + or state.can_reach_region('The Nether', player) + ) + ) + -def craft_crossbow(state: CollectionState, player: int) -> bool: - return state.has('Archery', player) and has_iron_ingots(state, player) +def has_diamond_pickaxe(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + return state.has('Progressive Tools', player, 3) and has_iron_ingots(world, state, player) -def has_bottle(state: CollectionState, player: int) -> bool: + +def craft_crossbow(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + return state.has('Archery', player) and has_iron_ingots(world, state, player) + + +def has_bottle(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: return state.has('Bottles', player) and state.has('Progressive Resource Crafting', player) -def has_spyglass(state: CollectionState, player: int) -> bool: - return has_copper_ingots(state, player) and state.has('Spyglass', player) and can_adventure(state, player) -def can_enchant(state: CollectionState, player: int) -> bool: - return state.has('Enchanting', player) and has_diamond_pickaxe(state, player) # mine obsidian and lapis +def has_spyglass(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + return (has_copper_ingots(world, state, player) + and state.has('Spyglass', player) + and can_adventure(world, state, player) + ) + + +def can_enchant(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + return state.has('Enchanting', player) and has_diamond_pickaxe(world, state, player) # mine obsidian and lapis -def can_use_anvil(state: CollectionState, player: int) -> bool: - return state.has('Enchanting', player) and state.has('Progressive Resource Crafting', player, 2) and has_iron_ingots(state, player) -def fortress_loot(state: CollectionState, player: int) -> bool: # saddles, blaze rods, wither skulls - return state.can_reach('Nether Fortress', 'Region', player) and basic_combat(state, player) +def can_use_anvil(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + return (state.has('Enchanting', player) + and state.has('Progressive Resource Crafting', player,2) + and has_iron_ingots(world, state, player) + ) -def can_brew_potions(state: CollectionState, player: int) -> bool: - return state.has('Blaze Rods', player) and state.has('Brewing', player) and has_bottle(state, player) -def can_piglin_trade(state: CollectionState, player: int) -> bool: - return has_gold_ingots(state, player) and ( - state.can_reach('The Nether', 'Region', player) or - state.can_reach('Bastion Remnant', 'Region', player)) +def fortress_loot(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: # saddles, blaze rods, wither skulls + return state.can_reach_region('Nether Fortress', player) and basic_combat(world, state, player) -def overworld_villager(state: CollectionState, player: int) -> bool: + +def can_brew_potions(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + return state.has('Blaze Rods', player) and state.has('Brewing', player) and has_bottle(world, state, player) + + +def can_piglin_trade(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + return (has_gold_ingots(world, state, player) + and ( + state.can_reach_region('The Nether', player) + or state.can_reach_region('Bastion Remnant', player) + )) + + +def overworld_villager(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: village_region = state.multiworld.get_region('Village', player).entrances[0].parent_region.name - if village_region == 'The Nether': # 2 options: cure zombie villager or build portal in village - return (state.can_reach('Zombie Doctor', 'Location', player) or - (has_diamond_pickaxe(state, player) and state.can_reach('Village', 'Region', player))) + if village_region == 'The Nether': # 2 options: cure zombie villager or build portal in village + return (state.can_reach_location('Zombie Doctor', player) + or ( + has_diamond_pickaxe(world, state, player) + and state.can_reach_region('Village', player) + )) elif village_region == 'The End': - return state.can_reach('Zombie Doctor', 'Location', player) - return state.can_reach('Village', 'Region', player) + return state.can_reach_location('Zombie Doctor', player) + return state.can_reach_region('Village', player) -def enter_stronghold(state: CollectionState, player: int) -> bool: + +def enter_stronghold(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: return state.has('Blaze Rods', player) and state.has('Brewing', player) and state.has('3 Ender Pearls', player) + # Difficulty-dependent functions -def combat_difficulty(state: CollectionState, player: int) -> bool: - return state.multiworld.combat_difficulty[player].current_key - -def can_adventure(state: CollectionState, player: int) -> bool: - death_link_check = not state.multiworld.death_link[player] or state.has('Bed', player) - if combat_difficulty(state, player) == 'easy': - return state.has('Progressive Weapons', player, 2) and has_iron_ingots(state, player) and death_link_check - elif combat_difficulty(state, player) == 'hard': +def combat_difficulty(world: "MinecraftWorld", state: CollectionState, player: int) -> str: + return world.options.combat_difficulty.current_key + + +def can_adventure(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + death_link_check = not world.options.death_link or state.has('Bed', player) + if combat_difficulty(world, state, player) == 'easy': + return state.has('Progressive Weapons', player, 2) and has_iron_ingots(world, state, player) and death_link_check + elif combat_difficulty(world, state, player) == 'hard': return True - return (state.has('Progressive Weapons', player) and death_link_check and - (state.has('Progressive Resource Crafting', player) or state.has('Campfire', player))) - -def basic_combat(state: CollectionState, player: int) -> bool: - if combat_difficulty(state, player) == 'easy': - return state.has('Progressive Weapons', player, 2) and state.has('Progressive Armor', player) and \ - state.has('Shield', player) and has_iron_ingots(state, player) - elif combat_difficulty(state, player) == 'hard': + return (state.has('Progressive Weapons', player) and death_link_check and + (state.has('Progressive Resource Crafting', player) or state.has('Campfire', player))) + + +def basic_combat(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + if combat_difficulty(world, state, player) == 'easy': + return (state.has('Progressive Weapons', player, 2) + and state.has('Progressive Armor', player) + and state.has('Shield', player) + and has_iron_ingots(world, state, player) + ) + elif combat_difficulty(world, state, player) == 'hard': return True - return state.has('Progressive Weapons', player) and (state.has('Progressive Armor', player) or state.has('Shield', player)) and has_iron_ingots(state, player) - -def complete_raid(state: CollectionState, player: int) -> bool: - reach_regions = state.can_reach('Village', 'Region', player) and state.can_reach('Pillager Outpost', 'Region', player) - if combat_difficulty(state, player) == 'easy': - return reach_regions and \ - state.has('Progressive Weapons', player, 3) and state.has('Progressive Armor', player, 2) and \ - state.has('Shield', player) and state.has('Archery', player) and \ - state.has('Progressive Tools', player, 2) and has_iron_ingots(state, player) - elif combat_difficulty(state, player) == 'hard': # might be too hard? - return reach_regions and state.has('Progressive Weapons', player, 2) and has_iron_ingots(state, player) and \ - (state.has('Progressive Armor', player) or state.has('Shield', player)) - return reach_regions and state.has('Progressive Weapons', player, 2) and has_iron_ingots(state, player) and \ - state.has('Progressive Armor', player) and state.has('Shield', player) - -def can_kill_wither(state: CollectionState, player: int) -> bool: - normal_kill = state.has("Progressive Weapons", player, 3) and state.has("Progressive Armor", player, 2) and can_brew_potions(state, player) and can_enchant(state, player) - if combat_difficulty(state, player) == 'easy': - return fortress_loot(state, player) and normal_kill and state.has('Archery', player) - elif combat_difficulty(state, player) == 'hard': # cheese kill using bedrock ceilings - return fortress_loot(state, player) and (normal_kill or state.can_reach('The Nether', 'Region', player) or state.can_reach('The End', 'Region', player)) - return fortress_loot(state, player) and normal_kill - -def can_respawn_ender_dragon(state: CollectionState, player: int) -> bool: - return state.can_reach('The Nether', 'Region', player) and state.can_reach('The End', 'Region', player) and \ - state.has('Progressive Resource Crafting', player) # smelt sand into glass - -def can_kill_ender_dragon(state: CollectionState, player: int) -> bool: - if combat_difficulty(state, player) == 'easy': - return state.has("Progressive Weapons", player, 3) and state.has("Progressive Armor", player, 2) and \ - state.has('Archery', player) and can_brew_potions(state, player) and can_enchant(state, player) - if combat_difficulty(state, player) == 'hard': - return (state.has('Progressive Weapons', player, 2) and state.has('Progressive Armor', player)) or \ - (state.has('Progressive Weapons', player, 1) and state.has('Bed', player)) - return state.has('Progressive Weapons', player, 2) and state.has('Progressive Armor', player) and state.has('Archery', player) - -def has_structure_compass(state: CollectionState, entrance_name: str, player: int) -> bool: - if not state.multiworld.structure_compasses[player]: + return (state.has('Progressive Weapons', player) + and ( + state.has('Progressive Armor', player) + or state.has('Shield', player) + ) + and has_iron_ingots(world, state, player) + ) + + +def complete_raid(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + reach_regions = (state.can_reach_region('Village', player) + and state.can_reach_region('Pillager Outpost', player)) + if combat_difficulty(world, state, player) == 'easy': + return (reach_regions + and state.has('Progressive Weapons', player, 3) + and state.has('Progressive Armor', player, 2) + and state.has('Shield', player) + and state.has('Archery', player) + and state.has('Progressive Tools', player, 2) + and has_iron_ingots(world, state, player) + ) + elif combat_difficulty(world, state, player) == 'hard': # might be too hard? + return (reach_regions + and state.has('Progressive Weapons', player, 2) + and has_iron_ingots(world, state, player) + and ( + state.has('Progressive Armor', player) + or state.has('Shield', player) + ) + ) + return (reach_regions + and state.has('Progressive Weapons', player, 2) + and has_iron_ingots(world, state, player) + and state.has('Progressive Armor', player) + and state.has('Shield', player) + ) + + +def can_kill_wither(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + normal_kill = (state.has("Progressive Weapons", player, 3) + and state.has("Progressive Armor", player, 2) + and can_brew_potions(world, state, player) + and can_enchant(world, state, player) + ) + if combat_difficulty(world, state, player) == 'easy': + return (fortress_loot(world, state, player) + and normal_kill + and state.has('Archery', player) + ) + elif combat_difficulty(world, state, player) == 'hard': # cheese kill using bedrock ceilings + return (fortress_loot(world, state, player) + and ( + normal_kill + or state.can_reach_region('The Nether', player) + or state.can_reach_region('The End', player) + ) + ) + + return fortress_loot(world, state, player) and normal_kill + + +def can_respawn_ender_dragon(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + return (state.can_reach_region('The Nether', player) + and state.can_reach_region('The End', player) + and state.has('Progressive Resource Crafting', player) # smelt sand into glass + ) + + +def can_kill_ender_dragon(world: "MinecraftWorld", state: CollectionState, player: int) -> bool: + if combat_difficulty(world, state, player) == 'easy': + return (state.has("Progressive Weapons", player, 3) + and state.has("Progressive Armor", player, 2) + and state.has('Archery', player) + and can_brew_potions(world, state, player) + and can_enchant(world, state, player) + ) + if combat_difficulty(world, state, player) == 'hard': + return ( + ( + state.has('Progressive Weapons', player, 2) + and state.has('Progressive Armor', player) + ) or ( + state.has('Progressive Weapons', player, 1) + and state.has('Bed', player) # who needs armor when you can respawn right outside the chamber + ) + ) + return (state.has('Progressive Weapons', player, 2) + and state.has('Progressive Armor', player) + and state.has('Archery', player) + ) + + +def has_structure_compass(world: "MinecraftWorld", state: CollectionState, entrance_name: str, player: int) -> bool: + if not world.options.structure_compasses: return True return state.has(f"Structure Compass ({state.multiworld.get_entrance(entrance_name, player).connected_region.name})", player) -def get_rules_lookup(player: int): - rules_lookup: typing.Dict[str, typing.List[Callable[[CollectionState], bool]]] = { +def get_rules_lookup(world, player: int): + rules_lookup = { "entrances": { - "Nether Portal": lambda state: (state.has('Flint and Steel', player) and - (state.has('Bucket', player) or state.has('Progressive Tools', player, 3)) and - has_iron_ingots(state, player)), - "End Portal": lambda state: enter_stronghold(state, player) and state.has('3 Ender Pearls', player, 4), - "Overworld Structure 1": lambda state: (can_adventure(state, player) and has_structure_compass(state, "Overworld Structure 1", player)), - "Overworld Structure 2": lambda state: (can_adventure(state, player) and has_structure_compass(state, "Overworld Structure 2", player)), - "Nether Structure 1": lambda state: (can_adventure(state, player) and has_structure_compass(state, "Nether Structure 1", player)), - "Nether Structure 2": lambda state: (can_adventure(state, player) and has_structure_compass(state, "Nether Structure 2", player)), - "The End Structure": lambda state: (can_adventure(state, player) and has_structure_compass(state, "The End Structure", player)), + "Nether Portal": lambda state: state.has('Flint and Steel', player) + and ( + state.has('Bucket', player) + or state.has('Progressive Tools', player, 3) + ) + and has_iron_ingots(world, state, player), + "End Portal": lambda state: enter_stronghold(world, state, player) + and state.has('3 Ender Pearls', player, 4), + "Overworld Structure 1": lambda state: can_adventure(world, state, player) + and has_structure_compass(world, state, "Overworld Structure 1", player), + "Overworld Structure 2": lambda state: can_adventure(world, state, player) + and has_structure_compass(world, state, "Overworld Structure 2", player), + "Nether Structure 1": lambda state: can_adventure(world, state, player) + and has_structure_compass(world, state, "Nether Structure 1", player), + "Nether Structure 2": lambda state: can_adventure(world, state, player) + and has_structure_compass(world, state, "Nether Structure 2", player), + "The End Structure": lambda state: can_adventure(world, state, player) + and has_structure_compass(world, state, "The End Structure", player), }, "locations": { - "Ender Dragon": lambda state: can_respawn_ender_dragon(state, player) and can_kill_ender_dragon(state, player), - "Wither": lambda state: can_kill_wither(state, player), - "Blaze Rods": lambda state: fortress_loot(state, player), - - "Who is Cutting Onions?": lambda state: can_piglin_trade(state, player), - "Oh Shiny": lambda state: can_piglin_trade(state, player), - "Suit Up": lambda state: state.has("Progressive Armor", player) and has_iron_ingots(state, player), - "Very Very Frightening": lambda state: (state.has("Channeling Book", player) and - can_use_anvil(state, player) and can_enchant(state, player) and overworld_villager(state, player)), - "Hot Stuff": lambda state: state.has("Bucket", player) and has_iron_ingots(state, player), - "Free the End": lambda state: can_respawn_ender_dragon(state, player) and can_kill_ender_dragon(state, player), - "A Furious Cocktail": lambda state: (can_brew_potions(state, player) and - state.has("Fishing Rod", player) and # Water Breathing - state.can_reach("The Nether", "Region", player) and # Regeneration, Fire Resistance, gold nuggets - state.can_reach("Village", "Region", player) and # Night Vision, Invisibility - state.can_reach("Bring Home the Beacon", "Location", player)), # Resistance - "Bring Home the Beacon": lambda state: (can_kill_wither(state, player) and - has_diamond_pickaxe(state, player) and state.has("Progressive Resource Crafting", player, 2)), - "Not Today, Thank You": lambda state: state.has("Shield", player) and has_iron_ingots(state, player), - "Isn't It Iron Pick": lambda state: state.has("Progressive Tools", player, 2) and has_iron_ingots(state, player), - "Local Brewery": lambda state: can_brew_potions(state, player), - "The Next Generation": lambda state: can_respawn_ender_dragon(state, player) and can_kill_ender_dragon(state, player), + "Ender Dragon": lambda state: can_respawn_ender_dragon(world, state, player) + and can_kill_ender_dragon(world, state, player), + "Wither": lambda state: can_kill_wither(world, state, player), + "Blaze Rods": lambda state: fortress_loot(world, state, player), + "Who is Cutting Onions?": lambda state: can_piglin_trade(world, state, player), + "Oh Shiny": lambda state: can_piglin_trade(world, state, player), + "Suit Up": lambda state: state.has("Progressive Armor", player) + and has_iron_ingots(world, state, player), + "Very Very Frightening": lambda state: state.has("Channeling Book", player) + and can_use_anvil(world, state, player) + and can_enchant(world, state, player) + and overworld_villager(world, state, player), + "Hot Stuff": lambda state: state.has("Bucket", player) + and has_iron_ingots(world, state, player), + "Free the End": lambda state: can_respawn_ender_dragon(world, state, player) + and can_kill_ender_dragon(world, state, player), + "A Furious Cocktail": lambda state: (can_brew_potions(world, state, player) + and state.has("Fishing Rod", player) # Water Breathing + and state.can_reach_region("The Nether", player) # Regeneration, Fire Resistance, gold nuggets + and state.can_reach_region("Village", player) # Night Vision, Invisibility + and state.can_reach_location("Bring Home the Beacon", player)), + # Resistance + "Bring Home the Beacon": lambda state: can_kill_wither(world, state, player) + and has_diamond_pickaxe(world, state, player) + and state.has("Progressive Resource Crafting", player, 2), + "Not Today, Thank You": lambda state: state.has("Shield", player) + and has_iron_ingots(world, state, player), + "Isn't It Iron Pick": lambda state: state.has("Progressive Tools", player, 2) + and has_iron_ingots(world, state, player), + "Local Brewery": lambda state: can_brew_potions(world, state, player), + "The Next Generation": lambda state: can_respawn_ender_dragon(world, state, player) + and can_kill_ender_dragon(world, state, player), "Fishy Business": lambda state: state.has("Fishing Rod", player), - "This Boat Has Legs": lambda state: ((fortress_loot(state, player) or complete_raid(state, player)) and - state.has("Saddle", player) and state.has("Fishing Rod", player)), + "This Boat Has Legs": lambda state: ( + fortress_loot(world, state, player) + or complete_raid(world, state, player) + ) + and state.has("Saddle", player) + and state.has("Fishing Rod", player), "Sniper Duel": lambda state: state.has("Archery", player), - "Great View From Up Here": lambda state: basic_combat(state, player), - "How Did We Get Here?": lambda state: (can_brew_potions(state, player) and - has_gold_ingots(state, player) and # Absorption - state.can_reach('End City', 'Region', player) and # Levitation - state.can_reach('The Nether', 'Region', player) and # potion ingredients - state.has("Fishing Rod", player) and state.has("Archery",player) and # Pufferfish, Nautilus Shells; spectral arrows - state.can_reach("Bring Home the Beacon", "Location", player) and # Haste - state.can_reach("Hero of the Village", "Location", player)), # Bad Omen, Hero of the Village - "Bullseye": lambda state: (state.has("Archery", player) and state.has("Progressive Tools", player, 2) and - has_iron_ingots(state, player)), - "Spooky Scary Skeleton": lambda state: basic_combat(state, player), - "Two by Two": lambda state: has_iron_ingots(state, player) and state.has("Bucket", player) and can_adventure(state, player), - "Two Birds, One Arrow": lambda state: craft_crossbow(state, player) and can_enchant(state, player), - "Who's the Pillager Now?": lambda state: craft_crossbow(state, player), + "Great View From Up Here": lambda state: basic_combat(world, state, player), + "How Did We Get Here?": lambda state: (can_brew_potions(world, state, player) + and has_gold_ingots(world, state, player) # Absorption + and state.can_reach_region('End City', player) # Levitation + and state.can_reach_region('The Nether', player) # potion ingredients + and state.has("Fishing Rod", player) # Pufferfish, Nautilus Shells; spectral arrows + and state.has("Archery", player) + and state.can_reach_location("Bring Home the Beacon", player) # Haste + and state.can_reach_location("Hero of the Village", player)), # Bad Omen, Hero of the Village + "Bullseye": lambda state: state.has("Archery", player) + and state.has("Progressive Tools", player, 2) + and has_iron_ingots(world, state, player), + "Spooky Scary Skeleton": lambda state: basic_combat(world, state, player), + "Two by Two": lambda state: has_iron_ingots(world, state, player) + and state.has("Bucket", player) + and can_adventure(world, state, player), + "Two Birds, One Arrow": lambda state: craft_crossbow(world, state, player) + and can_enchant(world, state, player), + "Who's the Pillager Now?": lambda state: craft_crossbow(world, state, player), "Getting an Upgrade": lambda state: state.has("Progressive Tools", player), - "Tactical Fishing": lambda state: state.has("Bucket", player) and has_iron_ingots(state, player), - "Zombie Doctor": lambda state: can_brew_potions(state, player) and has_gold_ingots(state, player), - "Ice Bucket Challenge": lambda state: has_diamond_pickaxe(state, player), - "Into Fire": lambda state: basic_combat(state, player), - "War Pigs": lambda state: basic_combat(state, player), + "Tactical Fishing": lambda state: state.has("Bucket", player) + and has_iron_ingots(world, state, player), + "Zombie Doctor": lambda state: can_brew_potions(world, state, player) + and has_gold_ingots(world, state, player), + "Ice Bucket Challenge": lambda state: has_diamond_pickaxe(world, state, player), + "Into Fire": lambda state: basic_combat(world, state, player), + "War Pigs": lambda state: basic_combat(world, state, player), "Take Aim": lambda state: state.has("Archery", player), - "Total Beelocation": lambda state: state.has("Silk Touch Book", player) and can_use_anvil(state, player) and can_enchant(state, player), - "Arbalistic": lambda state: (craft_crossbow(state, player) and state.has("Piercing IV Book", player) and - can_use_anvil(state, player) and can_enchant(state, player)), - "The End... Again...": lambda state: can_respawn_ender_dragon(state, player) and can_kill_ender_dragon(state, player), - "Acquire Hardware": lambda state: has_iron_ingots(state, player), - "Not Quite \"Nine\" Lives": lambda state: can_piglin_trade(state, player) and state.has("Progressive Resource Crafting", player, 2), - "Cover Me With Diamonds": lambda state: (state.has("Progressive Armor", player, 2) and - state.has("Progressive Tools", player, 2) and has_iron_ingots(state, player)), - "Sky's the Limit": lambda state: basic_combat(state, player), - "Hired Help": lambda state: state.has("Progressive Resource Crafting", player, 2) and has_iron_ingots(state, player), - "Sweet Dreams": lambda state: state.has("Bed", player) or state.can_reach('Village', 'Region', player), - "You Need a Mint": lambda state: can_respawn_ender_dragon(state, player) and has_bottle(state, player), - "Monsters Hunted": lambda state: (can_respawn_ender_dragon(state, player) and can_kill_ender_dragon(state, player) and - can_kill_wither(state, player) and state.has("Fishing Rod", player)), - "Enchanter": lambda state: can_enchant(state, player), - "Voluntary Exile": lambda state: basic_combat(state, player), - "Eye Spy": lambda state: enter_stronghold(state, player), - "Serious Dedication": lambda state: (can_brew_potions(state, player) and state.has("Bed", player) and - has_diamond_pickaxe(state, player) and has_gold_ingots(state, player)), - "Postmortal": lambda state: complete_raid(state, player), - "Adventuring Time": lambda state: can_adventure(state, player), - "Hero of the Village": lambda state: complete_raid(state, player), - "Hidden in the Depths": lambda state: can_brew_potions(state, player) and state.has("Bed", player) and has_diamond_pickaxe(state, player), - "Beaconator": lambda state: (can_kill_wither(state, player) and has_diamond_pickaxe(state, player) and - state.has("Progressive Resource Crafting", player, 2)), - "Withering Heights": lambda state: can_kill_wither(state, player), - "A Balanced Diet": lambda state: (has_bottle(state, player) and has_gold_ingots(state, player) and # honey bottle; gapple - state.has("Progressive Resource Crafting", player, 2) and state.can_reach('The End', 'Region', player)), # notch apple, chorus fruit - "Subspace Bubble": lambda state: has_diamond_pickaxe(state, player), - "Country Lode, Take Me Home": lambda state: state.can_reach("Hidden in the Depths", "Location", player) and has_gold_ingots(state, player), - "Bee Our Guest": lambda state: state.has("Campfire", player) and has_bottle(state, player), - "Uneasy Alliance": lambda state: has_diamond_pickaxe(state, player) and state.has('Fishing Rod', player), - "Diamonds!": lambda state: state.has("Progressive Tools", player, 2) and has_iron_ingots(state, player), - "A Throwaway Joke": lambda state: can_adventure(state, player), - "Sticky Situation": lambda state: state.has("Campfire", player) and has_bottle(state, player), - "Ol' Betsy": lambda state: craft_crossbow(state, player), - "Cover Me in Debris": lambda state: (state.has("Progressive Armor", player, 2) and - state.has("8 Netherite Scrap", player, 2) and state.has("Progressive Resource Crafting", player) and - has_diamond_pickaxe(state, player) and has_iron_ingots(state, player) and - can_brew_potions(state, player) and state.has("Bed", player)), + "Total Beelocation": lambda state: state.has("Silk Touch Book", player) + and can_use_anvil(world, state, player) + and can_enchant(world, state, player), + "Arbalistic": lambda state: (craft_crossbow(world, state, player) + and state.has("Piercing IV Book", player) + and can_use_anvil(world, state, player) + and can_enchant(world, state, player) + ), + "The End... Again...": lambda state: can_respawn_ender_dragon(world, state, player) + and can_kill_ender_dragon(world, state, player), + "Acquire Hardware": lambda state: has_iron_ingots(world, state, player), + "Not Quite \"Nine\" Lives": lambda state: can_piglin_trade(world, state, player) + and state.has("Progressive Resource Crafting", player, 2), + "Cover Me With Diamonds": lambda state: state.has("Progressive Armor", player, 2) + and state.has("Progressive Tools", player, 2) + and has_iron_ingots(world, state, player), + "Sky's the Limit": lambda state: basic_combat(world, state, player), + "Hired Help": lambda state: state.has("Progressive Resource Crafting", player, 2) + and has_iron_ingots(world, state, player), + "Sweet Dreams": lambda state: state.has("Bed", player) + or state.can_reach_region('Village', player), + "You Need a Mint": lambda state: can_respawn_ender_dragon(world, state, player) + and has_bottle(world, state, player), + "Monsters Hunted": lambda state: (can_respawn_ender_dragon(world, state, player) + and can_kill_ender_dragon(world, state, player) + and can_kill_wither(world, state, player) + and state.has("Fishing Rod", player)), + "Enchanter": lambda state: can_enchant(world, state, player), + "Voluntary Exile": lambda state: basic_combat(world, state, player), + "Eye Spy": lambda state: enter_stronghold(world, state, player), + "Serious Dedication": lambda state: (can_brew_potions(world, state, player) + and state.has("Bed", player) + and has_diamond_pickaxe(world, state, player) + and has_gold_ingots(world, state, player)), + "Postmortal": lambda state: complete_raid(world, state, player), + "Adventuring Time": lambda state: can_adventure(world, state, player), + "Hero of the Village": lambda state: complete_raid(world, state, player), + "Hidden in the Depths": lambda state: can_brew_potions(world, state, player) + and state.has("Bed", player) + and has_diamond_pickaxe(world, state, player), + "Beaconator": lambda state: (can_kill_wither(world, state, player) + and has_diamond_pickaxe(world, state, player) + and state.has("Progressive Resource Crafting", player, 2)), + "Withering Heights": lambda state: can_kill_wither(world, state, player), + "A Balanced Diet": lambda state: (has_bottle(world, state, player) + and has_gold_ingots(world, state, player) + and state.has("Progressive Resource Crafting", player, 2) + and state.can_reach_region('The End', player)), + # notch apple, chorus fruit + "Subspace Bubble": lambda state: has_diamond_pickaxe(world, state, player), + "Country Lode, Take Me Home": lambda state: state.can_reach_location("Hidden in the Depths", player) + and has_gold_ingots(world, state, player), + "Bee Our Guest": lambda state: state.has("Campfire", player) + and has_bottle(world, state, player), + "Uneasy Alliance": lambda state: has_diamond_pickaxe(world, state, player) + and state.has('Fishing Rod', player), + "Diamonds!": lambda state: state.has("Progressive Tools", player, 2) + and has_iron_ingots(world, state, player), + "A Throwaway Joke": lambda state: can_adventure(world, state, player), + "Sticky Situation": lambda state: state.has("Campfire", player) + and has_bottle(world, state, player), + "Ol' Betsy": lambda state: craft_crossbow(world, state, player), + "Cover Me in Debris": lambda state: state.has("Progressive Armor", player, 2) + and state.has("8 Netherite Scrap", player, 2) + and state.has("Progressive Resource Crafting", player) + and has_diamond_pickaxe(world, state, player) + and has_iron_ingots(world, state, player) + and can_brew_potions(world, state, player) + and state.has("Bed", player), "Hot Topic": lambda state: state.has("Progressive Resource Crafting", player), - "The Lie": lambda state: has_iron_ingots(state, player) and state.has("Bucket", player), - "On a Rail": lambda state: has_iron_ingots(state, player) and state.has('Progressive Tools', player, 2), - "When Pigs Fly": lambda state: ((fortress_loot(state, player) or complete_raid(state, player)) and - state.has("Saddle", player) and state.has("Fishing Rod", player) and can_adventure(state, player)), - "Overkill": lambda state: (can_brew_potions(state, player) and - (state.has("Progressive Weapons", player) or state.can_reach('The Nether', 'Region', player))), + "The Lie": lambda state: has_iron_ingots(world, state, player) + and state.has("Bucket", player), + "On a Rail": lambda state: has_iron_ingots(world, state, player) + and state.has('Progressive Tools', player, 2), + "When Pigs Fly": lambda state: ( + fortress_loot(world, state, player) + or complete_raid(world, state, player) + ) + and state.has("Saddle", player) + and state.has("Fishing Rod", player) + and can_adventure(world, state, player), + "Overkill": lambda state: can_brew_potions(world, state, player) + and ( + state.has("Progressive Weapons", player) + or state.can_reach_region('The Nether', player) + ), "Librarian": lambda state: state.has("Enchanting", player), - "Overpowered": lambda state: (has_iron_ingots(state, player) and - state.has('Progressive Tools', player, 2) and basic_combat(state, player)), - "Wax On": lambda state: (has_copper_ingots(state, player) and state.has('Campfire', player) and - state.has('Progressive Resource Crafting', player, 2)), - "Wax Off": lambda state: (has_copper_ingots(state, player) and state.has('Campfire', player) and - state.has('Progressive Resource Crafting', player, 2)), - "The Cutest Predator": lambda state: has_iron_ingots(state, player) and state.has('Bucket', player), - "The Healing Power of Friendship": lambda state: has_iron_ingots(state, player) and state.has('Bucket', player), - "Is It a Bird?": lambda state: has_spyglass(state, player) and can_adventure(state, player), - "Is It a Balloon?": lambda state: has_spyglass(state, player), - "Is It a Plane?": lambda state: has_spyglass(state, player) and can_respawn_ender_dragon(state, player), - "Surge Protector": lambda state: (state.has("Channeling Book", player) and - can_use_anvil(state, player) and can_enchant(state, player) and overworld_villager(state, player)), - "Light as a Rabbit": lambda state: can_adventure(state, player) and has_iron_ingots(state, player) and state.has('Bucket', player), - "Glow and Behold!": lambda state: can_adventure(state, player), - "Whatever Floats Your Goat!": lambda state: can_adventure(state, player), - "Caves & Cliffs": lambda state: has_iron_ingots(state, player) and state.has('Bucket', player) and state.has('Progressive Tools', player, 2), - "Feels like home": lambda state: (has_iron_ingots(state, player) and state.has('Bucket', player) and state.has('Fishing Rod', player) and - (fortress_loot(state, player) or complete_raid(state, player)) and state.has("Saddle", player)), - "Sound of Music": lambda state: state.has("Progressive Tools", player, 2) and has_iron_ingots(state, player) and basic_combat(state, player), - "Star Trader": lambda state: (has_iron_ingots(state, player) and state.has('Bucket', player) and - (state.can_reach("The Nether", 'Region', player) or - state.can_reach("Nether Fortress", 'Region', player) or # soul sand for water elevator - can_piglin_trade(state, player)) and - overworld_villager(state, player)), - "Birthday Song": lambda state: state.can_reach("The Lie", "Location", player) and state.has("Progressive Tools", player, 2) and has_iron_ingots(state, player), - "Bukkit Bukkit": lambda state: state.has("Bucket", player) and has_iron_ingots(state, player) and can_adventure(state, player), - "It Spreads": lambda state: can_adventure(state, player) and has_iron_ingots(state, player) and state.has("Progressive Tools", player, 2), - "Sneak 100": lambda state: can_adventure(state, player) and has_iron_ingots(state, player) and state.has("Progressive Tools", player, 2), - "When the Squad Hops into Town": lambda state: can_adventure(state, player) and state.has("Lead", player), - "With Our Powers Combined!": lambda state: can_adventure(state, player) and state.has("Lead", player), + "Overpowered": lambda state: has_iron_ingots(world, state, player) + and state.has('Progressive Tools', player, 2) + and basic_combat(world, state, player), + "Wax On": lambda state: has_copper_ingots(world, state, player) + and state.has('Campfire', player) + and state.has('Progressive Resource Crafting', player, 2), + "Wax Off": lambda state: has_copper_ingots(world, state, player) + and state.has('Campfire', player) + and state.has('Progressive Resource Crafting', player, 2), + "The Cutest Predator": lambda state: has_iron_ingots(world, state, player) + and state.has('Bucket', player), + "The Healing Power of Friendship": lambda state: has_iron_ingots(world, state, player) + and state.has('Bucket', player), + "Is It a Bird?": lambda state: has_spyglass(world, state, player) + and can_adventure(world, state, player), + "Is It a Balloon?": lambda state: has_spyglass(world, state, player), + "Is It a Plane?": lambda state: has_spyglass(world, state, player) + and can_respawn_ender_dragon(world, state, player), + "Surge Protector": lambda state: state.has("Channeling Book", player) + and can_use_anvil(world, state, player) + and can_enchant(world, state, player) + and overworld_villager(world, state, player), + "Light as a Rabbit": lambda state: can_adventure(world, state, player) + and has_iron_ingots(world, state, player) + and state.has('Bucket', player), + "Glow and Behold!": lambda state: can_adventure(world, state, player), + "Whatever Floats Your Goat!": lambda state: can_adventure(world, state, player), + "Caves & Cliffs": lambda state: has_iron_ingots(world, state, player) + and state.has('Bucket', player) + and state.has('Progressive Tools', player, 2), + "Feels like home": lambda state: has_iron_ingots(world, state, player) + and state.has('Bucket', player) + and state.has('Fishing Rod', player) + and ( + fortress_loot(world, state, player) + or complete_raid(world, state, player) + ) + and state.has("Saddle", player), + "Sound of Music": lambda state: state.has("Progressive Tools", player, 2) + and has_iron_ingots(world, state, player) + and basic_combat(world, state, player), + "Star Trader": lambda state: has_iron_ingots(world, state, player) + and state.has('Bucket', player) + and ( + state.can_reach_region("The Nether", player) # soul sand in nether + or state.can_reach_region("Nether Fortress", player) # soul sand in fortress if not in nether for water elevator + or can_piglin_trade(world, state, player) # piglins give soul sand + ) + and overworld_villager(world, state, player), + "Birthday Song": lambda state: state.can_reach_location("The Lie", player) + and state.has("Progressive Tools", player, 2) + and has_iron_ingots(world, state, player), + "Bukkit Bukkit": lambda state: state.has("Bucket", player) + and has_iron_ingots(world, state, player) + and can_adventure(world, state, player), + "It Spreads": lambda state: can_adventure(world, state, player) + and has_iron_ingots(world, state, player) + and state.has("Progressive Tools", player, 2), + "Sneak 100": lambda state: can_adventure(world, state, player) + and has_iron_ingots(world, state, player) + and state.has("Progressive Tools", player, 2), + "When the Squad Hops into Town": lambda state: can_adventure(world, state, player) + and state.has("Lead", player), + "With Our Powers Combined!": lambda state: can_adventure(world, state, player) + and state.has("Lead", player), } } return rules_lookup -def set_rules(mc_world: World) -> None: - multiworld = mc_world.multiworld - player = mc_world.player +def set_rules(self: "MinecraftWorld") -> None: + multiworld = self.multiworld + player = self.player - rules_lookup = get_rules_lookup(player) + rules_lookup = get_rules_lookup(self, player) # Set entrance rules for entrance_name, rule in rules_lookup["entrances"].items(): @@ -281,33 +476,33 @@ def set_rules(mc_world: World) -> None: multiworld.get_location(location_name, player).access_rule = rule # Set rules surrounding completion - bosses = multiworld.required_bosses[player] + bosses = self.options.required_bosses postgame_advancements = set() if bosses.dragon: postgame_advancements.update(Constants.exclusion_info["ender_dragon"]) if bosses.wither: postgame_advancements.update(Constants.exclusion_info["wither"]) - def location_count(state: CollectionState) -> bool: + def location_count(state: CollectionState) -> int: return len([location for location in multiworld.get_locations(player) if - location.address != None and - location.can_reach(state)]) + location.address is not None and + location.can_reach(state)]) def defeated_bosses(state: CollectionState) -> bool: return ((not bosses.dragon or state.has("Ender Dragon", player)) - and (not bosses.wither or state.has("Wither", player))) + and (not bosses.wither or state.has("Wither", player))) - egg_shards = min(multiworld.egg_shards_required[player], multiworld.egg_shards_available[player]) - completion_requirements = lambda state: (location_count(state) >= multiworld.advancement_goal[player] - and state.has("Dragon Egg Shard", player, egg_shards)) + egg_shards = min(self.options.egg_shards_required.value, self.options.egg_shards_available.value) + completion_requirements = lambda state: (location_count(state) >= self.options.advancement_goal + and state.has("Dragon Egg Shard", player, egg_shards)) multiworld.completion_condition[player] = lambda state: completion_requirements(state) and defeated_bosses(state) # Set exclusions on hard/unreasonable/postgame excluded_advancements = set() - if not multiworld.include_hard_advancements[player]: + if not self.options.include_hard_advancements: excluded_advancements.update(Constants.exclusion_info["hard"]) - if not multiworld.include_unreasonable_advancements[player]: + if not self.options.include_unreasonable_advancements: excluded_advancements.update(Constants.exclusion_info["unreasonable"]) - if not multiworld.include_postgame_advancements[player]: + if not self.options.include_postgame_advancements: excluded_advancements.update(postgame_advancements) exclusion_rules(multiworld, player, excluded_advancements) diff --git a/worlds/minecraft/Structures.py b/worlds/minecraft/Structures.py index 95bafc9efb5c..df3d944a6c65 100644 --- a/worlds/minecraft/Structures.py +++ b/worlds/minecraft/Structures.py @@ -1,17 +1,19 @@ -from worlds.AutoWorld import World - from . import Constants +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from . import MinecraftWorld + -def shuffle_structures(mc_world: World) -> None: - multiworld = mc_world.multiworld - player = mc_world.player +def shuffle_structures(self: "MinecraftWorld") -> None: + multiworld = self.multiworld + player = self.player default_connections = Constants.region_info["default_connections"] illegal_connections = Constants.region_info["illegal_connections"] # Get all unpaired exits and all regions without entrances (except the Menu) # This function is destructive on these lists. - exits = [exit.name for r in multiworld.regions if r.player == player for exit in r.exits if exit.connected_region == None] + exits = [exit.name for r in multiworld.regions if r.player == player for exit in r.exits if exit.connected_region is None] structs = [r.name for r in multiworld.regions if r.player == player and r.entrances == [] and r.name != 'Menu'] exits_spoiler = exits[:] # copy the original order for the spoiler log @@ -26,19 +28,19 @@ def set_pair(exit, struct): raise Exception(f"Invalid connection: {exit} => {struct} for player {player} ({multiworld.player_name[player]})") # Connect plando structures first - if multiworld.plando_connections[player]: - for conn in multiworld.plando_connections[player]: + if self.options.plando_connections: + for conn in self.plando_connections: set_pair(conn.entrance, conn.exit) # The algorithm tries to place the most restrictive structures first. This algorithm always works on the # relatively small set of restrictions here, but does not work on all possible inputs with valid configurations. - if multiworld.shuffle_structures[player]: + if self.options.shuffle_structures: structs.sort(reverse=True, key=lambda s: len(illegal_connections.get(s, []))) for struct in structs[:]: try: - exit = multiworld.random.choice([e for e in exits if e not in illegal_connections.get(struct, [])]) + exit = self.random.choice([e for e in exits if e not in illegal_connections.get(struct, [])]) except IndexError: - raise Exception(f"No valid structure placements remaining for player {player} ({multiworld.player_name[player]})") + raise Exception(f"No valid structure placements remaining for player {player} ({self.player_name})") set_pair(exit, struct) else: # write remaining default connections for (exit, struct) in default_connections: @@ -49,9 +51,9 @@ def set_pair(exit, struct): try: assert len(exits) == len(structs) == 0 except AssertionError: - raise Exception(f"Failed to connect all Minecraft structures for player {player} ({multiworld.player_name[player]})") + raise Exception(f"Failed to connect all Minecraft structures for player {player} ({self.player_name})") for exit in exits_spoiler: multiworld.get_entrance(exit, player).connect(multiworld.get_region(pairs[exit], player)) - if multiworld.shuffle_structures[player] or multiworld.plando_connections[player]: + if self.options.shuffle_structures or self.options.plando_connections: multiworld.spoiler.set_entrance(exit, pairs[exit], 'entrance', player) diff --git a/worlds/minecraft/__init__.py b/worlds/minecraft/__init__.py index 75e043d0cbaf..75539fcf2ea6 100644 --- a/worlds/minecraft/__init__.py +++ b/worlds/minecraft/__init__.py @@ -9,7 +9,7 @@ from worlds.AutoWorld import World, WebWorld from . import Constants -from .Options import minecraft_options +from .Options import MinecraftOptions from .Structures import shuffle_structures from .ItemPool import build_item_pool, get_junk_item_names from .Rules import set_rules @@ -83,8 +83,9 @@ class MinecraftWorld(World): structures, and materials to create a portal to another world. Defeat the Ender Dragon, and claim victory! """ - game: str = "Minecraft" - option_definitions = minecraft_options + game = "Minecraft" + options_dataclass = MinecraftOptions + options: MinecraftOptions settings: typing.ClassVar[MinecraftSettings] topology_present = True web = MinecraftWebWorld() @@ -95,20 +96,20 @@ class MinecraftWorld(World): def _get_mc_data(self) -> Dict[str, Any]: exits = [connection[0] for connection in Constants.region_info["default_connections"]] return { - 'world_seed': self.multiworld.per_slot_randoms[self.player].getrandbits(32), + 'world_seed': self.random.getrandbits(32), 'seed_name': self.multiworld.seed_name, - 'player_name': self.multiworld.get_player_name(self.player), + 'player_name': self.player_name, 'player_id': self.player, 'client_version': client_version, 'structures': {exit: self.multiworld.get_entrance(exit, self.player).connected_region.name for exit in exits}, - 'advancement_goal': self.multiworld.advancement_goal[self.player].value, - 'egg_shards_required': min(self.multiworld.egg_shards_required[self.player].value, - self.multiworld.egg_shards_available[self.player].value), - 'egg_shards_available': self.multiworld.egg_shards_available[self.player].value, - 'required_bosses': self.multiworld.required_bosses[self.player].current_key, - 'MC35': bool(self.multiworld.send_defeated_mobs[self.player].value), - 'death_link': bool(self.multiworld.death_link[self.player].value), - 'starting_items': str(self.multiworld.starting_items[self.player].value), + 'advancement_goal': self.options.advancement_goal.value, + 'egg_shards_required': min(self.options.egg_shards_required.value, + self.options.egg_shards_available.value), + 'egg_shards_available': self.options.egg_shards_available.value, + 'required_bosses': self.options.required_bosses.current_key, + 'MC35': bool(self.options.send_defeated_mobs.value), + 'death_link': bool(self.options.death_link.value), + 'starting_items': json.dumps(self.options.starting_items.value), 'race': self.multiworld.is_race, } @@ -129,7 +130,7 @@ def create_event(self, region_name: str, event_name: str) -> None: loc.place_locked_item(self.create_event_item(event_name)) region.locations.append(loc) - def create_event_item(self, name: str) -> None: + def create_event_item(self, name: str) -> Item: item = self.create_item(name) item.classification = ItemClassification.progression return item @@ -176,15 +177,10 @@ def generate_output(self, output_directory: str) -> None: f.write(b64encode(bytes(json.dumps(data), 'utf-8'))) def fill_slot_data(self) -> dict: - slot_data = self._get_mc_data() - for option_name in minecraft_options: - option = getattr(self.multiworld, option_name)[self.player] - if slot_data.get(option_name, None) is None and type(option.value) in {str, int}: - slot_data[option_name] = int(option.value) - return slot_data + return self._get_mc_data() def get_filler_item_name(self) -> str: - return get_junk_item_names(self.multiworld.random, 1)[0] + return get_junk_item_names(self.random, 1)[0] class MinecraftLocation(Location): diff --git a/worlds/minecraft/test/TestOptions.py b/worlds/minecraft/test/TestOptions.py index 668ed500e832..c04a07054c9c 100644 --- a/worlds/minecraft/test/TestOptions.py +++ b/worlds/minecraft/test/TestOptions.py @@ -1,19 +1,19 @@ from . import MCTestBase from ..Constants import region_info -from ..Options import minecraft_options +from .. import Options from BaseClasses import ItemClassification class AdvancementTestBase(MCTestBase): options = { - "advancement_goal": minecraft_options["advancement_goal"].range_end + "advancement_goal": Options.AdvancementGoal.range_end } # beatability test implicit class ShardTestBase(MCTestBase): options = { - "egg_shards_required": minecraft_options["egg_shards_required"].range_end, - "egg_shards_available": minecraft_options["egg_shards_available"].range_end + "egg_shards_required": Options.EggShardsRequired.range_end, + "egg_shards_available": Options.EggShardsAvailable.range_end } # check that itempool is not overfilled with shards @@ -29,7 +29,7 @@ def test_compasses_in_pool(self): class NoBeeTestBase(MCTestBase): options = { - "bee_traps": 0 + "bee_traps": Options.BeeTraps.range_start } # With no bees, there are no traps in the pool @@ -40,7 +40,7 @@ def test_bees(self): class AllBeeTestBase(MCTestBase): options = { - "bee_traps": 100 + "bee_traps": Options.BeeTraps.range_end } # With max bees, there are no filler items, only bee traps diff --git a/worlds/minecraft/test/__init__.py b/worlds/minecraft/test/__init__.py index acf9b7949137..3d936fe9cb6b 100644 --- a/worlds/minecraft/test/__init__.py +++ b/worlds/minecraft/test/__init__.py @@ -1,5 +1,5 @@ -from test.TestBase import TestBase, WorldTestBase -from .. import MinecraftWorld +from test.bases import TestBase, WorldTestBase +from .. import MinecraftWorld, MinecraftOptions class MCTestBase(WorldTestBase, TestBase): From f253dffc0708fb8f3a2fb53bd003c2895ec39e97 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Tue, 20 Aug 2024 01:16:35 +0200 Subject: [PATCH 12/60] The Witness: Panel Hunt Mode (#3265) * Add panel hunt options * Make sure all panels are either solvable or disabled in panel hunt * Pick huntable panels * Discards in disable non randomized * Set up panel hunt requirement * Panel hunt functional * Make it so an event can have multiple names * Panel hunt with events * Add hunt entities to slot data * ruff * add to hint data, no client sneding yet * encode panel hunt amount in compact hint data * Remove print statement * my b * consistent * meh * additions for lcient * Nah * Victory panels ineligible for panel hunt * Panel Hunt Postgame option * cleanup * Add data generation file * pull out set * always disable gate ep in panel hunt * Disallow certain challenge panels from being panel hunt panels * Make panelhuntpostgame its own function, so it can be called even if normal postgame is enabled * disallow PP resets from panel hunt * Disable challenge timer and elevetor start respectively in disable hunt postgame * Fix panelhunt postgame * lol * When you test that the bug is fixed but not that the non-bug is not unfixed * Prevent Obelisks from being panel hunt panels * Make picking panels for panel hunt a bit more sophisticated, if less random * Better function maybe ig * Ok maybe that was a bit too much * Give advanced players some control over panel hunt * lint * correct the logic for amount to pick * decided the jingle thing was dumb, I'll figure sth out client side. Same area discouragement is now a configurable factor, and the logic has been significantly rewritten * comment * Make the option visible * Safety * Change assert slightly * We do a little logging * number tweak & we do a lil logging * we do a little more logging * Ruff * Panel Hunt Option Group * Idk how that got here * Update worlds/witness/options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/witness/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * remove merge error * Update worlds/witness/player_logic.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * True * Don't have underwater sliding bridge when you have above water sliding bridge * These are not actually connected lol * get rid of unnecessary variable * Refactor compact hint function again * lint * Pull out Entity Hunt Picking into its own class, split it into many functions. Kept a lot of the comments tho * forgot to actually add the new file * some more refactoring & docstrings * consistent naming * flip elif change * Comment about naming * Make static eligible panels a constant I can refer back to * slight formatting change * pull out options-based eligibility into its own function * better text and stuff * lint * this is not necessary * capitalisation * Fix same area discouragement 0 * Simplify data file generation * Simplify data file generation * prevent div 0 * Add Vault Boxes -> Vault Panels to replacements * Update options.py * Update worlds/witness/entity_hunt.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update entity_hunt.py * Fix some events not working * assert * remove now unused function * lint * Lasers Activate, Lasers don't Solve * lint * oops * mypy * lint * Add simple panel hunt unit test * Add Panel Hunt Tests * Add more Panel Hunt Tests * Disallow Box Short for normal panel hunt --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --- worlds/witness/__init__.py | 25 +- worlds/witness/data/settings/Entity_Hunt.txt | 6 + worlds/witness/data/static_locations.py | 4 + worlds/witness/data/static_logic.py | 23 +- worlds/witness/data/utils.py | 4 + worlds/witness/entity_hunt.py | 234 +++++++++++++++++++ worlds/witness/generate_data_file.py | 45 ++++ worlds/witness/hints.py | 93 +++++--- worlds/witness/locations.py | 8 +- worlds/witness/options.py | 67 ++++++ worlds/witness/player_items.py | 2 +- worlds/witness/player_logic.py | 145 +++++++++--- worlds/witness/regions.py | 17 +- worlds/witness/rules.py | 55 +++-- worlds/witness/test/__init__.py | 33 +++ worlds/witness/test/test_panel_hunt.py | 107 +++++++++ 16 files changed, 751 insertions(+), 117 deletions(-) create mode 100644 worlds/witness/data/settings/Entity_Hunt.txt create mode 100644 worlds/witness/entity_hunt.py create mode 100644 worlds/witness/generate_data_file.py create mode 100644 worlds/witness/test/test_panel_hunt.py diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py index 254064098db9..b228842019cf 100644 --- a/worlds/witness/__init__.py +++ b/worlds/witness/__init__.py @@ -15,7 +15,7 @@ from .data import static_logic as static_witness_logic from .data.item_definition_classes import DoorItemDefinition, ItemData from .data.utils import get_audio_logs -from .hints import CompactItemData, create_all_hints, make_compact_hint_data, make_laser_hints +from .hints import CompactHintData, create_all_hints, make_compact_hint_data, make_laser_hints from .locations import WitnessPlayerLocations from .options import TheWitnessOptions, witness_option_groups from .player_items import WitnessItem, WitnessPlayerItems @@ -68,12 +68,14 @@ class WitnessWorld(World): player_items: WitnessPlayerItems player_regions: WitnessPlayerRegions - log_ids_to_hints: Dict[int, CompactItemData] - laser_ids_to_hints: Dict[int, CompactItemData] + log_ids_to_hints: Dict[int, CompactHintData] + laser_ids_to_hints: Dict[int, CompactHintData] items_placed_early: List[str] own_itempool: List[WitnessItem] + panel_hunt_required_count: int + def _get_slot_data(self) -> Dict[str, Any]: return { "seed": self.random.randrange(0, 1000000), @@ -83,12 +85,14 @@ def _get_slot_data(self) -> Dict[str, Any]: "door_hexes_in_the_pool": self.player_items.get_door_ids_in_pool(), "symbols_not_in_the_game": self.player_items.get_symbol_ids_not_in_pool(), "disabled_entities": [int(h, 16) for h in self.player_logic.COMPLETELY_DISABLED_ENTITIES], + "hunt_entities": [int(h, 16) for h in self.player_logic.HUNT_ENTITIES], "log_ids_to_hints": self.log_ids_to_hints, "laser_ids_to_hints": self.laser_ids_to_hints, "progressive_item_lists": self.player_items.get_progressive_item_ids_in_pool(), "obelisk_side_id_to_EPs": static_witness_logic.OBELISK_SIDE_ID_TO_EP_HEXES, "precompleted_puzzles": [int(h, 16) for h in self.player_logic.EXCLUDED_LOCATIONS], "entity_to_name": static_witness_logic.ENTITY_ID_TO_NAME, + "panel_hunt_required_absolute": self.panel_hunt_required_count } def determine_sufficient_progression(self) -> None: @@ -151,6 +155,13 @@ def generate_early(self) -> None: if self.options.shuffle_lasers == "local": self.options.local_items.value |= self.item_name_groups["Lasers"] + if self.options.victory_condition == "panel_hunt": + total_panels = self.options.panel_hunt_total + required_percentage = self.options.panel_hunt_required_percentage + self.panel_hunt_required_count = round(total_panels * required_percentage / 100) + else: + self.panel_hunt_required_count = 0 + def create_regions(self) -> None: self.player_regions.create_regions(self, self.player_logic) @@ -169,7 +180,7 @@ def create_regions(self) -> None: for event_location in self.player_locations.EVENT_LOCATION_TABLE: item_obj = self.create_item( - self.player_logic.EVENT_ITEM_PAIRS[event_location] + self.player_logic.EVENT_ITEM_PAIRS[event_location][0] ) location_obj = self.get_location(event_location) location_obj.place_locked_item(item_obj) @@ -192,7 +203,7 @@ def create_regions(self) -> None: ] if early_items: random_early_item = self.random.choice(early_items) - if self.options.puzzle_randomization == "sigma_expert": + if self.options.puzzle_randomization == "sigma_expert" or self.options.victory_condition == "panel_hunt": # In Expert, only tag the item as early, rather than forcing it onto the gate. self.multiworld.local_early_items[self.player][random_early_item] = 1 else: @@ -305,8 +316,8 @@ def create_items(self) -> None: self.options.local_items.value.add(item_name) def fill_slot_data(self) -> Dict[str, Any]: - self.log_ids_to_hints: Dict[int, CompactItemData] = {} - self.laser_ids_to_hints: Dict[int, CompactItemData] = {} + self.log_ids_to_hints: Dict[int, CompactHintData] = {} + self.laser_ids_to_hints: Dict[int, CompactHintData] = {} already_hinted_locations = set() diff --git a/worlds/witness/data/settings/Entity_Hunt.txt b/worlds/witness/data/settings/Entity_Hunt.txt new file mode 100644 index 000000000000..4135dbd842f7 --- /dev/null +++ b/worlds/witness/data/settings/Entity_Hunt.txt @@ -0,0 +1,6 @@ +Requirement Changes: +0x03629 - Entity Hunt - True +0x03505 - 0x03629 - True + +New Connections: +Tutorial - Outside Tutorial - True diff --git a/worlds/witness/data/static_locations.py b/worlds/witness/data/static_locations.py index de321d20c0f9..d9566080a04c 100644 --- a/worlds/witness/data/static_locations.py +++ b/worlds/witness/data/static_locations.py @@ -406,6 +406,10 @@ "Mountain Bottom Floor Discard", } +GENERAL_LOCATION_HEXES = { + static_witness_logic.ENTITIES_BY_NAME[entity_name]["entity_hex"] for entity_name in GENERAL_LOCATIONS +} + OBELISK_SIDES = { "Desert Obelisk Side 1", "Desert Obelisk Side 2", diff --git a/worlds/witness/data/static_logic.py b/worlds/witness/data/static_logic.py index a9175c0c30b3..b61b0f9d2f92 100644 --- a/worlds/witness/data/static_logic.py +++ b/worlds/witness/data/static_logic.py @@ -103,6 +103,7 @@ def read_logic_file(self, lines: List[str]) -> None: "region": None, "id": None, "entityType": location_id, + "locationType": None, "area": current_area, } @@ -127,19 +128,30 @@ def read_logic_file(self, lines: List[str]) -> None: "Laser Hedges", "Laser Pressure Plates", } - is_vault_or_video = "Vault" in entity_name or "Video" in entity_name if "Discard" in entity_name: + entity_type = "Panel" location_type = "Discard" - elif is_vault_or_video or entity_name == "Tutorial Gate Close": + elif "Vault" in entity_name: + entity_type = "Panel" location_type = "Vault" elif entity_name in laser_names: - location_type = "Laser" + entity_type = "Laser" + location_type = None elif "Obelisk Side" in entity_name: + entity_type = "Obelisk Side" location_type = "Obelisk Side" + elif "Obelisk" in entity_name: + entity_type = "Obelisk" + location_type = None elif "EP" in entity_name: + entity_type = "EP" location_type = "EP" + elif entity_hex.startswith("0xFF"): + entity_type = "Event" + location_type = None else: + entity_type = "Panel" location_type = "General" required_items = parse_lambda(required_item_lambda) @@ -152,7 +164,7 @@ def read_logic_file(self, lines: List[str]) -> None: "items": required_items } - if location_type == "Obelisk Side": + if entity_type == "Obelisk Side": eps = set(next(iter(required_panels))) eps -= {"Theater to Tunnels"} @@ -167,7 +179,8 @@ def read_logic_file(self, lines: List[str]) -> None: "entity_hex": entity_hex, "region": current_region, "id": int(location_id), - "entityType": location_type, + "entityType": entity_type, + "locationType": location_type, "area": current_area, } diff --git a/worlds/witness/data/utils.py b/worlds/witness/data/utils.py index f89aaf7d3e18..11f905b18a56 100644 --- a/worlds/witness/data/utils.py +++ b/worlds/witness/data/utils.py @@ -203,6 +203,10 @@ def get_elevators_come_to_you() -> List[str]: return get_adjustment_file("settings/Door_Shuffle/Elevators_Come_To_You.txt") +def get_entity_hunt() -> List[str]: + return get_adjustment_file("settings/Entity_Hunt.txt") + + def get_sigma_normal_logic() -> List[str]: return get_adjustment_file("WitnessLogic.txt") diff --git a/worlds/witness/entity_hunt.py b/worlds/witness/entity_hunt.py new file mode 100644 index 000000000000..29b914799fdb --- /dev/null +++ b/worlds/witness/entity_hunt.py @@ -0,0 +1,234 @@ +from collections import defaultdict +from logging import debug +from pprint import pformat +from typing import TYPE_CHECKING, Dict, List, Set, Tuple + +from .data import static_logic as static_witness_logic + +if TYPE_CHECKING: + from . import WitnessWorld + from .player_logic import WitnessPlayerLogic + +DISALLOWED_ENTITIES_FOR_PANEL_HUNT = { + "0x03629", # Tutorial Gate Open, which is the panel that is locked by panel hunt + "0x03505", # Tutorial Gate Close (same thing) + "0x3352F", # Gate EP (same thing) + "0x09F7F", # Mountaintop Box Short. This is reserved for panel_hunt_postgame. + "0x00CDB", # Challenge Reallocating + "0x0051F", # Challenge Reallocating + "0x00524", # Challenge Reallocating + "0x00CD4", # Challenge Reallocating + "0x00CB9", # Challenge May Be Unsolvable + "0x00CA1", # Challenge May Be Unsolvable + "0x00C80", # Challenge May Be Unsolvable + "0x00C68", # Challenge May Be Unsolvable + "0x00C59", # Challenge May Be Unsolvable + "0x00C22", # Challenge May Be Unsolvable + "0x0A3A8", # Reset PP + "0x0A3B9", # Reset PP + "0x0A3BB", # Reset PP + "0x0A3AD", # Reset PP +} + +ALL_HUNTABLE_PANELS = [ + entity_hex + for entity_hex, entity_obj in static_witness_logic.ENTITIES_BY_HEX.items() + if entity_obj["entityType"] == "Panel" and entity_hex not in DISALLOWED_ENTITIES_FOR_PANEL_HUNT +] + + +class EntityHuntPicker: + def __init__(self, player_logic: "WitnessPlayerLogic", world: "WitnessWorld", + pre_picked_entities: Set[str]) -> None: + self.player_logic = player_logic + self.player_options = world.options + self.player_name = world.player_name + self.random = world.random + + self.PRE_PICKED_HUNT_ENTITIES = pre_picked_entities.copy() + self.HUNT_ENTITIES: Set[str] = set() + + self.ALL_ELIGIBLE_ENTITIES, self.ELIGIBLE_ENTITIES_PER_AREA = self._get_eligible_panels() + + def pick_panel_hunt_panels(self, total_amount: int) -> Set[str]: + """ + The process of picking all hunt entities is: + + 1. Add pre-defined hunt entities + 2. Pick random hunt entities to fill out the rest + 3. Replace unfair entities with fair entities + + Each of these is its own function. + """ + + self.HUNT_ENTITIES = self.PRE_PICKED_HUNT_ENTITIES.copy() + + self._pick_all_hunt_entities(total_amount) + self._replace_unfair_hunt_entities_with_good_hunt_entities() + self._log_results() + + return self.HUNT_ENTITIES + + def _entity_is_eligible(self, panel_hex: str) -> bool: + """ + Determine whether an entity is eligible for entity hunt based on player options. + """ + panel_obj = static_witness_logic.ENTITIES_BY_HEX[panel_hex] + + return ( + self.player_logic.solvability_guaranteed(panel_hex) + and not ( + # Due to an edge case, Discards have to be on in disable_non_randomized even if Discard Shuffle is off. + # However, I don't think they should be hunt panels in this case. + self.player_options.disable_non_randomized_puzzles + and not self.player_options.shuffle_discarded_panels + and panel_obj["locationType"] == "Discard" + ) + ) + + def _get_eligible_panels(self) -> Tuple[List[str], Dict[str, Set[str]]]: + """ + There are some entities that are not allowed for panel hunt for various technical of gameplay reasons. + Make a list of all the ones that *are* eligible, plus a lookup of eligible panels per area. + """ + + all_eligible_panels = [ + panel for panel in ALL_HUNTABLE_PANELS + if self._entity_is_eligible(panel) + ] + + eligible_panels_by_area = defaultdict(set) + for eligible_panel in all_eligible_panels: + associated_area = static_witness_logic.ENTITIES_BY_HEX[eligible_panel]["area"]["name"] + eligible_panels_by_area[associated_area].add(eligible_panel) + + return all_eligible_panels, eligible_panels_by_area + + def _get_percentage_of_hunt_entities_by_area(self) -> Dict[str, float]: + hunt_entities_picked_so_far_prevent_div_0 = max(len(self.HUNT_ENTITIES), 1) + + contributing_percentage_per_area = {} + for area, eligible_entities in self.ELIGIBLE_ENTITIES_PER_AREA.items(): + amount_of_already_chosen_entities = len(self.ELIGIBLE_ENTITIES_PER_AREA[area] & self.HUNT_ENTITIES) + current_percentage = amount_of_already_chosen_entities / hunt_entities_picked_so_far_prevent_div_0 + contributing_percentage_per_area[area] = current_percentage + + return contributing_percentage_per_area + + def _get_next_random_batch(self, amount: int, same_area_discouragement: float) -> List[str]: + """ + Pick the next batch of hunt entities. + Areas that already have a lot of hunt entities in them will be discouraged from getting more. + The strength of this effect is controlled by the same_area_discouragement factor from the player's options. + """ + + percentage_of_hunt_entities_by_area = self._get_percentage_of_hunt_entities_by_area() + + max_percentage = max(percentage_of_hunt_entities_by_area.values()) + if max_percentage == 0: + allowance_per_area = {area: 1.0 for area in percentage_of_hunt_entities_by_area} + else: + allowance_per_area = { + area: (max_percentage - current_percentage) / max_percentage + for area, current_percentage in percentage_of_hunt_entities_by_area.items() + } + # use same_area_discouragement as lerp factor + allowance_per_area = { + area: (1.0 - same_area_discouragement) + (weight * same_area_discouragement) + for area, weight in allowance_per_area.items() + } + + assert min(allowance_per_area.values()) >= 0, ( + f"Somehow, an area had a negative weight when picking hunt entities: {allowance_per_area}" + ) + + remaining_entities, remaining_entity_weights = [], [] + for area, eligible_entities in self.ELIGIBLE_ENTITIES_PER_AREA.items(): + for panel in eligible_entities - self.HUNT_ENTITIES: + remaining_entities.append(panel) + remaining_entity_weights.append(allowance_per_area[area]) + + # I don't think this can ever happen, but let's be safe + if sum(remaining_entity_weights) == 0: + remaining_entity_weights = [1] * len(remaining_entity_weights) + + return self.random.choices(remaining_entities, weights=remaining_entity_weights, k=amount) + + def _pick_all_hunt_entities(self, total_amount: int) -> None: + """ + The core function of the EntityHuntPicker in which all Hunt Entities are picked, + respecting the player's choices for total amount and same area discouragement. + """ + same_area_discouragement = self.player_options.panel_hunt_discourage_same_area_factor / 100 + + # If we're using random picking, just choose all the entities now and return + if not same_area_discouragement: + hunt_entities = self.random.sample( + [entity for entity in self.ALL_ELIGIBLE_ENTITIES if entity not in self.HUNT_ENTITIES], + k=total_amount - len(self.HUNT_ENTITIES), + ) + self.HUNT_ENTITIES.update(hunt_entities) + return + + # If we're discouraging entities from the same area being picked, we have to pick entities one at a time + # For higher total counts, we do them in small batches for performance + batch_size = max(1, total_amount // 20) + + while len(self.HUNT_ENTITIES) < total_amount: + actual_amount_to_pick = min(batch_size, total_amount - len(self.HUNT_ENTITIES)) + + self.HUNT_ENTITIES.update(self._get_next_random_batch(actual_amount_to_pick, same_area_discouragement)) + + def _replace_unfair_hunt_entities_with_good_hunt_entities(self) -> None: + """ + For connected entities that "solve together", make sure that the one you're guaranteed + to be able to see and interact with first is the one that is chosen, so you don't get "surprise entities". + """ + + replacements = { + "0x18488": "0x00609", # Replace Swamp Sliding Bridge Underwater -> Swamp Sliding Bridge Above Water + "0x03676": "0x03678", # Replace Quarry Upper Ramp Control -> Lower Ramp Control + "0x03675": "0x03679", # Replace Quarry Upper Lift Control -> Lower Lift Control + + "0x03702": "0x15ADD", # Jungle Vault Box -> Jungle Vault Panel + "0x03542": "0x002A6", # Mountainside Vault Box -> Mountainside Vault Panel + "0x03481": "0x033D4", # Tutorial Vault Box -> Tutorial Vault Panel + "0x0339E": "0x0CC7B", # Desert Vault Box -> Desert Vault Panel + "0x03535": "0x00AFB", # Shipwreck Vault Box -> Shipwreck Vault Panel + } + + if self.player_options.shuffle_doors < 2: + replacements.update( + { + "0x334DC": "0x334DB", # In door shuffle, the Shadows Timer Panels are disconnected + "0x17CBC": "0x2700B", # In door shuffle, the Laser Timer Panels are disconnected + } + ) + + for bad_entitiy, good_entity in replacements.items(): + # If the bad entity was picked as a hunt entity ... + if bad_entitiy not in self.HUNT_ENTITIES: + continue + + # ... and the good entity was not ... + if good_entity in self.HUNT_ENTITIES or good_entity not in self.ALL_ELIGIBLE_ENTITIES: + continue + + # ... replace the bad entity with the good entity. + self.HUNT_ENTITIES.remove(bad_entitiy) + self.HUNT_ENTITIES.add(good_entity) + + def _log_results(self) -> None: + final_percentage_by_area = self._get_percentage_of_hunt_entities_by_area() + + sorted_area_percentages_dict = dict(sorted(final_percentage_by_area.items(), key=lambda x: x[1])) + sorted_area_percentages_dict_pretty_print = { + area: str(percentage) + (" (maxed)" if self.ELIGIBLE_ENTITIES_PER_AREA[area] <= self.HUNT_ENTITIES else "") + for area, percentage in sorted_area_percentages_dict.items() + } + player_name = self.player_name + discouragemenet_factor = self.player_options.panel_hunt_discourage_same_area_factor + debug( + f'Final area percentages for player "{player_name}" ({discouragemenet_factor} discouragement):\n' + f"{pformat(sorted_area_percentages_dict_pretty_print)}" + ) diff --git a/worlds/witness/generate_data_file.py b/worlds/witness/generate_data_file.py new file mode 100644 index 000000000000..50a63a374619 --- /dev/null +++ b/worlds/witness/generate_data_file.py @@ -0,0 +1,45 @@ +from collections import defaultdict + +from data import static_logic as static_witness_logic + +if __name__ == "__main__": + with open("data/APWitnessData.h", "w") as datafile: + datafile.write("""# pragma once + +# include +# include +# include + +""") + + area_to_location_ids = defaultdict(list) + area_to_entity_ids = defaultdict(list) + + for entity_id, entity_object in static_witness_logic.ENTITIES_BY_HEX.items(): + location_id = entity_object["id"] + + area = entity_object["area"]["name"] + area_to_entity_ids[area].append(entity_id) + + if location_id is None: + continue + + area_to_location_ids[area].append(str(location_id)) + + datafile.write("inline std::map> areaNameToLocationIDs = {\n") + datafile.write( + "\n".join( + '\t{"' + area + '", { ' + ", ".join(location_ids) + " }}," + for area, location_ids in area_to_location_ids.items() + ) + ) + datafile.write("\n};\n\n") + + datafile.write("inline std::map> areaNameToEntityIDs = {\n") + datafile.write( + "\n".join( + '\t{"' + area + '", { ' + ", ".join(entity_ids) + " }}," + for area, entity_ids in area_to_entity_ids.items() + ) + ) + datafile.write("\n};\n\n") diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py index a1ca1b081d3c..248c567b97ce 100644 --- a/worlds/witness/hints.py +++ b/worlds/witness/hints.py @@ -11,7 +11,8 @@ if TYPE_CHECKING: from . import WitnessWorld -CompactItemData = Tuple[str, Union[str, int], int] +CompactHintArgs = Tuple[Union[str, int], int] +CompactHintData = Tuple[str, Union[str, int], int] @dataclass @@ -35,6 +36,7 @@ class WitnessWordedHint: location: Optional[Location] = None area: Optional[str] = None area_amount: Optional[int] = None + area_hunt_panels: Optional[int] = None def get_always_hint_items(world: "WitnessWorld") -> List[str]: @@ -391,22 +393,22 @@ def get_hintable_areas(world: "WitnessWorld") -> Tuple[Dict[str, List[Location]] return locations_per_area, items_per_area -def word_area_hint(world: "WitnessWorld", hinted_area: str, corresponding_items: List[Item]) -> Tuple[str, int]: +def word_area_hint(world: "WitnessWorld", hinted_area: str, area_items: List[Item]) -> Tuple[str, int, Optional[int]]: """ Word the hint for an area using natural sounding language. This takes into account how much progression there is, how much of it is local/non-local, and whether there are any local lasers to be found in this area. """ - local_progression = sum(item.player == world.player and item.advancement for item in corresponding_items) - non_local_progression = sum(item.player != world.player and item.advancement for item in corresponding_items) + local_progression = sum(item.player == world.player and item.advancement for item in area_items) + non_local_progression = sum(item.player != world.player and item.advancement for item in area_items) laser_names = {"Symmetry Laser", "Desert Laser", "Quarry Laser", "Shadows Laser", "Town Laser", "Monastery Laser", "Jungle Laser", "Bunker Laser", "Swamp Laser", "Treehouse Laser", "Keep Laser", } local_lasers = sum( item.player == world.player and item.name in laser_names - for item in corresponding_items + for item in area_items ) total_progression = non_local_progression + local_progression @@ -415,11 +417,29 @@ def word_area_hint(world: "WitnessWorld", hinted_area: str, corresponding_items: area_progression_word = "Both" if total_progression == 2 else "All" + hint_string = f"In the {hinted_area} area, you will find " + + hunt_panels = None + if world.options.victory_condition == "panel_hunt": + hunt_panels = sum( + static_witness_logic.ENTITIES_BY_HEX[hunt_entity]["area"]["name"] == hinted_area + for hunt_entity in world.player_logic.HUNT_ENTITIES + ) + + if not hunt_panels: + hint_string += "no Hunt Panels and " + + elif hunt_panels == 1: + hint_string += "1 Hunt Panel and " + + else: + hint_string += f"{hunt_panels} Hunt Panels and " + if not total_progression: - hint_string = f"In the {hinted_area} area, you will find no progression items." + hint_string += "no progression items." elif total_progression == 1: - hint_string = f"In the {hinted_area} area, you will find 1 progression item." + hint_string += "1 progression item." if player_count > 1: if local_lasers: @@ -434,7 +454,7 @@ def word_area_hint(world: "WitnessWorld", hinted_area: str, corresponding_items: hint_string += "\nThis item is a laser." else: - hint_string = f"In the {hinted_area} area, you will find {total_progression} progression items." + hint_string += f"{total_progression} progression items." if local_lasers == total_progression: sentence_end = (" for this world." if player_count > 1 else ".") @@ -471,7 +491,7 @@ def word_area_hint(world: "WitnessWorld", hinted_area: str, corresponding_items: elif local_lasers: hint_string += f"\n{local_lasers} of them are lasers." - return hint_string, total_progression + return hint_string, total_progression, hunt_panels def make_area_hints(world: "WitnessWorld", amount: int, already_hinted_locations: Set[Location] @@ -483,9 +503,9 @@ def make_area_hints(world: "WitnessWorld", amount: int, already_hinted_locations hints = [] for hinted_area in hinted_areas: - hint_string, prog_amount = word_area_hint(world, hinted_area, items_per_area[hinted_area]) + hint_string, prog_amount, hunt_panels = word_area_hint(world, hinted_area, items_per_area[hinted_area]) - hints.append(WitnessWordedHint(hint_string, None, f"hinted_area:{hinted_area}", prog_amount)) + hints.append(WitnessWordedHint(hint_string, None, f"hinted_area:{hinted_area}", prog_amount, hunt_panels)) if len(hinted_areas) < amount: player_name = world.multiworld.get_player_name(world.player) @@ -585,29 +605,42 @@ def create_all_hints(world: "WitnessWorld", hint_amount: int, area_hints: int, return generated_hints -def make_compact_hint_data(hint: WitnessWordedHint, local_player_number: int) -> CompactItemData: +def get_compact_hint_args(hint: WitnessWordedHint, local_player_number: int) -> CompactHintArgs: + """ + Arg reference: + + Area Hint: 1st Arg is the amount of area progression and hunt panels. 2nd Arg is the name of the area. + Location Hint: 1st Arg is the location's address, second arg is the player number the location belongs to. + Junk Hint: 1st Arg is -1, second arg is this slot's player number. + """ + + # Is Area Hint + if hint.area is not None: + assert hint.area_amount is not None, "Area hint had an undefined progression amount." + + area_amount = hint.area_amount + hunt_panels = hint.area_hunt_panels + + area_and_hunt_panels = area_amount + # Encode amounts together + if hunt_panels: + area_and_hunt_panels += 0x100 * hunt_panels + + return hint.area, area_and_hunt_panels + location = hint.location - area_amount = hint.area_amount - # -1 if junk hint, address if location hint, area string if area hint - arg_1: Union[str, int] + # Is location hint if location and location.address is not None: - arg_1 = location.address - elif hint.area is not None: - arg_1 = hint.area - else: - arg_1 = -1 - - # self.player if junk hint, player if location hint, progression amount if area hint - arg_2: int - if area_amount is not None: - arg_2 = area_amount - elif location is not None: - arg_2 = location.player - else: - arg_2 = local_player_number + return location.address, location.player + + # Is junk / undefined hint + return -1, local_player_number + - return hint.wording, arg_1, arg_2 +def make_compact_hint_data(hint: WitnessWordedHint, local_player_number: int) -> CompactHintData: + compact_arg_1, compact_arg_2 = get_compact_hint_args(hint, local_player_number) + return hint.wording, compact_arg_1, compact_arg_2 def make_laser_hints(world: "WitnessWorld", laser_names: List[str]) -> Dict[str, WitnessWordedHint]: diff --git a/worlds/witness/locations.py b/worlds/witness/locations.py index 1796f051b896..f1c16550399a 100644 --- a/worlds/witness/locations.py +++ b/worlds/witness/locations.py @@ -50,7 +50,7 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic) -> N self.CHECK_PANELHEX_TO_ID = { static_witness_logic.ENTITIES_BY_NAME[ch]["entity_hex"]: static_witness_locations.ALL_LOCATIONS_TO_ID[ch] for ch in self.CHECK_LOCATIONS - if static_witness_logic.ENTITIES_BY_NAME[ch]["entityType"] in self.PANEL_TYPES_TO_SHUFFLE + if static_witness_logic.ENTITIES_BY_NAME[ch]["locationType"] in self.PANEL_TYPES_TO_SHUFFLE } dog_hex = static_witness_logic.ENTITIES_BY_NAME["Town Pet the Dog"]["entity_hex"] @@ -61,11 +61,9 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic) -> N sorted(self.CHECK_PANELHEX_TO_ID.items(), key=lambda item: item[1]) ) - event_locations = set(player_logic.USED_EVENT_NAMES_BY_HEX) - self.EVENT_LOCATION_TABLE = { - static_witness_locations.get_event_name(entity_hex): None - for entity_hex in event_locations + event_location: None + for event_location in player_logic.EVENT_ITEM_PAIRS } check_dict = { diff --git a/worlds/witness/options.py b/worlds/witness/options.py index 4855fc715933..bdeccfe3b2db 100644 --- a/worlds/witness/options.py +++ b/worlds/witness/options.py @@ -173,6 +173,7 @@ class VictoryCondition(Choice): - Challenge: Beat the secret Challenge (requires Challenge Lasers). - Mountain Box Short: Input the short solution to the Mountaintop Box (requires Mountain Lasers). - Mountain Box Long: Input the long solution to the Mountaintop Box (requires Challenge Lasers). + - Panel Hunt: Solve a specific number of randomly selected panels before going to the secret ending in Tutorial. It is important to note that while the Mountain Box requires Desert Laser to be redirected in Town for that laser to count, the laser locks on the Elevator and Challenge Timer panels do not. @@ -182,6 +183,62 @@ class VictoryCondition(Choice): option_challenge = 1 option_mountain_box_short = 2 option_mountain_box_long = 3 + option_panel_hunt = 4 + + +class PanelHuntTotal(Range): + """ + Sets the number of random panels that will get marked as "Panel Hunt" panels in the "Panel Hunt" game mode. + """ + display_name = "Total Panel Hunt panels" + range_start = 5 + range_end = 100 + default = 40 + + +class PanelHuntRequiredPercentage(Range): + """ + Determines the percentage of "Panel Hunt" panels that need to be solved to win. + """ + display_name = "Percentage of required Panel Hunt panels" + range_start = 20 + range_end = 100 + default = 63 + + +class PanelHuntPostgame(Choice): + """ + In panel hunt, there are technically no postgame locations. + Depending on your options, this can leave Mountain and Caves as two huge areas with Hunt Panels in them that cannot be reached until you get enough lasers to go through the very linear Mountain descent. + Panel Hunt tends to be more fun when the world is open. + This option lets you force anything locked by lasers to be disabled, and thus ineligible for Hunt Panels. + To compensate, the respective mountain box solution (short box / long box) will be forced to be a Hunt Panel. + Does nothing if Panel Hunt is not your victory condition. + + Note: The "Mountain Lasers" option may also affect locations locked by challenge lasers if the only path to those locations leads through the Mountain Entry. + """ + + display_name = "Force postgame in Panel Hunt" + + option_everything_is_eligible = 0 + option_disable_mountain_lasers_locations = 1 + option_disable_challenge_lasers_locations = 2 + option_disable_anything_locked_by_lasers = 3 + default = 3 + + +class PanelHuntDiscourageSameAreaFactor(Range): + """ + The greater this value, the less likely it is that many Hunt Panels show up in the same area. + + At 0, Hunt Panels will be selected randomly. + At 100, Hunt Panels will be almost completely evenly distributed between areas. + """ + display_name = "Panel Hunt Discourage Same Area Factor" + + range_start = 0 + range_end = 100 + default = 40 class PuzzleRandomization(Choice): @@ -332,6 +389,10 @@ class TheWitnessOptions(PerGameCommonOptions): victory_condition: VictoryCondition mountain_lasers: MountainLasers challenge_lasers: ChallengeLasers + panel_hunt_total: PanelHuntTotal + panel_hunt_required_percentage: PanelHuntRequiredPercentage + panel_hunt_postgame: PanelHuntPostgame + panel_hunt_discourage_same_area_factor: PanelHuntDiscourageSameAreaFactor early_caves: EarlyCaves early_symbol_item: EarlySymbolItem elevators_come_to_you: ElevatorsComeToYou @@ -352,6 +413,12 @@ class TheWitnessOptions(PerGameCommonOptions): MountainLasers, ChallengeLasers, ]), + OptionGroup("Panel Hunt Settings", [ + PanelHuntRequiredPercentage, + PanelHuntTotal, + PanelHuntPostgame, + PanelHuntDiscourageSameAreaFactor, + ], start_collapsed=True), OptionGroup("Locations", [ ShuffleDiscardedPanels, ShuffleVaultBoxes, diff --git a/worlds/witness/player_items.py b/worlds/witness/player_items.py index 718fd7d172ba..44a959f2b428 100644 --- a/worlds/witness/player_items.py +++ b/worlds/witness/player_items.py @@ -97,7 +97,7 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic, # Add event items to the item definition list for later lookup. for event_location in self._locations.EVENT_LOCATION_TABLE: - location_name = player_logic.EVENT_ITEM_PAIRS[event_location] + location_name = player_logic.EVENT_ITEM_PAIRS[event_location][0] self.item_data[location_name] = ItemData(None, ItemDefinition(0, ItemCategory.EVENT), ItemClassification.progression, False) diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py index e8d11f43f51c..5125dfef0aa1 100644 --- a/worlds/witness/player_logic.py +++ b/worlds/witness/player_logic.py @@ -17,7 +17,6 @@ import copy from collections import defaultdict -from logging import warning from typing import TYPE_CHECKING, Dict, List, Set, Tuple, cast from .data import static_logic as static_witness_logic @@ -36,6 +35,7 @@ get_early_caves_list, get_early_caves_start_list, get_elevators_come_to_you, + get_entity_hunt, get_ep_all_individual, get_ep_easy, get_ep_no_eclipse, @@ -51,6 +51,7 @@ logical_or_witness_rules, parse_lambda, ) +from .entity_hunt import EntityHuntPicker if TYPE_CHECKING: from . import WitnessWorld @@ -60,7 +61,7 @@ class WitnessPlayerLogic: """WITNESS LOGIC CLASS""" VICTORY_LOCATION: str - + def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_inv: Dict[str, int]) -> None: self.YAML_DISABLED_LOCATIONS: Set[str] = disabled_locations self.YAML_ADDED_ITEMS: Dict[str, int] = start_inv @@ -104,7 +105,7 @@ def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_in ) self.REQUIREMENTS_BY_HEX: Dict[str, WitnessRule] = {} - self.EVENT_ITEM_PAIRS: Dict[str, str] = {} + self.EVENT_ITEM_PAIRS: Dict[str, Tuple[str, str]] = {} self.COMPLETELY_DISABLED_ENTITIES: Set[str] = set() self.DISABLE_EVERYTHING_BEHIND: Set[str] = set() self.PRECOMPLETED_LOCATIONS: Set[str] = set() @@ -112,6 +113,9 @@ def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_in self.ADDED_CHECKS: Set[str] = set() self.VICTORY_LOCATION = "0x0356B" + self.PRE_PICKED_HUNT_ENTITIES: Set[str] = set() + self.HUNT_ENTITIES: Set[str] = set() + self.ALWAYS_EVENT_NAMES_BY_HEX = { "0x00509": "+1 Laser (Symmetry Laser)", "0x012FB": "+1 Laser (Desert Laser)", @@ -129,7 +133,7 @@ def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_in "0xFFF00": "Bottom Floor Discard Turns On", } - self.USED_EVENT_NAMES_BY_HEX: Dict[str, str] = {} + self.USED_EVENT_NAMES_BY_HEX: Dict[str, List[str]] = {} self.CONDITIONAL_EVENTS: Dict[Tuple[str, str], str] = {} # The basic requirements to solve each entity come from StaticWitnessLogic. @@ -142,6 +146,10 @@ def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_in # This will make the access conditions way faster, instead of recursively checking dependent entities each time. self.make_dependency_reduced_checklist() + if world.options.victory_condition == "panel_hunt": + picker = EntityHuntPicker(self, world, self.PRE_PICKED_HUNT_ENTITIES) + self.HUNT_ENTITIES = picker.pick_panel_hunt_panels(world.options.panel_hunt_total.value) + # Finalize which items actually exist in the MultiWorld and which get grouped into progressive items. self.finalize_items() @@ -226,7 +234,7 @@ def reduce_req_within_region(self, entity_hex: str) -> WitnessRule: dep_obj = self.REFERENCE_LOGIC.ENTITIES_BY_HEX.get(option_entity, {}) if option_entity in {"7 Lasers", "11 Lasers", "7 Lasers + Redirect", "11 Lasers + Redirect", - "PP2 Weirdness", "Theater to Tunnels"}: + "PP2 Weirdness", "Theater to Tunnels", "Entity Hunt"}: new_items = frozenset({frozenset([option_entity])}) elif option_entity in self.DISABLE_EVERYTHING_BEHIND: new_items = frozenset() @@ -241,12 +249,12 @@ def reduce_req_within_region(self, entity_hex: str) -> WitnessRule: # If the dependent entity is unsolvable and is NOT an EP, this requirement option is invalid. new_items = frozenset() elif option_entity in self.ALWAYS_EVENT_NAMES_BY_HEX: - new_items = frozenset({frozenset([option_entity])}) + new_items = frozenset({frozenset([self.ALWAYS_EVENT_NAMES_BY_HEX[option_entity]])}) elif (entity_hex, option_entity) in self.CONDITIONAL_EVENTS: - new_items = frozenset({frozenset([option_entity])}) - self.USED_EVENT_NAMES_BY_HEX[option_entity] = self.CONDITIONAL_EVENTS[ - (entity_hex, option_entity) - ] + new_items = frozenset({frozenset([self.CONDITIONAL_EVENTS[(entity_hex, option_entity)]])}) + self.USED_EVENT_NAMES_BY_HEX[option_entity].append( + self.CONDITIONAL_EVENTS[(entity_hex, option_entity)] + ) else: new_items = theoretical_new_items if dep_obj["region"] and entity_obj["region"] != dep_obj["region"]: @@ -404,7 +412,7 @@ def make_single_adjustment(self, adj_type: str, line: str) -> None: line = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[line]["checkName"] self.ADDED_CHECKS.add(line) - def handle_postgame(self, world: "WitnessWorld") -> List[List[str]]: + def handle_regular_postgame(self, world: "WitnessWorld") -> List[List[str]]: """ In shuffle_postgame, panels that become accessible "after or at the same time as the goal" are disabled. This mostly involves the disabling of key panels (e.g. long box when the goal is short box). @@ -435,6 +443,7 @@ def handle_postgame(self, world: "WitnessWorld") -> List[List[str]]: # If we have a long box goal, Challenge is behind the amount of lasers required to just win. # This is technically slightly incorrect as the Challenge Vault Box could contain a *symbol* that is required # to open Mountain Entry (Stars 2). However, since there is a very easy sphere 1 snipe, this is not considered. + if victory == "mountain_box_long": postgame_adjustments.append(["Disabled Locations:", "0x0A332 (Challenge Timer Start)"]) @@ -479,6 +488,42 @@ def handle_postgame(self, world: "WitnessWorld") -> List[List[str]]: return postgame_adjustments + def handle_panelhunt_postgame(self, world: "WitnessWorld") -> List[List[str]]: + postgame_adjustments = [] + + # Make some quick references to some options + panel_hunt_postgame = world.options.panel_hunt_postgame + chal_lasers = world.options.challenge_lasers + + disable_mountain_lasers = ( + panel_hunt_postgame == "disable_mountain_lasers_locations" + or panel_hunt_postgame == "disable_anything_locked_by_lasers" + ) + + disable_challenge_lasers = ( + panel_hunt_postgame == "disable_challenge_lasers_locations" + or panel_hunt_postgame == "disable_anything_locked_by_lasers" + ) + + if disable_mountain_lasers: + self.DISABLE_EVERYTHING_BEHIND.add("0x09F7F") # Short box + self.PRE_PICKED_HUNT_ENTITIES.add("0x09F7F") + self.COMPLETELY_DISABLED_ENTITIES.add("0x3D9A9") # Elevator Start + + # If mountain lasers are disabled, and challenge lasers > 7, the box will need to be rotated + if chal_lasers > 7: + postgame_adjustments.append([ + "Requirement Changes:", + "0xFFF00 - 11 Lasers - True", + ]) + + if disable_challenge_lasers: + self.DISABLE_EVERYTHING_BEHIND.add("0xFFF00") # Long box + self.PRE_PICKED_HUNT_ENTITIES.add("0xFFF00") + self.COMPLETELY_DISABLED_ENTITIES.add("0x0A332") # Challenge Timer + + return postgame_adjustments + def make_options_adjustments(self, world: "WitnessWorld") -> None: """Makes logic adjustments based on options""" adjustment_linesets_in_order = [] @@ -500,10 +545,17 @@ def make_options_adjustments(self, world: "WitnessWorld") -> None: self.VICTORY_LOCATION = "0x09F7F" elif victory == "mountain_box_long": self.VICTORY_LOCATION = "0xFFF00" + elif victory == "panel_hunt": + self.VICTORY_LOCATION = "0x03629" + self.COMPLETELY_DISABLED_ENTITIES.add("0x3352F") # Exclude panels from the post-game if shuffle_postgame is false. - if not world.options.shuffle_postgame: - adjustment_linesets_in_order += self.handle_postgame(world) + if not world.options.shuffle_postgame and victory != "panel_hunt": + adjustment_linesets_in_order += self.handle_regular_postgame(world) + + # Exclude panels from the post-game if shuffle_postgame is false. + if victory == "panel_hunt" and world.options.panel_hunt_postgame: + adjustment_linesets_in_order += self.handle_panelhunt_postgame(world) # Exclude Discards / Vaults if not world.options.shuffle_discarded_panels: @@ -570,6 +622,9 @@ def make_options_adjustments(self, world: "WitnessWorld") -> None: if world.options.elevators_come_to_you: adjustment_linesets_in_order.append(get_elevators_come_to_you()) + if world.options.victory_condition == "panel_hunt": + adjustment_linesets_in_order.append(get_entity_hunt()) + for item in self.YAML_ADDED_ITEMS: adjustment_linesets_in_order.append(["Items:", item]) @@ -603,7 +658,7 @@ def make_options_adjustments(self, world: "WitnessWorld") -> None: if loc_obj["entityType"] == "EP": self.COMPLETELY_DISABLED_ENTITIES.add(loc_obj["entity_hex"]) - elif loc_obj["entityType"] in {"General", "Vault", "Discard"}: + elif loc_obj["entityType"] == "Panel": self.EXCLUDED_LOCATIONS.add(loc_obj["entity_hex"]) for adjustment_lineset in adjustment_linesets_in_order: @@ -686,6 +741,7 @@ def find_unsolvable_entities(self, world: "WitnessWorld") -> None: # Check if any regions have become unreachable. reachable_regions = self.discover_reachable_regions() new_unreachable_regions = all_regions - reachable_regions - self.UNREACHABLE_REGIONS + if new_unreachable_regions: self.UNREACHABLE_REGIONS.update(new_unreachable_regions) @@ -741,9 +797,12 @@ def reduce_connection_requirement(self, connection: Tuple[str, WitnessRule]) -> if not self.solvability_guaranteed(entity) or entity in self.DISABLE_EVERYTHING_BEHIND: individual_entity_requirements.append(frozenset()) # If a connection requires acquiring an event, add that event to its requirements. - elif (entity in self.ALWAYS_EVENT_NAMES_BY_HEX - or entity not in self.REFERENCE_LOGIC.ENTITIES_BY_HEX): + elif entity not in self.REFERENCE_LOGIC.ENTITIES_BY_HEX: individual_entity_requirements.append(frozenset({frozenset({entity})})) + elif entity in self.ALWAYS_EVENT_NAMES_BY_HEX: + individual_entity_requirements.append( + frozenset({frozenset({self.ALWAYS_EVENT_NAMES_BY_HEX[entity]})}) + ) # If a connection requires entities, use their newly calculated independent requirements. else: entity_req = self.get_entity_requirement(entity) @@ -778,7 +837,7 @@ def make_dependency_reduced_checklist(self) -> None: # We also clear any data structures that we might have filled in a previous dependency reduction self.REQUIREMENTS_BY_HEX = {} - self.USED_EVENT_NAMES_BY_HEX = {} + self.USED_EVENT_NAMES_BY_HEX = defaultdict(list) self.CONNECTIONS_BY_REGION_NAME = {} self.PROG_ITEMS_ACTUALLY_IN_THE_GAME_NO_MULTI = set() @@ -868,7 +927,6 @@ def determine_unrequired_entities(self, world: "WitnessWorld") -> None: "0x17CC4": come_to_you or eps_shuffled, # Quarry Elevator Panel "0x17E2B": come_to_you and boat_shuffled or eps_shuffled, # Swamp Long Bridge "0x0CF2A": False, # Jungle Monastery Garden Shortcut - "0x17CAA": remote_doors, # Jungle Monastery Garden Shortcut Panel "0x0364E": False, # Monastery Laser Shortcut Door "0x03713": remote_doors, # Monastery Laser Shortcut Panel "0x03313": False, # Orchard Second Gate @@ -884,23 +942,17 @@ def determine_unrequired_entities(self, world: "WitnessWorld") -> None: # Jungle Popup Wall Panel } + # In panel hunt, all panels are game, so all panels need to be reachable (unless disabled) + if goal == "panel_hunt": + for entity_hex in is_item_required_dict: + if static_witness_logic.ENTITIES_BY_HEX[entity_hex]["entityType"] == "Panel": + is_item_required_dict[entity_hex] = True + # Now, return the keys of the dict entries where the result is False to get unrequired major items self.ENTITIES_WITHOUT_ENSURED_SOLVABILITY |= { item_name for item_name, is_required in is_item_required_dict.items() if not is_required } - def make_event_item_pair(self, entity_hex: str) -> Tuple[str, str]: - """ - Makes a pair of an event panel and its event item - """ - action = " Opened" if self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity_hex]["entityType"] == "Door" else " Solved" - - name = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity_hex]["checkName"] + action - if entity_hex not in self.USED_EVENT_NAMES_BY_HEX: - warning(f'Entity "{name}" does not have an associated event name.') - self.USED_EVENT_NAMES_BY_HEX[entity_hex] = name + " Event" - return (name, self.USED_EVENT_NAMES_BY_HEX[entity_hex]) - def make_event_panel_lists(self) -> None: """ Makes event-item pairs for entities with associated events, unless these entities are disabled. @@ -908,13 +960,36 @@ def make_event_panel_lists(self) -> None: self.ALWAYS_EVENT_NAMES_BY_HEX[self.VICTORY_LOCATION] = "Victory" - self.USED_EVENT_NAMES_BY_HEX.update(self.ALWAYS_EVENT_NAMES_BY_HEX) + for event_hex, event_name in self.ALWAYS_EVENT_NAMES_BY_HEX.items(): + self.USED_EVENT_NAMES_BY_HEX[event_hex].append(event_name) self.USED_EVENT_NAMES_BY_HEX = { - event_hex: event_name for event_hex, event_name in self.USED_EVENT_NAMES_BY_HEX.items() + event_hex: event_list for event_hex, event_list in self.USED_EVENT_NAMES_BY_HEX.items() if self.solvability_guaranteed(event_hex) } - for panel in self.USED_EVENT_NAMES_BY_HEX: - pair = self.make_event_item_pair(panel) - self.EVENT_ITEM_PAIRS[pair[0]] = pair[1] + for entity_hex, event_names in self.USED_EVENT_NAMES_BY_HEX.items(): + entity_obj = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity_hex] + entity_name = entity_obj["checkName"] + entity_type = entity_obj["entityType"] + + if entity_type == "Door": + action = " Opened" + elif entity_type == "Laser": + action = " Activated" + else: + action = " Solved" + + for i, event_name in enumerate(event_names): + if i == 0: + self.EVENT_ITEM_PAIRS[entity_name + action] = (event_name, entity_hex) + else: + self.EVENT_ITEM_PAIRS[entity_name + action + f" (Effect {i + 1})"] = (event_name, entity_hex) + + # Make Panel Hunt Events + for entity_hex in self.HUNT_ENTITIES: + entity_obj = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity_hex] + entity_name = entity_obj["checkName"] + self.EVENT_ITEM_PAIRS[entity_name + " (Panel Hunt)"] = ("+1 Panel Hunt", entity_hex) + + return diff --git a/worlds/witness/regions.py b/worlds/witness/regions.py index 2528c8abe22b..6d1f8093af85 100644 --- a/worlds/witness/regions.py +++ b/worlds/witness/regions.py @@ -9,7 +9,6 @@ from worlds.generic.Rules import CollectionRule -from .data import static_locations as static_witness_locations from .data import static_logic as static_witness_logic from .data.static_logic import StaticWitnessLogicObj from .data.utils import WitnessRule, optimize_witness_rule @@ -111,16 +110,24 @@ def create_regions(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic if k not in player_logic.UNREACHABLE_REGIONS } + event_locations_per_region = defaultdict(list) + + for event_location, event_item_and_entity in player_logic.EVENT_ITEM_PAIRS.items(): + region = static_witness_logic.ENTITIES_BY_HEX[event_item_and_entity[1]]["region"] + if region is None: + region_name = "Entry" + else: + region_name = region["name"] + event_locations_per_region[region_name].append(event_location) + for region_name, region in regions_to_create.items(): locations_for_this_region = [ self.reference_logic.ENTITIES_BY_HEX[panel]["checkName"] for panel in region["entities"] if self.reference_logic.ENTITIES_BY_HEX[panel]["checkName"] in self.player_locations.CHECK_LOCATION_TABLE ] - locations_for_this_region += [ - static_witness_locations.get_event_name(panel) for panel in region["entities"] - if static_witness_locations.get_event_name(panel) in self.player_locations.EVENT_LOCATION_TABLE - ] + + locations_for_this_region += event_locations_per_region[region_name] all_locations = all_locations | set(locations_for_this_region) diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py index fc4e638e36c3..eecea8f30bf0 100644 --- a/worlds/witness/rules.py +++ b/worlds/witness/rules.py @@ -10,7 +10,6 @@ from .data import static_logic as static_witness_logic from .data.utils import WitnessRule -from .locations import WitnessPlayerLocations from .player_logic import WitnessPlayerLogic if TYPE_CHECKING: @@ -31,42 +30,37 @@ ] -def _has_laser(laser_hex: str, world: "WitnessWorld", player: int, redirect_required: bool) -> CollectionRule: +def _can_do_panel_hunt(world: "WitnessWorld") -> CollectionRule: + required = world.panel_hunt_required_count + player = world.player + return lambda state: state.has("+1 Panel Hunt", player, required) + + +def _has_laser(laser_hex: str, world: "WitnessWorld", redirect_required: bool) -> CollectionRule: + player = world.player + laser_name = static_witness_logic.ENTITIES_BY_HEX[laser_hex]["checkName"] + + # Workaround for intentional naming inconsistency + if laser_name == "Symmetry Island Laser": + laser_name = "Symmetry Laser" + if laser_hex == "0x012FB" and redirect_required: - return lambda state: ( - _can_solve_panel(laser_hex, world, world.player, world.player_logic, world.player_locations)(state) - and state.has("Desert Laser Redirection", player) - ) + return lambda state: state.has_all([f"+1 Laser ({laser_name})", "Desert Laser Redirection"], player) - return _can_solve_panel(laser_hex, world, world.player, world.player_logic, world.player_locations) + return lambda state: state.has(f"+1 Laser ({laser_name})", player) def _has_lasers(amount: int, world: "WitnessWorld", redirect_required: bool) -> CollectionRule: laser_lambdas = [] for laser_hex in laser_hexes: - has_laser_lambda = _has_laser(laser_hex, world, world.player, redirect_required) + has_laser_lambda = _has_laser(laser_hex, world, redirect_required) laser_lambdas.append(has_laser_lambda) return lambda state: sum(laser_lambda(state) for laser_lambda in laser_lambdas) >= amount -def _can_solve_panel(panel: str, world: "WitnessWorld", player: int, player_logic: WitnessPlayerLogic, - player_locations: WitnessPlayerLocations) -> CollectionRule: - """ - Determines whether a panel can be solved - """ - - panel_obj = player_logic.REFERENCE_LOGIC.ENTITIES_BY_HEX[panel] - entity_name = panel_obj["checkName"] - - if entity_name + " Solved" in player_locations.EVENT_LOCATION_TABLE: - return lambda state: state.has(player_logic.EVENT_ITEM_PAIRS[entity_name + " Solved"], player) - - return make_lambda(panel, world) - - def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: """ For Expert PP2, you need a way to access PP2 from the front, and a separate way from the back. @@ -202,8 +196,9 @@ def _can_do_theater_to_tunnels(state: CollectionState, world: "WitnessWorld") -> ) -def _has_item(item: str, world: "WitnessWorld", player: int, - player_logic: WitnessPlayerLogic, player_locations: WitnessPlayerLocations) -> CollectionRule: +def _has_item(item: str, world: "WitnessWorld", player: int, player_logic: WitnessPlayerLogic) -> CollectionRule: + assert item not in static_witness_logic.ENTITIES_BY_HEX, "Requirements can no longer contain entity hexes directly." + if item in player_logic.REFERENCE_LOGIC.ALL_REGIONS_BY_NAME: region = world.get_region(item) return region.can_reach @@ -219,12 +214,13 @@ def _has_item(item: str, world: "WitnessWorld", player: int, if item == "11 Lasers + Redirect": laser_req = world.options.challenge_lasers.value return _has_lasers(laser_req, world, True) + if item == "Entity Hunt": + # Right now, panel hunt is the only type of entity hunt. This may need to be changed later + return _can_do_panel_hunt(world) if item == "PP2 Weirdness": return lambda state: _can_do_expert_pp2(state, world) if item == "Theater to Tunnels": return lambda state: _can_do_theater_to_tunnels(state, world) - if item in player_logic.USED_EVENT_NAMES_BY_HEX: - return _can_solve_panel(item, world, player, player_logic, player_locations) prog_item = static_witness_logic.get_parent_progressive_item(item) return lambda state: state.has(prog_item, player, player_logic.MULTI_AMOUNTS[item]) @@ -237,7 +233,7 @@ def _meets_item_requirements(requirements: WitnessRule, world: "WitnessWorld") - """ lambda_conversion = [ - [_has_item(item, world, world.player, world.player_logic, world.player_locations) for item in subset] + [_has_item(item, world, world.player, world.player_logic) for item in subset] for subset in requirements ] @@ -265,7 +261,8 @@ def set_rules(world: "WitnessWorld") -> None: real_location = location if location in world.player_locations.EVENT_LOCATION_TABLE: - real_location = location[:-7] + entity_hex = world.player_logic.EVENT_ITEM_PAIRS[location][1] + real_location = static_witness_logic.ENTITIES_BY_HEX[entity_hex]["checkName"] associated_entity = world.player_logic.REFERENCE_LOGIC.ENTITIES_BY_NAME[real_location] entity_hex = associated_entity["entity_hex"] diff --git a/worlds/witness/test/__init__.py b/worlds/witness/test/__init__.py index 0a24467feab2..d1b90ca47d9e 100644 --- a/worlds/witness/test/__init__.py +++ b/worlds/witness/test/__init__.py @@ -159,3 +159,36 @@ def get_items_by_name(self, item_names: Union[str, Iterable[str]], player: int) if isinstance(item_names, str): item_names = (item_names,) return [item for item in self.multiworld.itempool if item.name in item_names and item.player == player] + + def assert_location_exists(self, location_name: str, player: int, strict_check: bool = True) -> None: + """ + Assert that a location exists in this world. + If strict_check, also make sure that this (non-event) location COULD exist. + """ + + world = self.multiworld.worlds[player] + + if strict_check: + self.assertIn(location_name, world.location_name_to_id, f"Location {location_name} can never exist") + + try: + world.get_location(location_name) + except KeyError: + self.fail(f"Location {location_name} does not exist.") + + def assert_location_does_not_exist(self, location_name: str, player: int, strict_check: bool = True) -> None: + """ + Assert that a location exists in this world. + If strict_check, be explicit about whether the location could exist in the first place. + """ + + world = self.multiworld.worlds[player] + + if strict_check: + self.assertIn(location_name, world.location_name_to_id, f"Location {location_name} can never exist") + + self.assertRaises( + KeyError, + lambda _: world.get_location(location_name), + f"Location {location_name} exists, but is not supposed to.", + ) diff --git a/worlds/witness/test/test_panel_hunt.py b/worlds/witness/test/test_panel_hunt.py new file mode 100644 index 000000000000..7b405f29ec1d --- /dev/null +++ b/worlds/witness/test/test_panel_hunt.py @@ -0,0 +1,107 @@ +from BaseClasses import CollectionState, Item +from worlds.witness.test import WitnessTestBase, WitnessMultiworldTestBase + + +class TestMaxPanelHuntMinChecks(WitnessTestBase): + options = { + "victory_condition": "panel_hunt", + "panel_hunt_total": 100, + "panel_hunt_required_percentage": 100, + "panel_hunt_postgame": "disable_anything_locked_by_lasers", + "disable_non_randomized_puzzles": True, + "shuffle_discarded_panels": False, + "shuffle_vault_boxes": False, + } + + def test_correct_panels_were_picked(self): + with self.subTest("Check that 100 Hunt Panels were actually picked."): + self.assertEqual(len(self.multiworld.find_item_locations("+1 Panel Hunt", self.player)), 100) + + with self.subTest("Check that 100 Hunt Panels are enough"): + state_100 = CollectionState(self.multiworld) + panel_hunt_item = self.get_item_by_name("+1 Panel Hunt") + + for _ in range(100): + state_100.collect(panel_hunt_item, True) + state_100.sweep_for_events(False, [self.world.get_location("Tutorial Gate Open Solved")]) + + self.assertTrue(self.multiworld.completion_condition[self.player](state_100)) + + with self.subTest("Check that 99 Hunt Panels are not enough"): + state_99 = CollectionState(self.multiworld) + panel_hunt_item = self.get_item_by_name("+1 Panel Hunt") + + for _ in range(99): + state_99.collect(panel_hunt_item, True) + state_99.sweep_for_events(False, [self.world.get_location("Tutorial Gate Open Solved")]) + + self.assertFalse(self.multiworld.completion_condition[self.player](state_99)) + + +class TestPanelHuntPostgame(WitnessMultiworldTestBase): + options_per_world = [ + { + "panel_hunt_postgame": "everything_is_eligible" + }, + { + "panel_hunt_postgame": "disable_mountain_lasers_locations" + }, + { + "panel_hunt_postgame": "disable_challenge_lasers_locations" + }, + { + "panel_hunt_postgame": "disable_anything_locked_by_lasers" + }, + ] + + common_options = { + "victory_condition": "panel_hunt", + "panel_hunt_total": 40, + + # Make sure we can check for Short vs Long Lasers locations by making Mountain Bottom Floor Discard accessible. + "shuffle_doors": "doors", + "shuffle_discarded_panels": True, + } + + def test_panel_hunt_postgame(self): + for player_minus_one, options in enumerate(self.options_per_world): + player = player_minus_one + 1 + postgame_option = options["panel_hunt_postgame"] + with self.subTest(f"Test that \"{postgame_option}\" results in 40 Hunt Panels."): + self.assertEqual(len(self.multiworld.find_item_locations("+1 Panel Hunt", player)), 40) + + # Test that the box gets extra checks from panel_hunt_postgame + + with self.subTest("Test that \"everything_is_eligible\" has no Mountaintop Box Hunt Panels."): + self.assert_location_does_not_exist("Mountaintop Box Short (Panel Hunt)", 1, strict_check=False) + self.assert_location_does_not_exist("Mountaintop Box Long (Panel Hunt)", 1, strict_check=False) + + with self.subTest("Test that \"disable_mountain_lasers_locations\" has a Hunt Panel for Short, but not Long."): + self.assert_location_exists("Mountaintop Box Short (Panel Hunt)", 2, strict_check=False) + self.assert_location_does_not_exist("Mountaintop Box Long (Panel Hunt)", 2, strict_check=False) + + with self.subTest("Test that \"disable_challenge_lasers_locations\" has a Hunt Panel for Long, but not Short."): + self.assert_location_does_not_exist("Mountaintop Box Short (Panel Hunt)", 3, strict_check=False) + self.assert_location_exists("Mountaintop Box Long (Panel Hunt)", 3, strict_check=False) + + with self.subTest("Test that \"disable_anything_locked_by_lasers\" has both Mountaintop Box Hunt Panels."): + self.assert_location_exists("Mountaintop Box Short (Panel Hunt)", 4, strict_check=False) + self.assert_location_exists("Mountaintop Box Long (Panel Hunt)", 4, strict_check=False) + + # Check panel_hunt_postgame locations get disabled + + with self.subTest("Test that \"everything_is_eligible\" does not disable any locked-by-lasers panels."): + self.assert_location_exists("Mountain Floor 1 Right Row 5", 1) + self.assert_location_exists("Mountain Bottom Floor Discard", 1) + + with self.subTest("Test that \"disable_mountain_lasers_locations\" disables only Shortbox-Locked panels."): + self.assert_location_does_not_exist("Mountain Floor 1 Right Row 5", 2) + self.assert_location_exists("Mountain Bottom Floor Discard", 2) + + with self.subTest("Test that \"disable_challenge_lasers_locations\" disables only Longbox-Locked panels."): + self.assert_location_exists("Mountain Floor 1 Right Row 5", 3) + self.assert_location_does_not_exist("Mountain Bottom Floor Discard", 3) + + with self.subTest("Test that \"everything_is_eligible\" disables only Shortbox-Locked panels."): + self.assert_location_does_not_exist("Mountain Floor 1 Right Row 5", 4) + self.assert_location_does_not_exist("Mountain Bottom Floor Discard", 4) From c4e7b6ca822da05241330174c852c12c96a210e7 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Tue, 20 Aug 2024 01:34:40 +0200 Subject: [PATCH 13/60] The Witness: Add "vague" hints making use of other games' region names and location groups (#2921) * Vague hints work! But, the client will probably reveal some of the info through scouts atm * Fall back on Everywhere if necessary * Some of these failsafes are not necessary now * Limit region size to 100 as well * Actually... like this. * Nutmeg * Lol * -1 for own player but don't scout * Still make always/priority ITEM hints * fix * uwu notices your bug * The hints should, like, actually work, you know? * Make it a Toggle * Update worlds/witness/hints.py Co-authored-by: Bryce Wilson * Update worlds/witness/hints.py Co-authored-by: Bryce Wilson * Make some suggested changes * Make that ungodly equation a bit clearer in terms of formatting * make that not sorted * Add a warning about the feature in the option tooltip * Make using region names experimental * reword option tooltip * Note about singleplayer * Slight rewording again * Reorder the order of priority a bit * this condition is unnecessary now * comment * No wait the order has to be like this * Okay now I think it's correct * Another comment * Align option tooltip with new behavior * slight rewording again * reword reword reword reword * - * ethics * Update worlds/witness/options.py Co-authored-by: Bryce Wilson * Rename and slight behavior change for local hints * I think I overengineered this system before. Make it more consistent and clear now * oops I used checks by accident * oops * OMEGA OOPS * Accidentally commited a print statemetn * Vi don't commit nonsense challenge difficulty impossible * This isn't always true but it's good enough * Update options.py * Update worlds/witness/options.py Co-authored-by: Scipio Wright * Scipio :3 * switch to is_event instead of checking against location.address * oop * Update test_roll_other_options.py * Fix that unit test problem lol * Oh is this not fixed in the apworld? --------- Co-authored-by: Bryce Wilson Co-authored-by: Scipio Wright --- worlds/witness/hints.py | 152 ++++++++++++++---- worlds/witness/options.py | 21 +++ worlds/witness/test/test_panel_hunt.py | 4 +- .../witness/test/test_roll_other_options.py | 1 + 4 files changed, 142 insertions(+), 36 deletions(-) diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py index 248c567b97ce..c8ddf260d4e6 100644 --- a/worlds/witness/hints.py +++ b/worlds/witness/hints.py @@ -1,8 +1,9 @@ import logging +import math from dataclasses import dataclass -from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple, Union +from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple, Union, cast -from BaseClasses import CollectionState, Item, Location, LocationProgressType, MultiWorld +from BaseClasses import CollectionState, Item, Location, LocationProgressType, MultiWorld, Region from .data import static_logic as static_witness_logic from .data.utils import weighted_sample @@ -11,8 +12,8 @@ if TYPE_CHECKING: from . import WitnessWorld -CompactHintArgs = Tuple[Union[str, int], int] -CompactHintData = Tuple[str, Union[str, int], int] +CompactHintArgs = Tuple[Union[str, int], Union[str, int]] +CompactHintData = Tuple[str, Union[str, int], Union[str, int]] @dataclass @@ -37,6 +38,7 @@ class WitnessWordedHint: area: Optional[str] = None area_amount: Optional[int] = None area_hunt_panels: Optional[int] = None + vague_location_hint: bool = False def get_always_hint_items(world: "WitnessWorld") -> List[str]: @@ -170,6 +172,51 @@ def get_priority_hint_locations(world: "WitnessWorld") -> List[str]: return priority +def try_getting_location_group_for_location(world: "WitnessWorld", hint_loc: Location) -> Tuple[str, str]: + allow_regions = world.options.vague_hints == "experimental" + + possible_location_groups = { + group_name: group_locations + for group_name, group_locations in world.multiworld.worlds[hint_loc.player].location_name_groups.items() + if hint_loc.name in group_locations + } + + locations_in_that_world = { + location.name for location in world.multiworld.get_locations(hint_loc.player) if not location.is_event + } + + valid_location_groups: Dict[str, int] = {} + + # Find valid location groups. + for group, locations in possible_location_groups.items(): + if group == "Everywhere": + continue + present_locations = sum(location in locations_in_that_world for location in locations) + valid_location_groups[group] = present_locations + + # If there are valid location groups, use a random one. + if valid_location_groups: + # If there are location groups with more than 1 location, remove any that only have 1. + if any(num_locs > 1 for num_locs in valid_location_groups.values()): + valid_location_groups = {name: num_locs for name, num_locs in valid_location_groups.items() if num_locs > 1} + + location_groups_with_weights = { + # Listen. Just don't worry about it. :))) + location_group: (x ** 0.6) * math.e ** (- (x / 7) ** 0.6) if x > 6 else x / 6 + for location_group, x in valid_location_groups.items() + } + + location_groups = list(location_groups_with_weights.keys()) + weights = list(location_groups_with_weights.values()) + + return world.random.choices(location_groups, weights, k=1)[0], "Group" + + if allow_regions: + return cast(Region, hint_loc.parent_region).name, "Region" + + return "Everywhere", "Everywhere" + + def word_direct_hint(world: "WitnessWorld", hint: WitnessLocationHint) -> WitnessWordedHint: location_name = hint.location.name if hint.location.player != world.player: @@ -184,12 +231,37 @@ def word_direct_hint(world: "WitnessWorld", hint: WitnessLocationHint) -> Witnes if item.player != world.player: item_name += " (" + world.multiworld.get_player_name(item.player) + ")" - if hint.hint_came_from_location: - hint_text = f"{location_name} contains {item_name}." - else: - hint_text = f"{item_name} can be found at {location_name}." + hint_text = "" + area: Optional[str] = None + + if world.options.vague_hints: + chosen_group, group_type = try_getting_location_group_for_location(world, hint.location) - return WitnessWordedHint(hint_text, hint.location) + if hint.location.player == world.player: + area = chosen_group + + # local locations should only ever return a location group, as Witness defines groups for every location. + hint_text = f"{item_name} can be found in the {area} area." + else: + player_name = world.multiworld.get_player_name(hint.location.player) + + if group_type == "Everywhere": + location_name = f"a location in {player_name}'s world" + elif group_type == "Group": + location_name = f"a \"{chosen_group}\" location in {player_name}'s world" + elif group_type == "Region": + if chosen_group == "Menu": + location_name = f"a location near the start of {player_name}'s game (\"Menu\" region)" + else: + location_name = f"a location in {player_name}'s \"{chosen_group}\" region" + + if hint_text == "": + if hint.hint_came_from_location: + hint_text = f"{location_name} contains {item_name}." + else: + hint_text = f"{item_name} can be found at {location_name}." + + return WitnessWordedHint(hint_text, hint.location, area=area, vague_location_hint=bool(world.options.vague_hints)) def hint_from_item(world: "WitnessWorld", item_name: str, @@ -224,45 +296,55 @@ def hint_from_location(world: "WitnessWorld", location: str) -> Optional[Witness return WitnessLocationHint(world.get_location(location), True) -def get_items_and_locations_in_random_order(world: "WitnessWorld", - own_itempool: List["WitnessItem"]) -> Tuple[List[str], List[str]]: - prog_items_in_this_world = sorted( +def get_item_and_location_names_in_random_order(world: "WitnessWorld", + own_itempool: List["WitnessItem"]) -> Tuple[List[str], List[str]]: + prog_item_names_in_this_world = [ item.name for item in own_itempool if item.advancement and item.code and item.location - ) - locations_in_this_world = sorted( - location.name for location in world.multiworld.get_locations(world.player) - if location.address and location.progress_type != LocationProgressType.EXCLUDED - ) + ] + world.random.shuffle(prog_item_names_in_this_world) - world.random.shuffle(prog_items_in_this_world) + locations_in_this_world = [ + location for location in world.multiworld.get_locations(world.player) + if location.item and not location.is_event and location.progress_type != LocationProgressType.EXCLUDED + ] world.random.shuffle(locations_in_this_world) - return prog_items_in_this_world, locations_in_this_world + if world.options.vague_hints: + locations_in_this_world.sort(key=lambda location: cast(Item, location.item).advancement) + + location_names_in_this_world = [location.name for location in locations_in_this_world] + + return prog_item_names_in_this_world, location_names_in_this_world def make_always_and_priority_hints(world: "WitnessWorld", own_itempool: List["WitnessItem"], already_hinted_locations: Set[Location] ) -> Tuple[List[WitnessLocationHint], List[WitnessLocationHint]]: - prog_items_in_this_world, loc_in_this_world = get_items_and_locations_in_random_order(world, own_itempool) - always_locations = [ - location for location in get_always_hint_locations(world) - if location in loc_in_this_world - ] + prog_items_in_this_world, loc_in_this_world = get_item_and_location_names_in_random_order(world, own_itempool) + always_items = [ item for item in get_always_hint_items(world) if item in prog_items_in_this_world ] - priority_locations = [ - location for location in get_priority_hint_locations(world) - if location in loc_in_this_world - ] priority_items = [ item for item in get_priority_hint_items(world) if item in prog_items_in_this_world ] + if world.options.vague_hints: + always_locations, priority_locations = [], [] + else: + always_locations = [ + location for location in get_always_hint_locations(world) + if location in loc_in_this_world + ] + priority_locations = [ + location for location in get_priority_hint_locations(world) + if location in loc_in_this_world + ] + # Get always and priority location/item hints always_location_hints = {hint_from_location(world, location) for location in always_locations} always_item_hints = {hint_from_item(world, item, own_itempool) for item in always_items} @@ -291,7 +373,7 @@ def make_always_and_priority_hints(world: "WitnessWorld", own_itempool: List["Wi def make_extra_location_hints(world: "WitnessWorld", hint_amount: int, own_itempool: List["WitnessItem"], already_hinted_locations: Set[Location], hints_to_use_first: List[WitnessLocationHint], unhinted_locations_for_hinted_areas: Dict[str, Set[Location]]) -> List[WitnessWordedHint]: - prog_items_in_this_world, locations_in_this_world = get_items_and_locations_in_random_order(world, own_itempool) + prog_items_in_this_world, locations_in_this_world = get_item_and_location_names_in_random_order(world, own_itempool) next_random_hint_is_location = world.random.randrange(0, 2) @@ -384,7 +466,7 @@ def get_hintable_areas(world: "WitnessWorld") -> Tuple[Dict[str, List[Location]] for region in static_witness_logic.ALL_AREAS_BY_NAME[area]["regions"] if region in world.player_regions.created_region_names ] - locations = [location for region in regions for location in region.get_locations() if location.address] + locations = [location for region in regions for location in region.get_locations() if not location.is_event] if locations: locations_per_area[area] = locations @@ -615,9 +697,7 @@ def get_compact_hint_args(hint: WitnessWordedHint, local_player_number: int) -> """ # Is Area Hint - if hint.area is not None: - assert hint.area_amount is not None, "Area hint had an undefined progression amount." - + if hint.area_amount is not None: area_amount = hint.area_amount hunt_panels = hint.area_hunt_panels @@ -632,7 +712,11 @@ def get_compact_hint_args(hint: WitnessWordedHint, local_player_number: int) -> # Is location hint if location and location.address is not None: - return location.address, location.player + if hint.vague_location_hint and location.player == local_player_number: + assert hint.area is not None # A local vague location hint should have an area argument + return location.address, "containing_area:" + hint.area + else: + return location.address, location.player # Scouting does not matter for other players (currently) # Is junk / undefined hint return -1, local_player_number diff --git a/worlds/witness/options.py b/worlds/witness/options.py index bdeccfe3b2db..6f7222d5f9b4 100644 --- a/worlds/witness/options.py +++ b/worlds/witness/options.py @@ -331,6 +331,25 @@ class HintAmount(Range): default = 12 +class VagueHints(Choice): + """Make Location Hints a bit more vague, where they only tell you about the general area the item is in. + Area Hints will be generated as normal. + + If set to "stable", only location groups will be used. If location groups aren't implemented for the game your item ended up in, your hint will instead only tell you that the item is "somewhere in" that game. + If set to "experimental", region names will be eligible as well, and you will never receive a "somewhere in" hint. Keep in mind that region names are not always intended to be comprehensible to players — only turn this on if you are okay with a bit of chaos. + + + The distinction does not matter in single player, as Witness implements location groups for every location. + + Also, please don't pester any devs about implementing location groups. Bring it up nicely, accept their response even if it is "No". + """ + display_name = "Vague Hints" + + option_off = 0 + option_stable = 1 + option_experimental = 2 + + class AreaHintPercentage(Range): """ There are two types of hints for The Witness. @@ -400,6 +419,7 @@ class TheWitnessOptions(PerGameCommonOptions): trap_weights: TrapWeights puzzle_skip_amount: PuzzleSkipAmount hint_amount: HintAmount + vague_hints: VagueHints area_hint_percentage: AreaHintPercentage laser_hints: LaserHints death_link: DeathLink @@ -442,6 +462,7 @@ class TheWitnessOptions(PerGameCommonOptions): ]), OptionGroup("Hints", [ HintAmount, + VagueHints, AreaHintPercentage, LaserHints ]), diff --git a/worlds/witness/test/test_panel_hunt.py b/worlds/witness/test/test_panel_hunt.py index 7b405f29ec1d..2fc16f787e67 100644 --- a/worlds/witness/test/test_panel_hunt.py +++ b/worlds/witness/test/test_panel_hunt.py @@ -23,7 +23,7 @@ def test_correct_panels_were_picked(self): for _ in range(100): state_100.collect(panel_hunt_item, True) - state_100.sweep_for_events(False, [self.world.get_location("Tutorial Gate Open Solved")]) + state_100.sweep_for_events([self.world.get_location("Tutorial Gate Open Solved")]) self.assertTrue(self.multiworld.completion_condition[self.player](state_100)) @@ -33,7 +33,7 @@ def test_correct_panels_were_picked(self): for _ in range(99): state_99.collect(panel_hunt_item, True) - state_99.sweep_for_events(False, [self.world.get_location("Tutorial Gate Open Solved")]) + state_99.sweep_for_events([self.world.get_location("Tutorial Gate Open Solved")]) self.assertFalse(self.multiworld.completion_condition[self.player](state_99)) diff --git a/worlds/witness/test/test_roll_other_options.py b/worlds/witness/test/test_roll_other_options.py index 71743c326038..3912ce252e53 100644 --- a/worlds/witness/test/test_roll_other_options.py +++ b/worlds/witness/test/test_roll_other_options.py @@ -34,6 +34,7 @@ class TestMiscOptions(WitnessTestBase): "laser_hints": True, "hint_amount": 40, "area_hint_percentage": 100, + "vague_hints": "experimental", } From 0e6e35974735764a99e06eb7ce1d63b11bc32e83 Mon Sep 17 00:00:00 2001 From: Silvris <58583688+Silvris@users.noreply.github.com> Date: Mon, 19 Aug 2024 21:59:29 -0500 Subject: [PATCH 14/60] Mega Man 2: Implement New Game (#3256) * initial (broken) commit * small work on init * Update Items.py * beginning work, some rom patches * commit progress from bh branch * deathlink, fix soft-reset kill, e-tank loss * begin work on targeting new bhclient * write font * definitely didn't forget to add the other two hashes no * update to modern options, begin colors * fix 6th letter bug * palette shuffle + logic rewrite * fix a bunch of pointers * fix color changes, deathlink, and add wily 5 req * adjust weapon weakness generation * Update Rules.py * attempt wily 5 softlock fix * add explicit test for rbm weaknesses * fix difficulty and hard reset * fix connect deathlink and off by one item color * fix atomic fire again * de-jank deathlink * rewrite wily5 rule * fix rare solo-gen fill issue, hopefully * Update Client.py * fix wily 5 requirements * undo fill hook * fix picopico-kun rules * for real this time * update minimum damage requirement * begin move to procedure patch * finish move to APPP, allow rando boobeam, color updates * fix color bug, UT support? * what do you mean I forgot the procedure * fix UT? * plando weakness and fixes * sfx when item received, more time stopper edge cases * Update test_weakness.py * fix rules and color bug * fix color bug, support reduced flashing * major world overhaul * Update Locations.py * fix first found bugs * mypy cleanup * headerless roms * Update Rom.py * further cleanup * work on energylink * el fixes * update to energylink 2.0 packet * energylink balancing * potentially break other clients, more balancing * Update Items.py * remove startup change from basepatch we write that in patch, since we also need to clean the area before applying * el balancing and feedback * hopefully less test failures? * implement world version check * add weapon/health option * Update Rom.py * x/x2 * specials * Update Color.py * Update Options.py * finally apply location groups * bump minor version number instead * fix duplicate stage sends * validate wily 5, tests * see if renaming fixes * add shuffled weakness * remove passwords * refresh rbm select, fix wily 5 validation * forgot we can't check 0 * oops I broke the basepatch (remove failing test later) * fix solo gen fill error? * fix webhost patch recognition * fix imports, basepatch * move to flexibility metric for boss validation * special case boobeam trap * block strobe on stage select init * more energylink balancing * bump world version * wily HP inaccurate in validation * fix validation edge case * save last completed wily to data storage * mypy and pep8 cleanup * fix file browse validation * fix test failure, add enemy weakness * remove test seed * update enemy damage * inno setup * Update en_Mega Man 2.md * setup guide * Update en_Mega Man 2.md * finish plando weakness section * starting rbm edge case * remove * imports * properly wrap later weakness additions in regen playthrough * fix import * forgot readme * remove time stopper special casing since we moved to proper wily 5 validation, this special casing is no longer important * properly type added locations * Update CODEOWNERS * add animation reduction * deprioritize Time Stopper in rush checks * special case wily phase 1 * fix key error * forgot the test * music and general cleanup * the great rename * fix import * thanks pycharm * reorder palette shuffle * account for alien on shuffled weakness * apply suggestions * fix seedbleed * fix invalid buster passthrough * fix weakness landing beneath required amount * fix failsafe * finish music * fix Time Stopper on Flash/Alien * asar pls * Apply suggestions from code review Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * world helpers * init cleanup * apostrophes * clearer wording * mypy and cleanup * options doc cleanup * Update rom.py * rules cleanup * Update __init__.py * Update __init__.py * move to defaultdict * cleanup world helpers * Update __init__.py * remove unnecessary line from fill hook * forgot the other one * apply code review * remove collect * Update rules.py * forgot another --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --- README.md | 1 + docs/CODEOWNERS | 3 + inno_setup.iss | 5 + worlds/mm2/__init__.py | 290 +++++++++ worlds/mm2/client.py | 562 +++++++++++++++++ worlds/mm2/color.py | 276 +++++++++ worlds/mm2/data/mm2_basepatch.bsdiff4 | Bin 0 -> 1440 bytes worlds/mm2/docs/en_Mega Man 2.md | 114 ++++ worlds/mm2/docs/setup_en.md | 53 ++ worlds/mm2/items.py | 72 +++ worlds/mm2/locations.py | 239 +++++++ worlds/mm2/names.py | 114 ++++ worlds/mm2/options.py | 229 +++++++ worlds/mm2/rom.py | 415 +++++++++++++ worlds/mm2/rules.py | 319 ++++++++++ worlds/mm2/src/mm2_basepatch.asm | 861 ++++++++++++++++++++++++++ worlds/mm2/src/mm2font.dat | Bin 0 -> 416 bytes worlds/mm2/src/mm2titlefont.dat | Bin 0 -> 160 bytes worlds/mm2/test/__init__.py | 5 + worlds/mm2/test/test_access.py | 47 ++ worlds/mm2/test/test_weakness.py | 93 +++ worlds/mm2/text.py | 90 +++ 22 files changed, 3788 insertions(+) create mode 100644 worlds/mm2/__init__.py create mode 100644 worlds/mm2/client.py create mode 100644 worlds/mm2/color.py create mode 100644 worlds/mm2/data/mm2_basepatch.bsdiff4 create mode 100644 worlds/mm2/docs/en_Mega Man 2.md create mode 100644 worlds/mm2/docs/setup_en.md create mode 100644 worlds/mm2/items.py create mode 100644 worlds/mm2/locations.py create mode 100644 worlds/mm2/names.py create mode 100644 worlds/mm2/options.py create mode 100644 worlds/mm2/rom.py create mode 100644 worlds/mm2/rules.py create mode 100644 worlds/mm2/src/mm2_basepatch.asm create mode 100644 worlds/mm2/src/mm2font.dat create mode 100644 worlds/mm2/src/mm2titlefont.dat create mode 100644 worlds/mm2/test/__init__.py create mode 100644 worlds/mm2/test/test_access.py create mode 100644 worlds/mm2/test/test_weakness.py create mode 100644 worlds/mm2/text.py diff --git a/README.md b/README.md index a2e9d3e5e5a3..0d9a41de9f1a 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ Currently, the following games are supported: * A Hat in Time * Old School Runescape * Kingdom Hearts 1 +* Mega Man 2 For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/). Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index bba79c649fc1..6a3c8f45c174 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -106,6 +106,9 @@ # Minecraft /worlds/minecraft/ @KonoTyran @espeon65536 +# Mega Man 2 +/worlds/mm2/ @Silvris + # MegaMan Battle Network 3 /worlds/mmbn3/ @digiholic diff --git a/inno_setup.iss b/inno_setup.iss index f097500f7d7d..3bb76fc40abe 100644 --- a/inno_setup.iss +++ b/inno_setup.iss @@ -186,6 +186,11 @@ Root: HKCR; Subkey: "{#MyAppName}cv64patch"; ValueData: "Arc Root: HKCR; Subkey: "{#MyAppName}cv64patch\DefaultIcon"; ValueData: "{app}\ArchipelagoBizHawkClient.exe,0"; ValueType: string; ValueName: ""; Root: HKCR; Subkey: "{#MyAppName}cv64patch\shell\open\command"; ValueData: """{app}\ArchipelagoBizHawkClient.exe"" ""%1"""; ValueType: string; ValueName: ""; +Root: HKCR; Subkey: ".apmm2"; ValueData: "{#MyAppName}mm2patch"; Flags: uninsdeletevalue; ValueType: string; ValueName: ""; +Root: HKCR; Subkey: "{#MyAppName}mm2patch"; ValueData: "Archipelago Mega Man 2 Patch"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; +Root: HKCR; Subkey: "{#MyAppName}mm2patch\DefaultIcon"; ValueData: "{app}\ArchipelagoBizHawkClient.exe,0"; ValueType: string; ValueName: ""; +Root: HKCR; Subkey: "{#MyAppName}mm2patch\shell\open\command"; ValueData: """{app}\ArchipelagoBizHawkClient.exe"" ""%1"""; ValueType: string; ValueName: ""; + Root: HKCR; Subkey: ".apladx"; ValueData: "{#MyAppName}ladxpatch"; Flags: uninsdeletevalue; ValueType: string; ValueName: ""; Root: HKCR; Subkey: "{#MyAppName}ladxpatch"; ValueData: "Archipelago Links Awakening DX Patch"; Flags: uninsdeletekey; ValueType: string; ValueName: ""; Root: HKCR; Subkey: "{#MyAppName}ladxpatch\DefaultIcon"; ValueData: "{app}\ArchipelagoLinksAwakeningClient.exe,0"; ValueType: string; ValueName: ""; diff --git a/worlds/mm2/__init__.py b/worlds/mm2/__init__.py new file mode 100644 index 000000000000..07e1823f9387 --- /dev/null +++ b/worlds/mm2/__init__.py @@ -0,0 +1,290 @@ +import hashlib +import logging +from copy import deepcopy +from typing import Dict, Any, TYPE_CHECKING, Optional, Sequence, Tuple, ClassVar, List + +from BaseClasses import Tutorial, ItemClassification, MultiWorld, Item, Location +from worlds.AutoWorld import World, WebWorld +from .names import (dr_wily, heat_man_stage, air_man_stage, wood_man_stage, bubble_man_stage, quick_man_stage, + flash_man_stage, metal_man_stage, crash_man_stage) +from .items import (item_table, item_names, MM2Item, filler_item_weights, robot_master_weapon_table, + stage_access_table, item_item_table, lookup_item_to_id) +from .locations import (MM2Location, mm2_regions, MM2Region, energy_pickups, etank_1ups, lookup_location_to_id, + location_groups) +from .rom import patch_rom, MM2ProcedurePatch, MM2LCHASH, PROTEUSHASH, MM2VCHASH, MM2NESHASH +from .options import MM2Options, Consumables +from .client import MegaMan2Client +from .rules import set_rules, weapon_damage, robot_masters, weapons_to_name, minimum_weakness_requirement +import os +import threading +import base64 +import settings +logger = logging.getLogger("Mega Man 2") + +if TYPE_CHECKING: + from BaseClasses import CollectionState + + +class MM2Settings(settings.Group): + class RomFile(settings.UserFilePath): + """File name of the MM2 EN rom""" + description = "Mega Man 2 ROM File" + copy_to: Optional[str] = "Mega Man 2 (USA).nes" + md5s = [MM2NESHASH, MM2VCHASH, MM2LCHASH, PROTEUSHASH] + + def browse(self: settings.T, + filetypes: Optional[Sequence[Tuple[str, Sequence[str]]]] = None, + **kwargs: Any) -> Optional[settings.T]: + if not filetypes: + file_types = [("NES", [".nes"]), ("Program", [".exe"])] # LC1 is only a windows executable, no linux + return super().browse(file_types, **kwargs) + else: + return super().browse(filetypes, **kwargs) + + @classmethod + def validate(cls, path: str) -> None: + """Try to open and validate file against hashes""" + with open(path, "rb", buffering=0) as f: + try: + f.seek(0) + if f.read(4) == b"NES\x1A": + f.seek(16) + else: + f.seek(0) + cls._validate_stream_hashes(f) + base_rom_bytes = f.read() + basemd5 = hashlib.md5() + basemd5.update(base_rom_bytes) + if basemd5.hexdigest() == PROTEUSHASH: + # we need special behavior here + cls.copy_to = None + except ValueError: + raise ValueError(f"File hash does not match for {path}") + + rom_file: RomFile = RomFile(RomFile.copy_to) + + +class MM2WebWorld(WebWorld): + theme = "partyTime" + tutorials = [ + + Tutorial( + "Multiworld Setup Guide", + "A guide to setting up the Mega Man 2 randomizer connected to an Archipelago Multiworld.", + "English", + "setup_en.md", + "setup/en", + ["Silvris"] + ) + ] + + +class MM2World(World): + """ + In the year 200X, following his prior defeat by Mega Man, the evil Dr. Wily has returned to take over the world with + his own group of Robot Masters. Mega Man once again sets out to defeat the eight Robot Masters and stop Dr. Wily. + + """ + + game = "Mega Man 2" + settings: ClassVar[MM2Settings] + options_dataclass = MM2Options + options: MM2Options + item_name_to_id = lookup_item_to_id + location_name_to_id = lookup_location_to_id + item_name_groups = item_names + location_name_groups = location_groups + web = MM2WebWorld() + rom_name: bytearray + world_version: Tuple[int, int, int] = (0, 3, 1) + wily_5_weapons: Dict[int, List[int]] + + def __init__(self, world: MultiWorld, player: int): + self.rom_name = bytearray() + self.rom_name_available_event = threading.Event() + super().__init__(world, player) + self.weapon_damage = deepcopy(weapon_damage) + self.wily_5_weapons = {} + + def create_regions(self) -> None: + menu = MM2Region("Menu", self.player, self.multiworld) + self.multiworld.regions.append(menu) + for region in mm2_regions: + stage = MM2Region(region, self.player, self.multiworld) + required_items = mm2_regions[region][0] + locations = mm2_regions[region][1] + prev_stage = mm2_regions[region][2] + if prev_stage is None: + menu.connect(stage, f"To {region}", + lambda state, items=required_items: state.has_all(items, self.player)) + else: + old_stage = self.get_region(prev_stage) + old_stage.connect(stage, f"To {region}", + lambda state, items=required_items: state.has_all(items, self.player)) + stage.add_locations(locations, MM2Location) + for location in stage.get_locations(): + if location.address is None and location.name != dr_wily: + location.place_locked_item(MM2Item(location.name, ItemClassification.progression, + None, self.player)) + if region in etank_1ups and self.options.consumables in (Consumables.option_1up_etank, + Consumables.option_all): + stage.add_locations(etank_1ups[region], MM2Location) + if region in energy_pickups and self.options.consumables in (Consumables.option_weapon_health, + Consumables.option_all): + stage.add_locations(energy_pickups[region], MM2Location) + self.multiworld.regions.append(stage) + + def create_item(self, name: str) -> MM2Item: + item = item_table[name] + classification = ItemClassification.filler + if item.progression: + classification = ItemClassification.progression_skip_balancing \ + if item.skip_balancing else ItemClassification.progression + if item.useful: + classification |= ItemClassification.useful + return MM2Item(name, classification, item.code, self.player) + + def get_filler_item_name(self) -> str: + return self.random.choices(list(filler_item_weights.keys()), + weights=list(filler_item_weights.values()))[0] + + def create_items(self) -> None: + itempool = [] + # grab first robot master + robot_master = self.item_id_to_name[0x880101 + self.options.starting_robot_master.value] + self.multiworld.push_precollected(self.create_item(robot_master)) + itempool.extend([self.create_item(name) for name in stage_access_table.keys() + if name != robot_master]) + itempool.extend([self.create_item(name) for name in robot_master_weapon_table.keys()]) + itempool.extend([self.create_item(name) for name in item_item_table.keys()]) + total_checks = 24 + if self.options.consumables in (Consumables.option_1up_etank, + Consumables.option_all): + total_checks += 20 + if self.options.consumables in (Consumables.option_weapon_health, + Consumables.option_all): + total_checks += 27 + remaining = total_checks - len(itempool) + itempool.extend([self.create_item(name) + for name in self.random.choices(list(filler_item_weights.keys()), + weights=list(filler_item_weights.values()), + k=remaining)]) + self.multiworld.itempool += itempool + + set_rules = set_rules + + def generate_early(self) -> None: + if (not self.options.yoku_jumps + and self.options.starting_robot_master == "heat_man") or \ + (not self.options.enable_lasers + and self.options.starting_robot_master == "quick_man"): + robot_master_pool = [1, 2, 3, 5, 6, 7, ] + if self.options.yoku_jumps: + robot_master_pool.append(0) + if self.options.enable_lasers: + robot_master_pool.append(4) + self.options.starting_robot_master.value = self.random.choice(robot_master_pool) + logger.warning( + f"Mega Man 2 ({self.player_name}): " + f"Incompatible starting Robot Master, changing to " + f"{self.options.starting_robot_master.current_key.replace('_', ' ').title()}") + + def generate_basic(self) -> None: + goal_location = self.get_location(dr_wily) + goal_location.place_locked_item(MM2Item("Victory", ItemClassification.progression, None, self.player)) + self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player) + + def fill_hook(self, + progitempool: List["Item"], + usefulitempool: List["Item"], + filleritempool: List["Item"], + fill_locations: List["Location"]) -> None: + # on a solo gen, fill can try to force Wily into sphere 2, but for most generations this is impossible + # since MM2 can have a 2 item sphere 1, and 3 items are required for Wily + if self.multiworld.players > 1: + return # Don't need to change anything on a multi gen, fill should be able to solve it with a 4 sphere 1 + rbm_to_item = { + 0: heat_man_stage, + 1: air_man_stage, + 2: wood_man_stage, + 3: bubble_man_stage, + 4: quick_man_stage, + 5: flash_man_stage, + 6: metal_man_stage, + 7: crash_man_stage + } + affected_rbm = [2, 3] # Wood and Bubble will always have this happen + possible_rbm = [1, 5] # Air and Flash are always valid targets, due to Item 2/3 receive + if self.options.consumables: + possible_rbm.append(6) # Metal has 3 consumables + possible_rbm.append(7) # Crash has 3 consumables + if self.options.enable_lasers: + possible_rbm.append(4) # Quick has a lot of consumables, but needs logical time stopper if not enabled + else: + affected_rbm.extend([6, 7]) # only two checks on non consumables + if self.options.yoku_jumps: + possible_rbm.append(0) # Heat has 3 locations always, but might need 2 items logically + if self.options.starting_robot_master.value in affected_rbm: + rbm_names = list(map(lambda s: rbm_to_item[s], possible_rbm)) + valid_second = [item for item in progitempool + if item.name in rbm_names + and item.player == self.player] + placed_item = self.random.choice(valid_second) + rbm_defeated = (f"{robot_masters[self.options.starting_robot_master.value].replace(' Defeated', '')}" + f" - Defeated") + rbm_location = self.get_location(rbm_defeated) + rbm_location.place_locked_item(placed_item) + progitempool.remove(placed_item) + fill_locations.remove(rbm_location) + target_rbm = (placed_item.code & 0xF) - 1 + if self.options.strict_weakness or (self.options.random_weakness + and not (self.weapon_damage[0][target_rbm] > 0)): + # we need to find a weakness for this boss + weaknesses = [weapon for weapon in range(1, 9) + if self.weapon_damage[weapon][target_rbm] >= minimum_weakness_requirement[weapon]] + weapons = list(map(lambda s: weapons_to_name[s], weaknesses)) + valid_weapons = [item for item in progitempool + if item.name in weapons + and item.player == self.player] + placed_weapon = self.random.choice(valid_weapons) + weapon_name = next(name for name, idx in lookup_location_to_id.items() + if idx == 0x880101 + self.options.starting_robot_master.value) + weapon_location = self.get_location(weapon_name) + weapon_location.place_locked_item(placed_weapon) + progitempool.remove(placed_weapon) + fill_locations.remove(weapon_location) + + def generate_output(self, output_directory: str) -> None: + try: + patch = MM2ProcedurePatch(player=self.player, player_name=self.player_name) + patch_rom(self, patch) + + self.rom_name = patch.name + + patch.write(os.path.join(output_directory, + f"{self.multiworld.get_out_file_name_base(self.player)}{patch.patch_file_ending}")) + except Exception: + raise + finally: + self.rom_name_available_event.set() # make sure threading continues and errors are collected + + def fill_slot_data(self) -> Dict[str, Any]: + return { + "death_link": self.options.death_link.value, + "weapon_damage": self.weapon_damage, + "wily_5_weapons": self.wily_5_weapons, + } + + def interpret_slot_data(self, slot_data: Dict[str, Any]) -> Dict[str, Any]: + local_weapon = {int(key): value for key, value in slot_data["weapon_damage"].items()} + local_wily = {int(key): value for key, value in slot_data["wily_5_weapons"].items()} + return {"weapon_damage": local_weapon, "wily_5_weapons": local_wily} + + def modify_multidata(self, multidata: Dict[str, Any]) -> None: + # wait for self.rom_name to be available. + self.rom_name_available_event.wait() + rom_name = getattr(self, "rom_name", None) + # we skip in case of error, so that the original error in the output thread is the one that gets raised + if rom_name: + new_name = base64.b64encode(bytes(self.rom_name)).decode() + multidata["connect_names"][new_name] = multidata["connect_names"][self.player_name] diff --git a/worlds/mm2/client.py b/worlds/mm2/client.py new file mode 100644 index 000000000000..aaa0813c763a --- /dev/null +++ b/worlds/mm2/client.py @@ -0,0 +1,562 @@ +import logging +import time +from enum import IntEnum +from base64 import b64encode +from typing import TYPE_CHECKING, Dict, Tuple, List, Optional, Any +from NetUtils import ClientStatus, color, NetworkItem +from worlds._bizhawk.client import BizHawkClient + +if TYPE_CHECKING: + from worlds._bizhawk.context import BizHawkClientContext, BizHawkClientCommandProcessor + +nes_logger = logging.getLogger("NES") +logger = logging.getLogger("Client") + +MM2_ROBOT_MASTERS_UNLOCKED = 0x8A +MM2_ROBOT_MASTERS_DEFEATED = 0x8B +MM2_ITEMS_ACQUIRED = 0x8C +MM2_LAST_WILY = 0x8D +MM2_RECEIVED_ITEMS = 0x8E +MM2_DEATHLINK = 0x8F +MM2_ENERGYLINK = 0x90 +MM2_RBM_STROBE = 0x91 +MM2_WEAPONS_UNLOCKED = 0x9A +MM2_ITEMS_UNLOCKED = 0x9B +MM2_WEAPON_ENERGY = 0x9C +MM2_E_TANKS = 0xA7 +MM2_LIVES = 0xA8 +MM2_DIFFICULTY = 0xCB +MM2_HEALTH = 0x6C0 +MM2_COMPLETED_STAGES = 0x770 +MM2_CONSUMABLES = 0x780 + +MM2_SFX_QUEUE = 0x580 +MM2_SFX_STROBE = 0x66 + +MM2_CONSUMABLE_TABLE: Dict[int, Tuple[int, int]] = { + # Item: (byte offset, bit mask) + 0x880201: (0, 8), + 0x880202: (16, 1), + 0x880203: (16, 2), + 0x880204: (16, 4), + 0x880205: (16, 8), + 0x880206: (16, 16), + 0x880207: (16, 32), + 0x880208: (16, 64), + 0x880209: (16, 128), + 0x88020A: (20, 1), + 0x88020B: (20, 4), + 0x88020C: (20, 64), + 0x88020D: (21, 1), + 0x88020E: (21, 2), + 0x88020F: (21, 4), + 0x880210: (24, 1), + 0x880211: (24, 2), + 0x880212: (24, 4), + 0x880213: (28, 1), + 0x880214: (28, 2), + 0x880215: (28, 4), + 0x880216: (33, 4), + 0x880217: (33, 8), + 0x880218: (37, 8), + 0x880219: (37, 16), + 0x88021A: (38, 1), + 0x88021B: (38, 2), + 0x880227: (38, 4), + 0x880228: (38, 32), + 0x880229: (38, 128), + 0x88022A: (39, 4), + 0x88022B: (39, 2), + 0x88022C: (39, 1), + 0x88022D: (38, 64), + 0x88022E: (38, 16), + 0x88022F: (38, 8), + 0x88021C: (39, 32), + 0x88021D: (39, 64), + 0x88021E: (39, 128), + 0x88021F: (41, 16), + 0x880220: (42, 2), + 0x880221: (42, 4), + 0x880222: (42, 8), + 0x880223: (46, 1), + 0x880224: (46, 2), + 0x880225: (46, 4), + 0x880226: (46, 8), +} + + +class MM2EnergyLinkType(IntEnum): + Life = 0 + AtomicFire = 1 + AirShooter = 2 + LeafShield = 3 + BubbleLead = 4 + QuickBoomerang = 5 + TimeStopper = 6 + MetalBlade = 7 + CrashBomber = 8 + Item1 = 9 + Item2 = 10 + Item3 = 11 + OneUP = 12 + + +request_to_name: Dict[str, str] = { + "HP": "health", + "AF": "Atomic Fire energy", + "AS": "Air Shooter energy", + "LS": "Leaf Shield energy", + "BL": "Bubble Lead energy", + "QB": "Quick Boomerang energy", + "TS": "Time Stopper energy", + "MB": "Metal Blade energy", + "CB": "Crash Bomber energy", + "I1": "Item 1 energy", + "I2": "Item 2 energy", + "I3": "Item 3 energy", + "1U": "lives" +} + +HP_EXCHANGE_RATE = 500000000 +WEAPON_EXCHANGE_RATE = 250000000 +ONEUP_EXCHANGE_RATE = 14000000000 + + +def cmd_pool(self: "BizHawkClientCommandProcessor") -> None: + """Check the current pool of EnergyLink, and requestable refills from it.""" + if self.ctx.game != "Mega Man 2": + logger.warning("This command can only be used when playing Mega Man 2.") + return + if not self.ctx.server or not self.ctx.slot: + logger.warning("You must be connected to a server to use this command.") + return + energylink = self.ctx.stored_data.get(f"EnergyLink{self.ctx.team}", 0) + health_points = energylink // HP_EXCHANGE_RATE + weapon_points = energylink // WEAPON_EXCHANGE_RATE + lives = energylink // ONEUP_EXCHANGE_RATE + logger.info(f"Healing available: {health_points}\n" + f"Weapon refill available: {weapon_points}\n" + f"Lives available: {lives}") + + +def cmd_request(self: "BizHawkClientCommandProcessor", amount: str, target: str) -> None: + from worlds._bizhawk.context import BizHawkClientContext + """Request a refill from EnergyLink.""" + if self.ctx.game != "Mega Man 2": + logger.warning("This command can only be used when playing Mega Man 2.") + return + if not self.ctx.server or not self.ctx.slot: + logger.warning("You must be connected to a server to use this command.") + return + valid_targets: Dict[str, MM2EnergyLinkType] = { + "HP": MM2EnergyLinkType.Life, + "AF": MM2EnergyLinkType.AtomicFire, + "AS": MM2EnergyLinkType.AirShooter, + "LS": MM2EnergyLinkType.LeafShield, + "BL": MM2EnergyLinkType.BubbleLead, + "QB": MM2EnergyLinkType.QuickBoomerang, + "TS": MM2EnergyLinkType.TimeStopper, + "MB": MM2EnergyLinkType.MetalBlade, + "CB": MM2EnergyLinkType.CrashBomber, + "I1": MM2EnergyLinkType.Item1, + "I2": MM2EnergyLinkType.Item2, + "I3": MM2EnergyLinkType.Item3, + "1U": MM2EnergyLinkType.OneUP + } + if target.upper() not in valid_targets: + logger.warning(f"Unrecognized target {target.upper()}. Available targets: {', '.join(valid_targets.keys())}") + return + ctx = self.ctx + assert isinstance(ctx, BizHawkClientContext) + client = ctx.client_handler + assert isinstance(client, MegaMan2Client) + client.refill_queue.append((valid_targets[target.upper()], int(amount))) + logger.info(f"Restoring {amount} {request_to_name[target.upper()]}.") + + +def cmd_autoheal(self) -> None: + """Enable auto heal from EnergyLink.""" + if self.ctx.game != "Mega Man 2": + logger.warning("This command can only be used when playing Mega Man 2.") + return + if not self.ctx.server or not self.ctx.slot: + logger.warning("You must be connected to a server to use this command.") + return + else: + assert isinstance(self.ctx.client_handler, MegaMan2Client) + if self.ctx.client_handler.auto_heal: + self.ctx.client_handler.auto_heal = False + logger.info(f"Auto healing disabled.") + else: + self.ctx.client_handler.auto_heal = True + logger.info(f"Auto healing enabled.") + + +def get_sfx_writes(sfx: int) -> Tuple[Tuple[int, bytes, str], ...]: + return (MM2_SFX_QUEUE, sfx.to_bytes(1, 'little'), "RAM"), (MM2_SFX_STROBE, 0x01.to_bytes(1, "little"), "RAM") + + +class MegaMan2Client(BizHawkClient): + game = "Mega Man 2" + system = "NES" + patch_suffix = ".apmm2" + item_queue: List[NetworkItem] = [] + pending_death_link: bool = False + # default to true, as we don't want to send a deathlink until Mega Man's HP is initialized once + sending_death_link: bool = True + death_link: bool = False + energy_link: bool = False + rom: Optional[bytes] = None + weapon_energy: int = 0 + health_energy: int = 0 + auto_heal: bool = False + refill_queue: List[Tuple[MM2EnergyLinkType, int]] = [] + last_wily: Optional[int] = None # default to wily 1 + + async def validate_rom(self, ctx: "BizHawkClientContext") -> bool: + from worlds._bizhawk import RequestFailedError, read + from . import MM2World + + try: + game_name, version = (await read(ctx.bizhawk_ctx, [(0x3FFB0, 21, "PRG ROM"), + (0x3FFC8, 3, "PRG ROM")])) + if game_name[:3] != b"MM2" or version != bytes(MM2World.world_version): + if game_name[:3] == b"MM2": + # I think this is an easier check than the other? + older_version = "0.2.1" if version == b"\xFF\xFF\xFF" else f"{version[0]}.{version[1]}.{version[2]}" + logger.warning(f"This Mega Man 2 patch was generated for an different version of the apworld. " + f"Please use that version to connect instead.\n" + f"Patch version: ({older_version})\n" + f"Client version: ({'.'.join([str(i) for i in MM2World.world_version])})") + if "pool" in ctx.command_processor.commands: + ctx.command_processor.commands.pop("pool") + if "request" in ctx.command_processor.commands: + ctx.command_processor.commands.pop("request") + if "autoheal" in ctx.command_processor.commands: + ctx.command_processor.commands.pop("autoheal") + return False + except UnicodeDecodeError: + return False + except RequestFailedError: + return False # Should verify on the next pass + + ctx.game = self.game + self.rom = game_name + ctx.items_handling = 0b111 + ctx.want_slot_data = False + deathlink = (await read(ctx.bizhawk_ctx, [(0x3FFC5, 1, "PRG ROM")]))[0][0] + if deathlink & 0x01: + self.death_link = True + if deathlink & 0x02: + self.energy_link = True + + if self.energy_link: + if "pool" not in ctx.command_processor.commands: + ctx.command_processor.commands["pool"] = cmd_pool + if "request" not in ctx.command_processor.commands: + ctx.command_processor.commands["request"] = cmd_request + if "autoheal" not in ctx.command_processor.commands: + ctx.command_processor.commands["autoheal"] = cmd_autoheal + + return True + + async def set_auth(self, ctx: "BizHawkClientContext") -> None: + if self.rom: + ctx.auth = b64encode(self.rom).decode() + + def on_package(self, ctx: "BizHawkClientContext", cmd: str, args: Dict[str, Any]) -> None: + if cmd == "Bounced": + if "tags" in args: + assert ctx.slot is not None + if "DeathLink" in args["tags"] and args["data"]["source"] != ctx.slot_info[ctx.slot].name: + self.on_deathlink(ctx) + elif cmd == "Retrieved": + if f"MM2_LAST_WILY_{ctx.team}_{ctx.slot}" in args["keys"]: + self.last_wily = args["keys"][f"MM2_LAST_WILY_{ctx.team}_{ctx.slot}"] + elif cmd == "Connected": + if self.energy_link: + ctx.set_notify(f"EnergyLink{ctx.team}") + if ctx.ui: + ctx.ui.enable_energy_link() + + async def send_deathlink(self, ctx: "BizHawkClientContext") -> None: + self.sending_death_link = True + ctx.last_death_link = time.time() + await ctx.send_death("Mega Man was defeated.") + + def on_deathlink(self, ctx: "BizHawkClientContext") -> None: + ctx.last_death_link = time.time() + self.pending_death_link = True + + async def game_watcher(self, ctx: "BizHawkClientContext") -> None: + from worlds._bizhawk import read, write + + if ctx.server is None: + return + + if ctx.slot is None: + return + + # get our relevant bytes + robot_masters_unlocked, robot_masters_defeated, items_acquired, \ + weapons_unlocked, items_unlocked, items_received, \ + completed_stages, consumable_checks, \ + e_tanks, lives, weapon_energy, health, difficulty, death_link_status, \ + energy_link_packet, last_wily = await read(ctx.bizhawk_ctx, [ + (MM2_ROBOT_MASTERS_UNLOCKED, 1, "RAM"), + (MM2_ROBOT_MASTERS_DEFEATED, 1, "RAM"), + (MM2_ITEMS_ACQUIRED, 1, "RAM"), + (MM2_WEAPONS_UNLOCKED, 1, "RAM"), + (MM2_ITEMS_UNLOCKED, 1, "RAM"), + (MM2_RECEIVED_ITEMS, 1, "RAM"), + (MM2_COMPLETED_STAGES, 0xE, "RAM"), + (MM2_CONSUMABLES, 52, "RAM"), + (MM2_E_TANKS, 1, "RAM"), + (MM2_LIVES, 1, "RAM"), + (MM2_WEAPON_ENERGY, 11, "RAM"), + (MM2_HEALTH, 1, "RAM"), + (MM2_DIFFICULTY, 1, "RAM"), + (MM2_DEATHLINK, 1, "RAM"), + (MM2_ENERGYLINK, 1, "RAM"), + (MM2_LAST_WILY, 1, "RAM"), + ]) + + if difficulty[0] not in (0, 1): + return # Game is not initialized + + if not ctx.finished_game and completed_stages[0xD] != 0: + # this sets on credits fade, no real better way to do this + await ctx.send_msgs([{ + "cmd": "StatusUpdate", + "status": ClientStatus.CLIENT_GOAL + }]) + writes = [] + + # deathlink + if self.death_link: + await ctx.update_death_link(self.death_link) + if self.pending_death_link: + writes.append((MM2_DEATHLINK, bytes([0x01]), "RAM")) + self.pending_death_link = False + self.sending_death_link = True + if "DeathLink" in ctx.tags and ctx.last_death_link + 1 < time.time(): + if health[0] == 0x00 and not self.sending_death_link: + await self.send_deathlink(ctx) + elif health[0] != 0x00 and not death_link_status[0]: + self.sending_death_link = False + + if self.last_wily != last_wily[0]: + if self.last_wily is None: + # revalidate last wily from data storage + await ctx.send_msgs([{"cmd": "Set", "key": f"MM2_LAST_WILY_{ctx.team}_{ctx.slot}", "operations": [ + {"operation": "default", "value": 8} + ]}]) + await ctx.send_msgs([{"cmd": "Get", "keys": [f"MM2_LAST_WILY_{ctx.team}_{ctx.slot}"]}]) + elif last_wily[0] == 0: + writes.append((MM2_LAST_WILY, self.last_wily.to_bytes(1, "little"), "RAM")) + else: + # correct our setting + self.last_wily = last_wily[0] + await ctx.send_msgs([{"cmd": "Set", "key": f"MM2_LAST_WILY_{ctx.team}_{ctx.slot}", "operations": [ + {"operation": "replace", "value": self.last_wily} + ]}]) + + # handle receiving items + recv_amount = items_received[0] + if recv_amount < len(ctx.items_received): + item = ctx.items_received[recv_amount] + logging.info('Received %s from %s (%s) (%d/%d in list)' % ( + color(ctx.item_names.lookup_in_game(item.item), 'red', 'bold'), + color(ctx.player_names[item.player], 'yellow'), + ctx.location_names.lookup_in_slot(item.location, item.player), recv_amount, len(ctx.items_received))) + + if item.item & 0x130 == 0: + # Robot Master Weapon + new_weapons = weapons_unlocked[0] | (1 << ((item.item & 0xF) - 1)) + writes.append((MM2_WEAPONS_UNLOCKED, new_weapons.to_bytes(1, 'little'), "RAM")) + writes.extend(get_sfx_writes(0x21)) + elif item.item & 0x30 == 0: + # Robot Master Stage Access + new_stages = robot_masters_unlocked[0] & ~(1 << ((item.item & 0xF) - 1)) + writes.append((MM2_ROBOT_MASTERS_UNLOCKED, new_stages.to_bytes(1, 'little'), "RAM")) + writes.extend(get_sfx_writes(0x3a)) + writes.append((MM2_RBM_STROBE, b"\x01", "RAM")) + elif item.item & 0x20 == 0: + # Items + new_items = items_unlocked[0] | (1 << ((item.item & 0xF) - 1)) + writes.append((MM2_ITEMS_UNLOCKED, new_items.to_bytes(1, 'little'), "RAM")) + writes.extend(get_sfx_writes(0x21)) + else: + # append to the queue, so we handle it later + self.item_queue.append(item) + recv_amount += 1 + writes.append((MM2_RECEIVED_ITEMS, recv_amount.to_bytes(1, 'little'), "RAM")) + + if energy_link_packet[0]: + pickup = energy_link_packet[0] + if pickup in (0x76, 0x77): + # Health pickups + if pickup == 0x77: + value = 2 + else: + value = 10 + exchange_rate = HP_EXCHANGE_RATE + elif pickup in (0x78, 0x79): + # Weapon Energy + if pickup == 0x79: + value = 2 + else: + value = 10 + exchange_rate = WEAPON_EXCHANGE_RATE + elif pickup == 0x7B: + # 1-Up + value = 1 + exchange_rate = ONEUP_EXCHANGE_RATE + else: + # if we managed to pickup something else, we should just fall through + value = 0 + exchange_rate = 0 + contribution = (value * exchange_rate) >> 1 + if contribution: + await ctx.send_msgs([{ + "cmd": "Set", "key": f"EnergyLink{ctx.team}", "slot": ctx.slot, "operations": + [{"operation": "add", "value": contribution}, + {"operation": "max", "value": 0}]}]) + logger.info(f"Deposited {contribution / HP_EXCHANGE_RATE} health into the pool.") + writes.append((MM2_ENERGYLINK, 0x00.to_bytes(1, "little"), "RAM")) + + if self.weapon_energy: + # Weapon Energy + # We parse the whole thing to spread it as thin as possible + current_energy = self.weapon_energy + weapon_energy = bytearray(weapon_energy) + for i, weapon in zip(range(len(weapon_energy)), weapon_energy): + if weapon < 0x1C: + missing = 0x1C - weapon + if missing > self.weapon_energy: + missing = self.weapon_energy + self.weapon_energy -= missing + weapon_energy[i] = weapon + missing + if not self.weapon_energy: + writes.append((MM2_WEAPON_ENERGY, weapon_energy, "RAM")) + break + else: + if current_energy != self.weapon_energy: + writes.append((MM2_WEAPON_ENERGY, weapon_energy, "RAM")) + + if self.health_energy or self.auto_heal: + # Health Energy + # We save this if the player has not taken any damage + current_health = health[0] + if 0 < current_health < 0x1C: + health_diff = 0x1C - current_health + if self.health_energy: + if health_diff > self.health_energy: + health_diff = self.health_energy + self.health_energy -= health_diff + else: + pool = ctx.stored_data.get(f"EnergyLink{ctx.team}", 0) + if health_diff * HP_EXCHANGE_RATE > pool: + health_diff = int(pool // HP_EXCHANGE_RATE) + await ctx.send_msgs([{ + "cmd": "Set", "key": f"EnergyLink{ctx.team}", "slot": ctx.slot, "operations": + [{"operation": "add", "value": -health_diff * HP_EXCHANGE_RATE}, + {"operation": "max", "value": 0}]}]) + current_health += health_diff + writes.append((MM2_HEALTH, current_health.to_bytes(1, 'little'), "RAM")) + + if self.refill_queue: + refill_type, refill_amount = self.refill_queue.pop() + if refill_type == MM2EnergyLinkType.Life: + exchange_rate = HP_EXCHANGE_RATE + elif refill_type == MM2EnergyLinkType.OneUP: + exchange_rate = ONEUP_EXCHANGE_RATE + else: + exchange_rate = WEAPON_EXCHANGE_RATE + pool = ctx.stored_data.get(f"EnergyLink{ctx.team}", 0) + request = exchange_rate * refill_amount + if request > pool: + logger.warning( + f"Not enough energy to fulfill the request. Maximum request: {pool // exchange_rate}") + else: + await ctx.send_msgs([{ + "cmd": "Set", "key": f"EnergyLink{ctx.team}", "slot": ctx.slot, "operations": + [{"operation": "add", "value": -request}, + {"operation": "max", "value": 0}]}]) + if refill_type == MM2EnergyLinkType.Life: + refill_ptr = MM2_HEALTH + elif refill_type == MM2EnergyLinkType.OneUP: + refill_ptr = MM2_LIVES + else: + refill_ptr = MM2_WEAPON_ENERGY - 1 + refill_type + current_value = (await read(ctx.bizhawk_ctx, [(refill_ptr, 1, "RAM")]))[0][0] + new_value = min(0x1C if refill_type != MM2EnergyLinkType.OneUP else 99, current_value + refill_amount) + writes.append((refill_ptr, new_value.to_bytes(1, "little"), "RAM")) + + if len(self.item_queue): + item = self.item_queue.pop(0) + idx = item.item & 0xF + if idx == 0: + # 1-Up + current_lives = lives[0] + if current_lives > 99: + self.item_queue.append(item) + else: + current_lives += 1 + writes.append((MM2_LIVES, current_lives.to_bytes(1, 'little'), "RAM")) + writes.extend(get_sfx_writes(0x42)) + elif idx == 1: + self.weapon_energy += 0xE + writes.extend(get_sfx_writes(0x28)) + elif idx == 2: + self.health_energy += 0xE + writes.extend(get_sfx_writes(0x28)) + elif idx == 3: + # E-Tank + # visuals only allow 4, but we're gonna go up to 9 anyway? May change + current_tanks = e_tanks[0] + if current_tanks < 9: + current_tanks += 1 + writes.append((MM2_E_TANKS, current_tanks.to_bytes(1, 'little'), "RAM")) + writes.extend(get_sfx_writes(0x42)) + else: + self.item_queue.append(item) + + await write(ctx.bizhawk_ctx, writes) + + new_checks = [] + # check for locations + for i in range(8): + flag = 1 << i + if robot_masters_defeated[0] & flag: + wep_id = 0x880101 + i + if wep_id not in ctx.checked_locations: + new_checks.append(wep_id) + + for i in range(3): + flag = 1 << i + if items_acquired[0] & flag: + itm_id = 0x880111 + i + if itm_id not in ctx.checked_locations: + new_checks.append(itm_id) + + for i in range(0xD): + rbm_id = 0x880001 + i + if completed_stages[i] != 0: + if rbm_id not in ctx.checked_locations: + new_checks.append(rbm_id) + + for consumable in MM2_CONSUMABLE_TABLE: + if consumable not in ctx.checked_locations: + is_checked = consumable_checks[MM2_CONSUMABLE_TABLE[consumable][0]] \ + & MM2_CONSUMABLE_TABLE[consumable][1] + if is_checked: + new_checks.append(consumable) + + for new_check_id in new_checks: + ctx.locations_checked.add(new_check_id) + location = ctx.location_names.lookup_in_game(new_check_id) + nes_logger.info( + f'New Check: {location} ({len(ctx.locations_checked)}/' + f'{len(ctx.missing_locations) + len(ctx.checked_locations)})') + await ctx.send_msgs([{"cmd": 'LocationChecks', "locations": [new_check_id]}]) diff --git a/worlds/mm2/color.py b/worlds/mm2/color.py new file mode 100644 index 000000000000..77b39caf3d4f --- /dev/null +++ b/worlds/mm2/color.py @@ -0,0 +1,276 @@ +from typing import Dict, Tuple, List, TYPE_CHECKING, Union +from . import names +from zlib import crc32 +import struct +import logging + +if TYPE_CHECKING: + from . import MM2World + from .rom import MM2ProcedurePatch + +HTML_TO_NES: Dict[str, int] = { + "SNOW": 0x20, + "LINEN": 0x36, + "SEASHELL": 0x36, + "AZURE": 0x3C, + "LAVENDER": 0x33, + "WHITE": 0x30, + "BLACK": 0x0F, + "GREY": 0x00, + "GRAY": 0x00, + "ROYALBLUE": 0x12, + "BLUE": 0x11, + "SKYBLUE": 0x21, + "LIGHTBLUE": 0x31, + "TURQUOISE": 0x2B, + "CYAN": 0x2C, + "AQUAMARINE": 0x3B, + "DARKGREEN": 0x0A, + "GREEN": 0x1A, + "YELLOW": 0x28, + "GOLD": 0x28, + "WHEAT": 0x37, + "TAN": 0x37, + "CHOCOLATE": 0x07, + "BROWN": 0x07, + "SALMON": 0x26, + "ORANGE": 0x27, + "CORAL": 0x36, + "TOMATO": 0x16, + "RED": 0x16, + "PINK": 0x25, + "MAROON": 0x06, + "MAGENTA": 0x24, + "FUSCHIA": 0x24, + "VIOLET": 0x24, + "PLUM": 0x33, + "PURPLE": 0x14, + "THISTLE": 0x34, + "DARKBLUE": 0x01, + "SILVER": 0x10, + "NAVY": 0x02, + "TEAL": 0x1C, + "OLIVE": 0x18, + "LIME": 0x2A, + "AQUA": 0x2C, + # can add more as needed +} + +MM2_COLORS: Dict[str, Tuple[int, int]] = { + names.atomic_fire: (0x28, 0x15), + names.air_shooter: (0x20, 0x11), + names.leaf_shield: (0x20, 0x19), + names.bubble_lead: (0x20, 0x00), + names.time_stopper: (0x34, 0x25), + names.quick_boomerang: (0x34, 0x14), + names.metal_blade: (0x37, 0x18), + names.crash_bomber: (0x20, 0x26), + names.item_1: (0x20, 0x16), + names.item_2: (0x20, 0x16), + names.item_3: (0x20, 0x16), + names.heat_man_stage: (0x28, 0x15), + names.air_man_stage: (0x28, 0x11), + names.wood_man_stage: (0x36, 0x17), + names.bubble_man_stage: (0x30, 0x19), + names.quick_man_stage: (0x28, 0x15), + names.flash_man_stage: (0x30, 0x12), + names.metal_man_stage: (0x28, 0x15), + names.crash_man_stage: (0x30, 0x16) +} + +MM2_KNOWN_COLORS: Dict[str, Tuple[int, int]] = { + **MM2_COLORS, + # Street Fighter, technically + "Hadouken": (0x3C, 0x11), + "Shoryuken": (0x38, 0x16), + # X Series + "Z-Saber": (0x20, 0x16), + # X1 + "Homing Torpedo": (0x3D, 0x37), + "Chameleon Sting": (0x3B, 0x1A), + "Rolling Shield": (0x3A, 0x25), + "Fire Wave": (0x37, 0x26), + "Storm Tornado": (0x34, 0x14), + "Electric Spark": (0x3D, 0x28), + "Boomerang Cutter": (0x3B, 0x2D), + "Shotgun Ice": (0x28, 0x2C), + # X2 + "Crystal Hunter": (0x33, 0x21), + "Bubble Splash": (0x35, 0x28), + "Spin Wheel": (0x34, 0x1B), + "Silk Shot": (0x3B, 0x27), + "Sonic Slicer": (0x27, 0x01), + "Strike Chain": (0x30, 0x23), + "Magnet Mine": (0x28, 0x2D), + "Speed Burner": (0x31, 0x16), + # X3 + "Acid Burst": (0x28, 0x2A), + "Tornado Fang": (0x28, 0x2C), + "Triad Thunder": (0x2B, 0x23), + "Spinning Blade": (0x20, 0x16), + "Ray Splasher": (0x28, 0x17), + "Gravity Well": (0x38, 0x14), + "Parasitic Bomb": (0x31, 0x28), + "Frost Shield": (0x23, 0x2C), +} + +palette_pointers: Dict[str, List[int]] = { + "Mega Buster": [0x3D314], + "Atomic Fire": [0x3D318], + "Air Shooter": [0x3D31C], + "Leaf Shield": [0x3D320], + "Bubble Lead": [0x3D324], + "Quick Boomerang": [0x3D328], + "Time Stopper": [0x3D32C], + "Metal Blade": [0x3D330], + "Crash Bomber": [0x3D334], + "Item 1": [0x3D338], + "Item 2": [0x3D33C], + "Item 3": [0x3D340], + "Heat Man": [0x34B6, 0x344F7], + "Air Man": [0x74B6, 0x344FF], + "Wood Man": [0xB4EC, 0x34507], + "Bubble Man": [0xF4B6, 0x3450F], + "Quick Man": [0x134C8, 0x34517], + "Flash Man": [0x174B6, 0x3451F], + "Metal Man": [0x1B4A4, 0x34527], + "Crash Man": [0x1F4EC, 0x3452F], +} + + +def add_color_to_mm2(name: str, color: Tuple[int, int]) -> None: + """ + Add a color combo for Mega Man 2 to recognize as the color to display for a given item. + For information on available colors: https://www.nesdev.org/wiki/PPU_palettes#2C02 + """ + MM2_KNOWN_COLORS[name] = validate_colors(*color) + + +def extrapolate_color(color: int) -> Tuple[int, int]: + if color > 0x1F: + color_1 = color + color_2 = color_1 - 0x10 + else: + color_2 = color + color_1 = color_2 + 0x10 + return color_1, color_2 + + +def validate_colors(color_1: int, color_2: int, allow_match: bool = False) -> Tuple[int, int]: + # Black should be reserved for outlines, a gray should suffice + if color_1 in [0x0D, 0x0E, 0x0F, 0x1E, 0x2E, 0x3E, 0x1F, 0x2F, 0x3F]: + color_1 = 0x10 + if color_2 in [0x0D, 0x0E, 0x0F, 0x1E, 0x2E, 0x3E, 0x1F, 0x2F, 0x3F]: + color_2 = 0x10 + + # one final check, make sure we don't have two matching + if not allow_match and color_1 == color_2: + color_1 = 0x30 # color 1 to white works with about any paired color + + return color_1, color_2 + + +def get_colors_for_item(name: str) -> Tuple[int, int]: + if name in MM2_KNOWN_COLORS: + return MM2_KNOWN_COLORS[name] + + check_colors = {color: color in name.upper().replace(" ", "") for color in HTML_TO_NES} + colors = [color for color in check_colors if check_colors[color]] + if colors: + # we have at least one color pattern matched + if len(colors) > 1: + # we have at least 2 + color_1 = HTML_TO_NES[colors[0]] + color_2 = HTML_TO_NES[colors[1]] + else: + color_1, color_2 = extrapolate_color(HTML_TO_NES[colors[0]]) + else: + # generate hash + crc_hash = crc32(name.encode("utf-8")) + hash_color = struct.pack("I", crc_hash) + color_1 = hash_color[0] % 0x3F + color_2 = hash_color[1] % 0x3F + + if color_1 < color_2: + temp = color_1 + color_1 = color_2 + color_2 = temp + + color_1, color_2 = validate_colors(color_1, color_2) + + return color_1, color_2 + + +def parse_color(colors: List[str]) -> Tuple[int, int]: + color_a = colors[0] + if color_a.startswith("$"): + color_1 = int(color_a[1:], 16) + else: + # assume it's in our list of colors + color_1 = HTML_TO_NES[color_a.upper()] + + if len(colors) == 1: + color_1, color_2 = extrapolate_color(color_1) + else: + color_b = colors[1] + if color_b.startswith("$"): + color_2 = int(color_b[1:], 16) + else: + color_2 = HTML_TO_NES[color_b.upper()] + return color_1, color_2 + + +def write_palette_shuffle(world: "MM2World", rom: "MM2ProcedurePatch") -> None: + palette_shuffle: Union[int, str] = world.options.palette_shuffle.value + palettes_to_write: Dict[str, Tuple[int, int]] = {} + if isinstance(palette_shuffle, str): + color_sets = palette_shuffle.split(";") + if len(color_sets) == 1: + palette_shuffle = world.options.palette_shuffle.option_none + # singularity is more correct, but this is faster + else: + palette_shuffle = world.options.palette_shuffle.options[color_sets.pop()] + for color_set in color_sets: + if "-" in color_set: + character, color = color_set.split("-") + if character.title() not in palette_pointers: + logging.warning(f"Player {world.multiworld.get_player_name(world.player)} " + f"attempted to set color for unrecognized option {character}") + colors = color.split("|") + real_colors = validate_colors(*parse_color(colors), allow_match=True) + palettes_to_write[character.title()] = real_colors + else: + # If color is provided with no character, assume singularity + colors = color_set.split("|") + real_colors = validate_colors(*parse_color(colors), allow_match=True) + for character in palette_pointers: + palettes_to_write[character] = real_colors + # Now we handle the real values + if palette_shuffle == 1: + shuffled_colors = list(MM2_COLORS.values()) + shuffled_colors.append((0x2C, 0x11)) # Mega Buster + world.random.shuffle(shuffled_colors) + for character in palette_pointers: + if character not in palettes_to_write: + palettes_to_write[character] = shuffled_colors.pop() + elif palette_shuffle > 1: + if palette_shuffle == 2: + for character in palette_pointers: + if character not in palettes_to_write: + real_colors = validate_colors(world.random.randint(0, 0x3F), world.random.randint(0, 0x3F)) + palettes_to_write[character] = real_colors + else: + # singularity + real_colors = validate_colors(world.random.randint(0, 0x3F), world.random.randint(0, 0x3F)) + for character in palette_pointers: + if character not in palettes_to_write: + palettes_to_write[character] = real_colors + + for character in palettes_to_write: + for pointer in palette_pointers[character]: + rom.write_bytes(pointer, bytes(palettes_to_write[character])) + + if character == "Atomic Fire": + # special case, we need to update Atomic Fire's flashing routine + rom.write_byte(0x3DE4A, palettes_to_write[character][1]) + rom.write_byte(0x3DE4C, palettes_to_write[character][1]) diff --git a/worlds/mm2/data/mm2_basepatch.bsdiff4 b/worlds/mm2/data/mm2_basepatch.bsdiff4 new file mode 100644 index 0000000000000000000000000000000000000000..8f3c17c3c7af32fa06906208f5d94058d7c2cea8 GIT binary patch literal 1440 zcmV;R1z-9?Q$$HdMl>*`000000002o0ssI20000G00aO40000&T4*&fL0KkKS)8}E z3;+Om|L=OdD*yllz6?MBK!6G(Mg~D3KoS9vKmZ^B01zMmXlJAV8UQ^bMi2l7jVY#) zqd+tO$TU4BpQ;cdD`{y?Fv>?~gxj9sB*IH8D%Z)S6=j+uLNNdU0ACeh7$Ql#umfZY z04`uef}&|Jd;=~D2!RhNy)FM*Gd&e6xt=+c6j9phF~ta3&+&I8Q-ui$%X?73LRx4w zF+o`-Q(58#Oo#vi9e@A-_y65}LmuD%cmD*(6|tT9kyIU7L=aU~f8F2zXa9e|0nQxf zHN{Dk(diFUBPNXongQxG007fNAO?U2o`e`6$Z6<+G7U5anjWXArh_A8G%BX_r=m1s zG8!5h223E)pk&C<0s4@{(;&zV42=QmG-L*hnrP9W85#^sffGrRnE~nzJw|{H0002c zG#UT^000000LTCU0MkHvK_sY#hNc=5O$>tp4HyJ8$)-a9AZTI@4KXlG5rHx?WXNd5 zG{G`p$qTLnqPUy2X~4|l6wsceav~I}gak#=s)%TiKpB#*8L`1Oni1T=&_SU^O8pf+ z;vvZ&6(`t!)zE=Ewe-$uSmkj#E>OR$leRz12^*}CxXgq+VI0O10Ec9P4S)d9U=W_L zAbh|jyuv^Wj_JfQ5USV&`H}>HAsHbglGtR0&E>+m1UO`c#dzV<4+cOal6C91fu?^= zm#Pq~$_h^u7(*AxK#(aG3_z43LNXa~1}TvA%+G3W5OzmD#Q$XhlCt!v!bsu;A2$`KQ z>_6lX8J)j)$`2`DcEYhK7>^%k{Z78}kXqdyB>y7U^}Fwvp3=p9pYK=YezwdM+j}AtK6U#v%Z@&43bO1wKK=m5{@Ka=cYA*dhYC zK;r~*D}UIA9U;qFA_rQ|QuzW#oOz{E0Y(WM`THtz9en1Cca6kx4XkWsx z0dozIY9NRUy42O&I_h z02%-TKpF$o(9jJ5B%)0+JwN~r0D6D`WNDz&O&S>hH1z-g85cy2`nh~04FJU8awD+% zije{AL%=Sx5*))pr0xy&ft3bSLkm9ZmtnSCa>C@$a95)gEt9ZV^MpQ`u8F&wB>Kv2 z&j}+=rE`e?e~ihp8wJ3Ce-4zf5)w5MHi;<_3W+3VZ5f;6yE24$u^AvMhn72?Q{hE| zq!K0qLjp$NBuxa2xE^@voCyp<-ALgPEx6DHYp#Ms@JMkxM#K^!q)blOhCveoN}7?MFL zSn^d ` Only present with EnergyLink, sends a request of a certain type of energy to be pulled from +the EnergyLink. Types are as follows: + - `HP` Health + - `AF` Atomic Fire + - `AS` Air Shooter + - `LS` Leaf Shield + - `BL` Bubble Lead + - `QB` Quick Boomerang + - `TS` Time Stopper + - `MB` Metal Blade + - `CB` Crash Bomber + - `I1` Item 1 + - `I2` Item 2 + - `I3` Item 3 + - `1U` Lives \ No newline at end of file diff --git a/worlds/mm2/docs/setup_en.md b/worlds/mm2/docs/setup_en.md new file mode 100644 index 000000000000..3b8f833b9967 --- /dev/null +++ b/worlds/mm2/docs/setup_en.md @@ -0,0 +1,53 @@ +# Mega Man 2 Setup Guide + +## Required Software + +- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) +- An English Mega Man 2 ROM. Alternatively, the [Mega Man Legacy Collection](https://store.steampowered.com/app/363440/Mega_Man_Legacy_Collection/) on Steam. +- [BizHawk](https://tasvideos.org/BizHawk/ReleaseHistory) 2.7 or later + +### Configuring Bizhawk + +Once you have installed BizHawk, open `EmuHawk.exe` and change the following settings: + +- If you're using BizHawk 2.7 or 2.8, go to `Config > Customize`. On the Advanced tab, switch the Lua Core from +`NLua+KopiLua` to `Lua+LuaInterface`, then restart EmuHawk. (If you're using BizHawk 2.9, you can skip this step.) +- Under `Config > Customize`, check the "Run in background" option to prevent disconnecting from the client while you're +tabbed out of EmuHawk. +- Open a `.nes` file in EmuHawk and go to `Config > Controllers…` to configure your inputs. If you can't click +`Controllers…`, load any `.nes` ROM first. +- Consider clearing keybinds in `Config > Hotkeys…` if you don't intend to use them. Select the keybind and press Esc to +clear it. + +## Generating and Patching a Game + +1. Create your options file (YAML). You can make one on the +[Mega Man 2 options page](../../../games/Mega%20Man%202/player-options). +2. Follow the general Archipelago instructions for [generating a game](../../Archipelago/setup/en#generating-a-game). +This will generate an output file for you. Your patch file will have the `.apmm2` file extension. +3. Open `ArchipelagoLauncher.exe` +4. Select "Open Patch" on the left side and select your patch file. +5. If this is your first time patching, you will be prompted to locate your vanilla ROM. If you are using the Legacy +Collection, provide `Proteus.exe` in place of your rom. +6. A patched `.nes` file will be created in the same place as the patch file. +7. On your first time opening a patch with BizHawk Client, you will also be asked to locate `EmuHawk.exe` in your +BizHawk install. + +## Connecting to a Server + +By default, opening a patch file will do steps 1-5 below for you automatically. Even so, keep them in your memory just +in case you have to close and reopen a window mid-game for some reason. + +1. Mega Man 2 uses Archipelago's BizHawk Client. If the client isn't still open from when you patched your game, +you can re-open it from the launcher. +2. Ensure EmuHawk is running the patched ROM. +3. In EmuHawk, go to `Tools > Lua Console`. This window must stay open while playing. +4. In the Lua Console window, go to `Script > Open Script…`. +5. Navigate to your Archipelago install folder and open `data/lua/connector_bizhawk_generic.lua`. +6. The emulator and client will eventually connect to each other. The BizHawk Client window should indicate that it +connected and recognized Mega Man 2. +7. To connect the client to the server, enter your room's address and port (e.g. `archipelago.gg:38281`) into the +top text field of the client and click Connect. + +You should now be able to receive and send items. You'll need to do these steps every time you want to reconnect. It is +perfectly safe to make progress offline; everything will re-sync when you reconnect. diff --git a/worlds/mm2/items.py b/worlds/mm2/items.py new file mode 100644 index 000000000000..e644b171dded --- /dev/null +++ b/worlds/mm2/items.py @@ -0,0 +1,72 @@ +from BaseClasses import Item +from typing import NamedTuple, Dict +from . import names + + +class ItemData(NamedTuple): + code: int + progression: bool + useful: bool = False # primarily use this for incredibly useful items of their class, like Metal Blade + skip_balancing: bool = False + + +class MM2Item(Item): + game = "Mega Man 2" + + +robot_master_weapon_table = { + names.atomic_fire: ItemData(0x880001, True), + names.air_shooter: ItemData(0x880002, True), + names.leaf_shield: ItemData(0x880003, True), + names.bubble_lead: ItemData(0x880004, True), + names.quick_boomerang: ItemData(0x880005, True), + names.time_stopper: ItemData(0x880006, True, True), + names.metal_blade: ItemData(0x880007, True, True), + names.crash_bomber: ItemData(0x880008, True), +} + +stage_access_table = { + names.heat_man_stage: ItemData(0x880101, True), + names.air_man_stage: ItemData(0x880102, True), + names.wood_man_stage: ItemData(0x880103, True), + names.bubble_man_stage: ItemData(0x880104, True), + names.quick_man_stage: ItemData(0x880105, True), + names.flash_man_stage: ItemData(0x880106, True), + names.metal_man_stage: ItemData(0x880107, True), + names.crash_man_stage: ItemData(0x880108, True), +} + +item_item_table = { + names.item_1: ItemData(0x880011, True, True, True), + names.item_2: ItemData(0x880012, True, True, True), + names.item_3: ItemData(0x880013, True, True, True) +} + +filler_item_table = { + names.one_up: ItemData(0x880020, False), + names.weapon_energy: ItemData(0x880021, False), + names.health_energy: ItemData(0x880022, False), + names.e_tank: ItemData(0x880023, False, True), +} + +filler_item_weights = { + names.one_up: 1, + names.weapon_energy: 4, + names.health_energy: 1, + names.e_tank: 2, +} + +item_table = { + **robot_master_weapon_table, + **stage_access_table, + **item_item_table, + **filler_item_table, +} + +item_names = { + "Weapons": {name for name in robot_master_weapon_table.keys()}, + "Stages": {name for name in stage_access_table.keys()}, + "Items": {name for name in item_item_table.keys()} +} + +lookup_item_to_id: Dict[str, int] = {item_name: data.code for item_name, data in item_table.items()} diff --git a/worlds/mm2/locations.py b/worlds/mm2/locations.py new file mode 100644 index 000000000000..4807d25d6992 --- /dev/null +++ b/worlds/mm2/locations.py @@ -0,0 +1,239 @@ +from BaseClasses import Location, Region +from typing import Dict, Tuple, Optional +from . import names + + +class MM2Location(Location): + game = "Mega Man 2" + + +class MM2Region(Region): + game = "Mega Man 2" + + +heat_man_locations: Dict[str, Optional[int]] = { + names.heat_man: 0x880001, + names.atomic_fire_get: 0x880101, + names.item_1_get: 0x880111, +} + +air_man_locations: Dict[str, Optional[int]] = { + names.air_man: 0x880002, + names.air_shooter_get: 0x880102, + names.item_2_get: 0x880112 +} + +wood_man_locations: Dict[str, Optional[int]] = { + names.wood_man: 0x880003, + names.leaf_shield_get: 0x880103 +} + +bubble_man_locations: Dict[str, Optional[int]] = { + names.bubble_man: 0x880004, + names.bubble_lead_get: 0x880104 +} + +quick_man_locations: Dict[str, Optional[int]] = { + names.quick_man: 0x880005, + names.quick_boomerang_get: 0x880105, +} + +flash_man_locations: Dict[str, Optional[int]] = { + names.flash_man: 0x880006, + names.time_stopper_get: 0x880106, + names.item_3_get: 0x880113, +} + +metal_man_locations: Dict[str, Optional[int]] = { + names.metal_man: 0x880007, + names.metal_blade_get: 0x880107 +} + +crash_man_locations: Dict[str, Optional[int]] = { + names.crash_man: 0x880008, + names.crash_bomber_get: 0x880108 +} + +wily_1_locations: Dict[str, Optional[int]] = { + names.wily_1: 0x880009, + names.wily_stage_1: None +} + +wily_2_locations: Dict[str, Optional[int]] = { + names.wily_2: 0x88000A, + names.wily_stage_2: None +} + +wily_3_locations: Dict[str, Optional[int]] = { + names.wily_3: 0x88000B, + names.wily_stage_3: None +} + +wily_4_locations: Dict[str, Optional[int]] = { + names.wily_4: 0x88000C, + names.wily_stage_4: None +} + +wily_5_locations: Dict[str, Optional[int]] = { + names.wily_5: 0x88000D, + names.wily_stage_5: None +} + +wily_6_locations: Dict[str, Optional[int]] = { + names.dr_wily: None +} + +etank_1ups: Dict[str, Dict[str, Optional[int]]] = { + "Heat Man Stage": { + names.heat_man_c1: 0x880201, + }, + "Quick Man Stage": { + names.quick_man_c1: 0x880202, + names.quick_man_c2: 0x880203, + names.quick_man_c3: 0x880204, + names.quick_man_c7: 0x880208, + }, + "Flash Man Stage": { + names.flash_man_c2: 0x88020B, + names.flash_man_c6: 0x88020F, + }, + "Metal Man Stage": { + names.metal_man_c1: 0x880210, + names.metal_man_c2: 0x880211, + names.metal_man_c3: 0x880212, + }, + "Crash Man Stage": { + names.crash_man_c2: 0x880214, + names.crash_man_c3: 0x880215, + }, + "Wily Stage 1": { + names.wily_1_c1: 0x880216, + }, + "Wily Stage 2": { + names.wily_2_c3: 0x88021A, + names.wily_2_c4: 0x88021B, + names.wily_2_c5: 0x88021C, + names.wily_2_c6: 0x88021D, + }, + "Wily Stage 3": { + names.wily_3_c2: 0x880220, + }, + "Wily Stage 4": { + names.wily_4_c3: 0x880225, + names.wily_4_c4: 0x880226, + } +} + +energy_pickups: Dict[str, Dict[str, Optional[int]]] = { + "Quick Man Stage": { + names.quick_man_c4: 0x880205, + names.quick_man_c5: 0x880206, + names.quick_man_c6: 0x880207, + names.quick_man_c8: 0x880209, + }, + "Flash Man Stage": { + names.flash_man_c1: 0x88020A, + names.flash_man_c3: 0x88020C, + names.flash_man_c4: 0x88020D, + names.flash_man_c5: 0x88020E, + }, + "Crash Man Stage": { + names.crash_man_c1: 0x880213, + }, + "Wily Stage 1": { + names.wily_1_c2: 0x880217, + }, + "Wily Stage 2": { + names.wily_2_c1: 0x880218, + names.wily_2_c2: 0x880219, + names.wily_2_c7: 0x88021E, + names.wily_2_c8: 0x880227, + names.wily_2_c9: 0x880228, + names.wily_2_c10: 0x880229, + names.wily_2_c11: 0x88022A, + names.wily_2_c12: 0x88022B, + names.wily_2_c13: 0x88022C, + names.wily_2_c14: 0x88022D, + names.wily_2_c15: 0x88022E, + names.wily_2_c16: 0x88022F, + }, + "Wily Stage 3": { + names.wily_3_c1: 0x88021F, + names.wily_3_c3: 0x880221, + names.wily_3_c4: 0x880222, + }, + "Wily Stage 4": { + names.wily_4_c1: 0x880223, + names.wily_4_c2: 0x880224, + } +} + +mm2_regions: Dict[str, Tuple[Tuple[str, ...], Dict[str, Optional[int]], Optional[str]]] = { + "Heat Man Stage": ((names.heat_man_stage,), heat_man_locations, None), + "Air Man Stage": ((names.air_man_stage,), air_man_locations, None), + "Wood Man Stage": ((names.wood_man_stage,), wood_man_locations, None), + "Bubble Man Stage": ((names.bubble_man_stage,), bubble_man_locations, None), + "Quick Man Stage": ((names.quick_man_stage,), quick_man_locations, None), + "Flash Man Stage": ((names.flash_man_stage,), flash_man_locations, None), + "Metal Man Stage": ((names.metal_man_stage,), metal_man_locations, None), + "Crash Man Stage": ((names.crash_man_stage,), crash_man_locations, None), + "Wily Stage 1": ((names.item_1, names.item_2, names.item_3), wily_1_locations, None), + "Wily Stage 2": ((names.wily_stage_1,), wily_2_locations, "Wily Stage 1"), + "Wily Stage 3": ((names.wily_stage_2,), wily_3_locations, "Wily Stage 2"), + "Wily Stage 4": ((names.wily_stage_3,), wily_4_locations, "Wily Stage 3"), + "Wily Stage 5": ((names.wily_stage_4,), wily_5_locations, "Wily Stage 4"), + "Wily Stage 6": ((names.wily_stage_5,), wily_6_locations, "Wily Stage 5") +} + +location_table: Dict[str, Optional[int]] = { + **heat_man_locations, + **air_man_locations, + **wood_man_locations, + **bubble_man_locations, + **quick_man_locations, + **flash_man_locations, + **metal_man_locations, + **crash_man_locations, + **wily_1_locations, + **wily_2_locations, + **wily_3_locations, + **wily_4_locations, + **wily_5_locations, +} + +for table in etank_1ups: + location_table.update(etank_1ups[table]) + +for table in energy_pickups: + location_table.update(energy_pickups[table]) + +location_groups = { + "Get Equipped": { + names.atomic_fire_get, + names.air_shooter_get, + names.leaf_shield_get, + names.bubble_lead_get, + names.quick_boomerang_get, + names.time_stopper_get, + names.metal_blade_get, + names.crash_bomber_get, + names.item_1_get, + names.item_2_get, + names.item_3_get + }, + "Heat Man Stage": {*heat_man_locations.keys(), *etank_1ups["Heat Man Stage"].keys()}, + "Air Man Stage": {*air_man_locations.keys()}, + "Wood Man Stage": {*wood_man_locations.keys()}, + "Bubble Man Stage": {*bubble_man_locations.keys()}, + "Quick Man Stage": {*quick_man_locations.keys(), *etank_1ups["Quick Man Stage"].keys(), + *energy_pickups["Quick Man Stage"].keys()}, + "Flash Man Stage": {*flash_man_locations.keys(), *etank_1ups["Flash Man Stage"].keys(), + *energy_pickups["Flash Man Stage"].keys()}, + "Metal Man Stage": {*metal_man_locations.keys(), *etank_1ups["Metal Man Stage"].keys()}, + "Crash Man Stage": {*crash_man_locations.keys(), *etank_1ups["Crash Man Stage"].keys(), + *energy_pickups["Crash Man Stage"].keys()}, + "Wily 2 Weapon Energy": {names.wily_2_c8, names.wily_2_c9, names.wily_2_c10, names.wily_2_c11, names.wily_2_c12, + names.wily_2_c13, names.wily_2_c14, names.wily_2_c15, names.wily_2_c16} +} + +lookup_location_to_id: Dict[str, int] = {location: idx for location, idx in location_table.items() if idx is not None} diff --git a/worlds/mm2/names.py b/worlds/mm2/names.py new file mode 100644 index 000000000000..fbbea85f0317 --- /dev/null +++ b/worlds/mm2/names.py @@ -0,0 +1,114 @@ +# Robot Master Weapons +crash_bomber = "Crash Bomber" +metal_blade = "Metal Blade" +quick_boomerang = "Quick Boomerang" +bubble_lead = "Bubble Lead" +atomic_fire = "Atomic Fire" +leaf_shield = "Leaf Shield" +time_stopper = "Time Stopper" +air_shooter = "Air Shooter" + +# Stage Entry +crash_man_stage = "Crash Man Access Codes" +metal_man_stage = "Metal Man Access Codes" +quick_man_stage = "Quick Man Access Codes" +bubble_man_stage = "Bubble Man Access Codes" +heat_man_stage = "Heat Man Access Codes" +wood_man_stage = "Wood Man Access Codes" +flash_man_stage = "Flash Man Access Codes" +air_man_stage = "Air Man Access Codes" + +# The Items +item_1 = "Item 1 - Propeller" +item_2 = "Item 2 - Rocket" +item_3 = "Item 3 - Bouncy" + +# Misc. Items +one_up = "1-Up" +weapon_energy = "Weapon Energy (L)" +health_energy = "Health Energy (L)" +e_tank = "E-Tank" + +# Locations +crash_man = "Crash Man - Defeated" +metal_man = "Metal Man - Defeated" +quick_man = "Quick Man - Defeated" +bubble_man = "Bubble Man - Defeated" +heat_man = "Heat Man - Defeated" +wood_man = "Wood Man - Defeated" +flash_man = "Flash Man - Defeated" +air_man = "Air Man - Defeated" +crash_bomber_get = "Crash Bomber - Received" +metal_blade_get = "Metal Blade - Received" +quick_boomerang_get = "Quick Boomerang - Received" +bubble_lead_get = "Bubble Lead - Received" +atomic_fire_get = "Atomic Fire - Received" +leaf_shield_get = "Leaf Shield - Received" +time_stopper_get = "Time Stopper - Received" +air_shooter_get = "Air Shooter - Received" +item_1_get = "Item 1 - Received" +item_2_get = "Item 2 - Received" +item_3_get = "Item 3 - Received" +wily_1 = "Mecha Dragon - Defeated" +wily_2 = "Picopico-kun - Defeated" +wily_3 = "Guts Tank - Defeated" +wily_4 = "Boobeam Trap - Defeated" +wily_5 = "Wily Machine 2 - Defeated" +dr_wily = "Dr. Wily (Alien) - Defeated" + +# Wily Stage Event Items +wily_stage_1 = "Wily Stage 1 - Completed" +wily_stage_2 = "Wily Stage 2 - Completed" +wily_stage_3 = "Wily Stage 3 - Completed" +wily_stage_4 = "Wily Stage 4 - Completed" +wily_stage_5 = "Wily Stage 5 - Completed" + +# Consumable Locations +heat_man_c1 = "Heat Man Stage - 1-Up" # 3, requires Yoku jumps or Item 2 +flash_man_c1 = "Flash Man Stage - Health Energy 1" # 0 +flash_man_c2 = "Flash Man Stage - 1-Up" # 2, requires any Item +flash_man_c3 = "Flash Man Stage - Health Energy 2" # 6, requires Crash Bomber +flash_man_c4 = "Flash Man Stage - Weapon Energy 1" # 8, requires Crash Bomber +flash_man_c5 = "Flash Man Stage - Health Energy 3" # 9 +flash_man_c6 = "Flash Man Stage - E-Tank" # 10 +quick_man_c1 = "Quick Man Stage - 1-Up 1" # 0, needs any Item +quick_man_c2 = "Quick Man Stage - E-Tank" # 1, requires allow lasers or Time Stopper +quick_man_c3 = "Quick Man Stage - 1-Up 2" # 2, requires allow lasers or Time Stopper +quick_man_c4 = "Quick Man Stage - Weapon Energy 1" # 3, requires allow lasers or Time Stopper +quick_man_c5 = "Quick Man Stage - Weapon Energy 2" # 4, requires allow lasers or Time Stopper +quick_man_c6 = "Quick Man Stage - Health Energy" # 5, requires allow lasers or Time Stopper +quick_man_c7 = "Quick Man Stage - 1-Up 3" # 6, requires allow lasers or Time Stopper +quick_man_c8 = "Quick Man Stage - Weapon Energy 3" # 7, requires allow lasers or Time Stopper +metal_man_c1 = "Metal Man Stage - E-Tank 1" # 0 +metal_man_c2 = "Metal Man Stage - 1-Up" # 1, needs Item 1/2 +metal_man_c3 = "Metal Man Stage - E-Tank 2" # 2, needs Item 1/2 (without putting dying in logic at least) +crash_man_c1 = "Crash Man Stage - Health Energy" # 0 +crash_man_c2 = "Crash Man Stage - E-Tank" # 1 +crash_man_c3 = "Crash Man Stage - 1-Up" # 2, any Item +wily_1_c1 = "Wily Stage 1 - 1-Up" # 10 +wily_1_c2 = "Wily Stage 1 - Weapon Energy 1" # 11 +wily_2_c1 = "Wily Stage 2 - Weapon Energy 1" # 11 +wily_2_c2 = "Wily Stage 2 - Weapon Energy 2" # 12 +wily_2_c3 = "Wily Stage 2 - E-Tank 1" # 16 +wily_2_c4 = "Wily Stage 2 - 1-Up 1" # 17 +# 18 - 27 are all small weapon energies, might force these local junk? +wily_2_c8 = "Wily Stage 2 - Weapon Energy 3" # 18 +wily_2_c9 = "Wily Stage 2 - Weapon Energy 4" # 19 +wily_2_c10 = "Wily Stage 2 - Weapon Energy 5" # 20 +wily_2_c11 = "Wily Stage 2 - Weapon Energy 6" # 21 +wily_2_c12 = "Wily Stage 2 - Weapon Energy 7" # 22 +wily_2_c13 = "Wily Stage 2 - Weapon Energy 8" # 23 +wily_2_c14 = "Wily Stage 2 - Weapon Energy 9" # 24 +wily_2_c15 = "Wily Stage 2 - Weapon Energy 10" # 25 +wily_2_c16 = "Wily Stage 2 - Weapon Energy 11" # 26 +wily_2_c5 = "Wily Stage 2 - 1-Up 2" # 29, requires Crash Bomber +wily_2_c6 = "Wily Stage 2 - E-Tank 2" # 30, requires Crash Bomber +wily_2_c7 = "Wily Stage 2 - Health Energy" # 31, item 2 (already required to reach wily 2) +wily_3_c1 = "Wily Stage 3 - Weapon Energy 1" # 12, requires Crash Bomber +wily_3_c2 = "Wily Stage 3 - E-Tank" # 17, requires Crash Bomber +wily_3_c3 = "Wily Stage 3 - Weapon Energy 2" # 18 +wily_3_c4 = "Wily Stage 3 - Weapon Energy 3" # 19 +wily_4_c1 = "Wily Stage 4 - Weapon Energy 1" # 16 +wily_4_c2 = "Wily Stage 4 - Weapon Energy 2" # 17 +wily_4_c3 = "Wily Stage 4 - 1-Up 1" # 18 +wily_4_c4 = "Wily Stage 4 - E-Tank 1" # 19 diff --git a/worlds/mm2/options.py b/worlds/mm2/options.py new file mode 100644 index 000000000000..2d90395cacda --- /dev/null +++ b/worlds/mm2/options.py @@ -0,0 +1,229 @@ +from dataclasses import dataclass + +from Options import Choice, Toggle, DeathLink, DefaultOnToggle, TextChoice, Range, OptionDict, PerGameCommonOptions +from schema import Schema, And, Use, Optional + +bosses = { + "Heat Man": 0, + "Air Man": 1, + "Wood Man": 2, + "Bubble Man": 3, + "Quick Man": 4, + "Flash Man": 5, + "Metal Man": 6, + "Crash Man": 7, + "Mecha Dragon": 8, + "Picopico-kun": 9, + "Guts Tank": 10, + "Boobeam Trap": 11, + "Wily Machine 2": 12, + "Alien": 13 +} + +weapons_to_id = { + "Mega Buster": 0, + "Atomic Fire": 1, + "Air Shooter": 2, + "Leaf Shield": 3, + "Bubble Lead": 4, + "Quick Boomerang": 5, + "Metal Blade": 7, + "Crash Bomber": 6, + "Time Stopper": 8, +} + + +class EnergyLink(Toggle): + """ + Enables EnergyLink support. + When enabled, pickups dropped from enemies are sent to the EnergyLink pool, and healing/weapon energy/1-Ups can + be requested from the EnergyLink pool. + Some of the energy sent to the pool will be lost on transfer. + """ + display_name = "EnergyLink" + + +class StartingRobotMaster(Choice): + """ + The initial stage unlocked at the start. + """ + display_name = "Starting Robot Master" + option_heat_man = 0 + option_air_man = 1 + option_wood_man = 2 + option_bubble_man = 3 + option_quick_man = 4 + option_flash_man = 5 + option_metal_man = 6 + option_crash_man = 7 + default = "random" + + +class YokuJumps(Toggle): + """ + When enabled, the player is expected to be able to perform the yoku block sequence in Heat Man's + stage without Item 2. + """ + display_name = "Yoku Block Jumps" + + +class EnableLasers(Toggle): + """ + When enabled, the player is expected to complete (and acquire items within) the laser sections of Quick Man's + stage without the Time Stopper. + """ + display_name = "Enable Lasers" + + +class Consumables(Choice): + """ + When enabled, e-tanks/1-ups/health/weapon energy will be added to the pool of items and included as checks. + E-Tanks and 1-Ups add 20 checks to the pool. + Weapon/Health Energy add 27 checks to the pool. + """ + display_name = "Consumables" + option_none = 0 + option_1up_etank = 1 + option_weapon_health = 2 + option_all = 3 + default = 1 + alias_true = 3 + alias_false = 0 + + @classmethod + def get_option_name(cls, value: int) -> str: + if value == 1: + return "1-Ups/E-Tanks" + if value == 2: + return "Weapon/Health Energy" + return super().get_option_name(value) + + +class Quickswap(DefaultOnToggle): + """ + When enabled, the player can quickswap through all received weapons by pressing Select. + """ + display_name = "Quickswap" + + +class PaletteShuffle(TextChoice): + """ + Change the color of Mega Man and the Robot Masters. + None: The palettes are unchanged. + Shuffled: Palette colors are shuffled amongst the robot masters. + Randomized: Random (usually good) palettes are generated for each robot master. + Singularity: one palette is generated and used for all robot masters. + Supports custom palettes using HTML named colors in the + following format: Mega Buster-Lavender|Violet;randomized + The first value is the character whose palette you'd like to define, then separated by - is a set of 2 colors for + that character. separate every color with a pipe, and separate every character as well as the remaining shuffle with + a semicolon. + """ + display_name = "Palette Shuffle" + option_none = 0 + option_shuffled = 1 + option_randomized = 2 + option_singularity = 3 + + +class EnemyWeaknesses(Toggle): + """ + Randomizes the damage dealt to enemies by weapons. Friender will always take damage from the buster. + """ + display_name = "Random Enemy Weaknesses" + + +class StrictWeaknesses(Toggle): + """ + Only your starting Robot Master will take damage from the Mega Buster, the rest must be defeated with weapons. + Weapons that only do 1-3 damage to bosses no longer deal damage (aside from Alien). + """ + display_name = "Strict Boss Weaknesses" + + +class RandomWeaknesses(Choice): + """ + None: Bosses will have their regular weaknesses. + Shuffled: Weapon damage will be shuffled amongst the weapons, so Metal Blade may do Bubble Lead damage. + Time Stopper will deplete half of a random Robot Master's HP. + Randomized: Weapon damage will be fully randomized. + """ + display_name = "Random Boss Weaknesses" + option_none = 0 + option_shuffled = 1 + option_randomized = 2 + alias_false = 0 + alias_true = 2 + + +class Wily5Requirement(Range): + """Change the number of Robot Masters that are required to be defeated for + the teleporter to the Wily Machine to appear.""" + display_name = "Wily 5 Requirement" + default = 8 + range_start = 1 + range_end = 8 + + +class WeaknessPlando(OptionDict): + """ + Specify specific damage numbers for boss damage. Can be used even without strict/random weaknesses. + plando_weakness: + Robot Master: + Weapon: Damage + """ + display_name = "Plando Weaknesses" + schema = Schema({ + Optional(And(str, Use(str.title), lambda s: s in bosses)): { + And(str, Use(str.title), lambda s: s in weapons_to_id): And(int, lambda i: i in range(-1, 14)) + } + }) + default = {} + + +class ReduceFlashing(Choice): + """ + Reduce flashing seen in gameplay, such as the stage select and when defeating a Wily boss. + Virtual Console: increases length of most flashes, changes some flashes from white to a dark gray. + Minor: VC changes + decreasing the speed of Bubble/Metal Man stage animations. + Full: VC changes + further decreasing the brightness of most flashes and + disables stage animations for Metal/Bubble Man stages. + """ + display_name = "Reduce Flashing" + option_none = 0 + option_virtual_console = 1 + option_minor = 2 + option_full = 3 + default = 1 + + +class RandomMusic(Choice): + """ + Vanilla: music is unchanged + Shuffled: stage and certain menu music is shuffled. + Randomized: stage and certain menu music is randomly selected + None: no music will play + """ + display_name = "Random Music" + option_vanilla = 0 + option_shuffled = 1 + option_randomized = 2 + option_none = 3 + +@dataclass +class MM2Options(PerGameCommonOptions): + death_link: DeathLink + energy_link: EnergyLink + starting_robot_master: StartingRobotMaster + consumables: Consumables + yoku_jumps: YokuJumps + enable_lasers: EnableLasers + enemy_weakness: EnemyWeaknesses + strict_weakness: StrictWeaknesses + random_weakness: RandomWeaknesses + wily_5_requirement: Wily5Requirement + plando_weakness: WeaknessPlando + palette_shuffle: PaletteShuffle + quickswap: Quickswap + reduce_flashing: ReduceFlashing + random_music: RandomMusic diff --git a/worlds/mm2/rom.py b/worlds/mm2/rom.py new file mode 100644 index 000000000000..cac0a8706007 --- /dev/null +++ b/worlds/mm2/rom.py @@ -0,0 +1,415 @@ +import pkgutil +from typing import Optional, TYPE_CHECKING, Iterable, Dict, Sequence +import hashlib +import Utils +import os + +import settings +from worlds.Files import APProcedurePatch, APTokenMixin, APTokenTypes +from . import names +from .rules import minimum_weakness_requirement +from .text import MM2TextEntry +from .color import get_colors_for_item, write_palette_shuffle +from .options import Consumables, ReduceFlashing, RandomMusic + +if TYPE_CHECKING: + from . import MM2World + +MM2LCHASH = "37f2c36ce7592f1e16b3434b3985c497" +PROTEUSHASH = "9ff045a3ca30018b6e874c749abb3ec4" +MM2NESHASH = "0527a0ee512f69e08b8db6dc97964632" +MM2VCHASH = "0c78dfe8e90fb8f3eed022ff01126ad3" + +enemy_weakness_ptrs: Dict[int, int] = { + 0: 0x3E9A8, + 1: 0x3EA24, + 2: 0x3EA9C, + 3: 0x3EB14, + 4: 0x3EB8C, + 5: 0x3EC04, + 6: 0x3EC7C, + 7: 0x3ECF4, +} + +enemy_addresses: Dict[str, int] = { + "Shrink": 0x00, + "M-445": 0x04, + "Claw": 0x08, + "Tanishi": 0x0A, + "Kerog": 0x0C, + "Petit Kerog": 0x0D, + "Anko": 0x0F, + "Batton": 0x16, + "Robitto": 0x17, + "Friender": 0x1C, + "Monking": 0x1D, + "Kukku": 0x1F, + "Telly": 0x22, + "Changkey Maker": 0x23, + "Changkey": 0x24, + "Pierrobot": 0x29, + "Fly Boy": 0x2C, + # "Crash Wall": 0x2D + # "Friender Wall": 0x2E + "Blocky": 0x31, + "Neo Metall": 0x34, + "Matasaburo": 0x36, + "Pipi": 0x38, + "Pipi Egg": 0x3A, + "Copipi": 0x3C, + "Kaminari Goro": 0x3E, + "Petit Goblin": 0x45, + "Springer": 0x46, + "Mole (Up)": 0x48, + "Mole (Down)": 0x49, + "Shotman (Left)": 0x4B, + "Shotman (Right)": 0x4C, + "Sniper Armor": 0x4E, + "Sniper Joe": 0x4F, + "Scworm": 0x50, + "Scworm Worm": 0x51, + "Picopico-kun": 0x6A, + "Boobeam Trap": 0x6D, + "Big Fish": 0x71 +} + +# addresses printed when assembling basepatch +consumables_ptr: int = 0x3F2FE +quickswap_ptr: int = 0x3F363 +wily_5_ptr: int = 0x3F3A1 +energylink_ptr: int = 0x3F46B +get_equipped_sound_ptr: int = 0x3F384 + + +class RomData: + def __init__(self, file: bytes, name: str = "") -> None: + self.file = bytearray(file) + self.name = name + + def read_byte(self, offset: int) -> int: + return self.file[offset] + + def read_bytes(self, offset: int, length: int) -> bytearray: + return self.file[offset:offset + length] + + def write_byte(self, offset: int, value: int) -> None: + self.file[offset] = value + + def write_bytes(self, offset: int, values: Sequence[int]) -> None: + self.file[offset:offset + len(values)] = values + + def write_to_file(self, file: str) -> None: + with open(file, 'wb') as outfile: + outfile.write(self.file) + + +class MM2ProcedurePatch(APProcedurePatch, APTokenMixin): + hash = [MM2LCHASH, MM2NESHASH, MM2VCHASH] + game = "Mega Man 2" + patch_file_ending = ".apmm2" + result_file_ending = ".nes" + name: bytearray + procedure = [ + ("apply_bsdiff4", ["mm2_basepatch.bsdiff4"]), + ("apply_tokens", ["token_patch.bin"]), + ] + + @classmethod + def get_source_data(cls) -> bytes: + return get_base_rom_bytes() + + def write_byte(self, offset: int, value: int) -> None: + self.write_token(APTokenTypes.WRITE, offset, value.to_bytes(1, "little")) + + def write_bytes(self, offset: int, value: Iterable[int]) -> None: + self.write_token(APTokenTypes.WRITE, offset, bytes(value)) + + +def patch_rom(world: "MM2World", patch: MM2ProcedurePatch) -> None: + patch.write_file("mm2_basepatch.bsdiff4", pkgutil.get_data(__name__, os.path.join("data", "mm2_basepatch.bsdiff4"))) + # text writing + patch.write_bytes(0x37E2A, MM2TextEntry("FOR ", 0xCB).resolve()) + patch.write_bytes(0x37EAA, MM2TextEntry("GET EQUIPPED ", 0x0B).resolve()) + patch.write_bytes(0x37EBA, MM2TextEntry("WITH ", 0x2B).resolve()) + + base_address = 0x3F650 + color_address = 0x37F6C + for i, location in zip(range(11), [ + names.atomic_fire_get, + names.air_shooter_get, + names.leaf_shield_get, + names.bubble_lead_get, + names.quick_boomerang_get, + names.time_stopper_get, + names.metal_blade_get, + names.crash_bomber_get, + names.item_1_get, + names.item_2_get, + names.item_3_get + ]): + item = world.multiworld.get_location(location, world.player).item + if item: + if len(item.name) <= 14: + # we want to just place it in the center + first_str = "" + second_str = item.name + third_str = "" + elif len(item.name) <= 28: + # spread across second and third + first_str = "" + second_str = item.name[:14] + third_str = item.name[14:] + else: + # all three + first_str = item.name[:14] + second_str = item.name[14:28] + third_str = item.name[28:] + if len(third_str) > 16: + third_str = third_str[:16] + player_str = world.multiworld.get_player_name(item.player) + if len(player_str) > 14: + player_str = player_str[:14] + patch.write_bytes(base_address + (64 * i), MM2TextEntry(first_str, 0x4B).resolve()) + patch.write_bytes(base_address + (64 * i) + 16, MM2TextEntry(second_str, 0x6B).resolve()) + patch.write_bytes(base_address + (64 * i) + 32, MM2TextEntry(third_str, 0x8B).resolve()) + patch.write_bytes(base_address + (64 * i) + 48, MM2TextEntry(player_str, 0xEB).resolve()) + + colors = get_colors_for_item(item.name) + if i > 7: + patch.write_bytes(color_address + 27 + ((i - 8) * 2), colors) + else: + patch.write_bytes(color_address + (i * 2), colors) + + write_palette_shuffle(world, patch) + + enemy_weaknesses: Dict[str, Dict[int, int]] = {} + + if world.options.strict_weakness or world.options.random_weakness or world.options.plando_weakness: + # we need to write boss weaknesses + output = bytearray() + for weapon in world.weapon_damage: + if weapon == 8: + continue # Time Stopper is a special case + weapon_damage = [world.weapon_damage[weapon][i] + if world.weapon_damage[weapon][i] >= 0 + else 256 + world.weapon_damage[weapon][i] + for i in range(14)] + output.extend(weapon_damage) + patch.write_bytes(0x2E952, bytes(output)) + time_stopper_damage = world.weapon_damage[8] + time_offset = 0x2C03B + damage_table = { + 4: 0xF, + 3: 0x17, + 2: 0x1E, + 1: 0x25 + } + for boss, damage in enumerate(time_stopper_damage): + if damage > 4: + damage = 4 # 4 is a guaranteed kill, no need to exceed + if damage <= 0: + patch.write_byte(time_offset + 14 + boss, 0) + else: + patch.write_byte(time_offset + 14 + boss, 1) + patch.write_byte(time_offset + boss, damage_table[damage]) + if world.options.random_weakness: + wily_5_weaknesses = [i for i in range(8) if world.weapon_damage[i][12] > minimum_weakness_requirement[i]] + world.random.shuffle(wily_5_weaknesses) + if len(wily_5_weaknesses) >= 3: + weak1 = wily_5_weaknesses.pop() + weak2 = wily_5_weaknesses.pop() + weak3 = wily_5_weaknesses.pop() + elif len(wily_5_weaknesses) == 2: + weak1 = weak2 = wily_5_weaknesses.pop() + weak3 = wily_5_weaknesses.pop() + else: + weak1 = weak2 = weak3 = 0 + patch.write_byte(0x2DA2E, weak1) + patch.write_byte(0x2DA32, weak2) + patch.write_byte(0x2DA3A, weak3) + enemy_weaknesses["Picopico-kun"] = {weapon: world.weapon_damage[weapon][9] for weapon in range(8)} + enemy_weaknesses["Boobeam Trap"] = {weapon: world.weapon_damage[weapon][11] for weapon in range(8)} + + if world.options.enemy_weakness: + for enemy in enemy_addresses: + if enemy in ("Picopico-kun", "Boobeam Trap"): + continue + enemy_weaknesses[enemy] = {weapon: world.random.randint(-4, 4) for weapon in enemy_weakness_ptrs} + if enemy == "Friender": + # Friender has to be killed, need buster damage to not break logic + enemy_weaknesses[enemy][0] = max(enemy_weaknesses[enemy][0], 1) + + for enemy, damage_table in enemy_weaknesses.items(): + for weapon in enemy_weakness_ptrs: + if damage_table[weapon] < 0: + damage_table[weapon] = 256 + damage_table[weapon] + patch.write_byte(enemy_weakness_ptrs[weapon] + enemy_addresses[enemy], damage_table[weapon]) + + if world.options.quickswap: + patch.write_byte(quickswap_ptr + 1, 0x01) + + if world.options.consumables != Consumables.option_all: + value_a = 0x7C + value_b = 0x76 + if world.options.consumables == Consumables.option_1up_etank: + value_b = 0x7A + else: + value_a = 0x7A + patch.write_byte(consumables_ptr - 3, value_a) + patch.write_byte(consumables_ptr + 1, value_b) + + patch.write_byte(wily_5_ptr + 1, world.options.wily_5_requirement.value) + + if world.options.energy_link: + patch.write_byte(energylink_ptr + 1, 1) + + if world.options.reduce_flashing: + if world.options.reduce_flashing.value == ReduceFlashing.option_virtual_console: + color = 0x2D # Dark Gray + speed = -1 + elif world.options.reduce_flashing.value == ReduceFlashing.option_minor: + color = 0x2D + speed = 0x08 + else: + color = 0x0F + speed = 0x00 + patch.write_byte(0x2D1B0, color) # Change white to a dark gray, Mecha Dragon + patch.write_byte(0x2D397, 0x0F) # Longer flash time, Mecha Dragon kill + patch.write_byte(0x2D3A0, color) # Change white to a dark gray, Picopico-kun/Boobeam Trap + patch.write_byte(0x2D65F, color) # Change white to a dark gray, Guts Tank + patch.write_byte(0x2DA94, color) # Change white to a dark gray, Wily Machine + patch.write_byte(0x2DC97, color) # Change white to a dark gray, Alien + patch.write_byte(0x2DD68, 0x10) # Longer flash time, Alien kill + patch.write_bytes(0x2DF14, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA]) # Reduce final Alien flash to 1 big flash + patch.write_byte(0x34132, 0x08) # Longer flash time, Stage Select + + if world.options.reduce_flashing.value == ReduceFlashing.option_full: + # reduce color of stage flashing + patch.write_bytes(0x344C9, [0x2D, 0x10, 0x00, 0x2D, + 0x0F, 0x10, 0x2D, 0x00, + 0x0F, 0x10, 0x2D, 0x00, + 0x0F, 0x10, 0x2D, 0x00, + 0x2D, 0x10, 0x2D, 0x00, + 0x0F, 0x10, 0x2D, 0x00, + 0x0F, 0x10, 0x2D, 0x00, + 0x0F, 0x10, 0x2D, 0x00]) + # remove wily castle flash + patch.write_byte(0x3596D, 0x0F) + + if speed != -1: + patch.write_byte(0xFE01, speed) # Bubble Man Stage + patch.write_byte(0x1BE01, speed) # Metal Man Stage + + if world.options.random_music: + if world.options.random_music == RandomMusic.option_none: + pool = [0xFF] * 20 + # A couple of additional mutes we want here + patch.write_byte(0x37819, 0xFF) # Credits + patch.write_byte(0x378A4, 0xFF) # Credits #2 + patch.write_byte(0x37149, 0xFF) # Game Over Jingle + patch.write_byte(0x341BA, 0xFF) # Robot Master Jingle + patch.write_byte(0x2E0B4, 0xFF) # Robot Master Defeated + patch.write_byte(0x35B78, 0xFF) # Wily Castle + patch.write_byte(0x2DFA5, 0xFF) # Wily Defeated + + elif world.options.random_music == RandomMusic.option_shuffled: + pool = [0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 9, 0x10, 0xC, 0xB, 0x17, 0x13, 0xE, 0xD] + world.random.shuffle(pool) + else: + pool = world.random.choices([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xB, 0xC, 0xD, 0xE, 0x10, 0x13, 0x17], k=20) + patch.write_bytes(0x381E0, pool[:13]) + patch.write_byte(0x36318, pool[13]) # Game Start + patch.write_byte(0x37181, pool[13]) # Game Over + patch.write_byte(0x340AE, pool[14]) # RBM Select + patch.write_byte(0x39005, pool[15]) # Robot Master Battle + patch.write_byte(get_equipped_sound_ptr + 1, pool[16]) # Get Equipped, we actually hook this already lmao + patch.write_byte(0x3775A, pool[17]) # Epilogue + patch.write_byte(0x36089, pool[18]) # Intro + patch.write_byte(0x361F1, pool[19]) # Title + + + + from Utils import __version__ + patch.name = bytearray(f'MM2{__version__.replace(".", "")[0:3]}_{world.player}_{world.multiworld.seed:11}\0', + 'utf8')[:21] + patch.name.extend([0] * (21 - len(patch.name))) + patch.write_bytes(0x3FFC0, patch.name) + deathlink_byte = world.options.death_link.value | (world.options.energy_link.value << 1) + patch.write_byte(0x3FFD5, deathlink_byte) + + patch.write_bytes(0x3FFD8, world.world_version) + + version_map = { + "0": 0x90, + "1": 0x91, + "2": 0x92, + "3": 0x93, + "4": 0x94, + "5": 0x95, + "6": 0x96, + "7": 0x97, + "8": 0x98, + "9": 0x99, + ".": 0xDC + } + patch.write_token(APTokenTypes.RLE, 0x36EE0, (11, 0)) + patch.write_token(APTokenTypes.RLE, 0x36EEE, (25, 0)) + + # BY SILVRIS + patch.write_bytes(0x36EE0, [0xC2, 0xD9, 0xC0, 0xD3, 0xC9, 0xCC, 0xD6, 0xD2, 0xC9, 0xD3]) + # ARCHIPELAGO x.x.x + patch.write_bytes(0x36EF2, [0xC1, 0xD2, 0xC3, 0xC8, 0xC9, 0xD0, 0xC5, 0xCC, 0xC1, 0xC7, 0xCF, 0xC0]) + patch.write_bytes(0x36EFE, list(map(lambda c: version_map[c], __version__))) + + patch.write_file("token_patch.bin", patch.get_token_binary()) + + +header = b"\x4E\x45\x53\x1A\x10\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00" + + +def read_headerless_nes_rom(rom: bytes) -> bytes: + if rom[:4] == b"NES\x1A": + return rom[16:] + else: + return rom + + +def get_base_rom_bytes(file_name: str = "") -> bytes: + base_rom_bytes: Optional[bytes] = getattr(get_base_rom_bytes, "base_rom_bytes", None) + if not base_rom_bytes: + file_name = get_base_rom_path(file_name) + base_rom_bytes = read_headerless_nes_rom(bytes(open(file_name, "rb").read())) + + basemd5 = hashlib.md5() + basemd5.update(base_rom_bytes) + if basemd5.hexdigest() == PROTEUSHASH: + base_rom_bytes = extract_mm2(base_rom_bytes) + basemd5 = hashlib.md5() + basemd5.update(base_rom_bytes) + if basemd5.hexdigest() not in {MM2LCHASH, MM2NESHASH, MM2VCHASH}: + print(basemd5.hexdigest()) + raise Exception("Supplied Base Rom does not match known MD5 for US, LC, or US VC release. " + "Get the correct game and version, then dump it") + headered_rom = bytearray(base_rom_bytes) + headered_rom[0:0] = header + setattr(get_base_rom_bytes, "base_rom_bytes", bytes(headered_rom)) + return bytes(headered_rom) + return base_rom_bytes + + +def get_base_rom_path(file_name: str = "") -> str: + options: settings.Settings = settings.get_settings() + if not file_name: + file_name = options["mm2_options"]["rom_file"] + if not os.path.exists(file_name): + file_name = Utils.user_path(file_name) + return file_name + + +PRG_OFFSET = 0x8ED70 +PRG_SIZE = 0x40000 + + +def extract_mm2(proteus: bytes) -> bytes: + mm2 = bytearray(proteus[PRG_OFFSET:PRG_OFFSET + PRG_SIZE]) + return bytes(mm2) diff --git a/worlds/mm2/rules.py b/worlds/mm2/rules.py new file mode 100644 index 000000000000..43d4b5a6aabd --- /dev/null +++ b/worlds/mm2/rules.py @@ -0,0 +1,319 @@ +from math import ceil +from typing import TYPE_CHECKING, Dict, List +from . import names +from .locations import heat_man_locations, air_man_locations, wood_man_locations, bubble_man_locations, \ + quick_man_locations, flash_man_locations, metal_man_locations, crash_man_locations, wily_1_locations, \ + wily_2_locations, wily_3_locations, wily_4_locations, wily_5_locations, wily_6_locations +from .options import bosses, weapons_to_id, Consumables, RandomWeaknesses +from worlds.generic.Rules import add_rule + +if TYPE_CHECKING: + from . import MM2World + from BaseClasses import CollectionState + +weapon_damage: Dict[int, List[int]] = { + 0: [2, 2, 1, 1, 2, 2, 1, 1, 1, 7, 1, 0, 1, -1], # Mega Buster + 1: [-1, 6, 0xE, 0, 0xA, 6, 4, 6, 8, 13, 8, 0, 0xE, -1], # Atomic Fire + 2: [2, 0, 4, 0, 2, 0, 0, 0xA, 0, 0, 0, 0, 1, -1], # Air Shooter + 3: [0, 8, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1], # Leaf Shield + 4: [6, 0, 0, -1, 0, 2, 0, 1, 0, 14, 1, 0, 0, 1], # Bubble Lead + 5: [2, 2, 0, 2, 0, 0, 4, 1, 1, 7, 2, 0, 1, -1], # Quick Boomerang + 6: [-1, 0, 2, 2, 4, 3, 0, 0, 1, 0, 1, 0x14, 1, -1], # Crash Bomber + 7: [1, 0, 2, 4, 0, 4, 0xE, 0, 0, 7, 0, 0, 1, -1], # Metal Blade + 8: [0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0], # Time Stopper +} + +weapons_to_name: Dict[int, str] = { + 1: names.atomic_fire, + 2: names.air_shooter, + 3: names.leaf_shield, + 4: names.bubble_lead, + 5: names.quick_boomerang, + 6: names.crash_bomber, + 7: names.metal_blade, + 8: names.time_stopper +} + +minimum_weakness_requirement: Dict[int, int] = { + 0: 1, # Mega Buster is free + 1: 14, # 2 shots of Atomic Fire + 2: 1, # 14 shots of Air Shooter, although you likely hit more than one shot + 3: 4, # 9 uses of Leaf Shield, 3 ends up 1 damage off + 4: 1, # 56 uses of Bubble Lead + 5: 1, # 224 uses of Quick Boomerang + 6: 4, # 7 uses of Crash Bomber + 7: 1, # 112 uses of Metal Blade + 8: 4, # 1 use of Time Stopper, but setting to 4 means we shave the entire HP bar +} + +robot_masters: Dict[int, str] = { + 0: "Heat Man Defeated", + 1: "Air Man Defeated", + 2: "Wood Man Defeated", + 3: "Bubble Man Defeated", + 4: "Quick Man Defeated", + 5: "Flash Man Defeated", + 6: "Metal Man Defeated", + 7: "Crash Man Defeated" +} + +weapon_costs = { + 0: 0, + 1: 10, + 2: 2, + 3: 3, + 4: 0.5, + 5: 0.125, + 6: 4, + 7: 0.25, + 8: 7, +} + + +def can_defeat_enough_rbms(state: "CollectionState", player: int, + required: int, boss_requirements: Dict[int, List[int]]): + can_defeat = 0 + for boss, reqs in boss_requirements.items(): + if boss in robot_masters: + if state.has_all(map(lambda x: weapons_to_name[x], reqs), player): + can_defeat += 1 + if can_defeat >= required: + return True + return False + + +def set_rules(world: "MM2World") -> None: + # most rules are set on region, so we only worry about rules required within stage access + # or rules variable on settings + if (hasattr(world.multiworld, "re_gen_passthrough") + and "Mega Man 2" in getattr(world.multiworld, "re_gen_passthrough")): + slot_data = getattr(world.multiworld, "re_gen_passthrough")["Mega Man 2"] + world.weapon_damage = slot_data["weapon_damage"] + world.wily_5_weapons = slot_data["wily_5_weapons"] + else: + if world.options.random_weakness == RandomWeaknesses.option_shuffled: + weapon_tables = [table for weapon, table in weapon_damage.items() if weapon not in (0, 8)] + world.random.shuffle(weapon_tables) + for i in range(1, 8): + world.weapon_damage[i] = weapon_tables.pop() + # alien must take minimum required damage from his weakness + alien_weakness = next(weapon for weapon in range(8) if world.weapon_damage[weapon][13] != -1) + world.weapon_damage[alien_weakness][13] = minimum_weakness_requirement[alien_weakness] + world.weapon_damage[8] = [0 for _ in range(14)] + world.weapon_damage[8][world.random.choice(range(8))] = 2 + elif world.options.random_weakness == RandomWeaknesses.option_randomized: + world.weapon_damage = {i: [] for i in range(9)} + for boss in range(13): + for weapon in world.weapon_damage: + world.weapon_damage[weapon].append(min(14, max(-1, int(world.random.normalvariate(3, 3))))) + if not any([world.weapon_damage[weapon][boss] >= max(4, minimum_weakness_requirement[weapon]) + for weapon in range(1, 7)]): + # failsafe, there should be at least one defined non-Buster weakness + weapon = world.random.randint(1, 7) + world.weapon_damage[weapon][boss] = world.random.randint( + max(4, minimum_weakness_requirement[weapon]), 14) # Force weakness + # special case, if boobeam trap has a weakness to Crash, it needs to be max damage + if world.weapon_damage[6][11] > 4: + world.weapon_damage[6][11] = 14 + # handle the alien + boss = 13 + for weapon in world.weapon_damage: + world.weapon_damage[weapon].append(-1) + weapon = world.random.choice(list(world.weapon_damage.keys())) + world.weapon_damage[weapon][boss] = minimum_weakness_requirement[weapon] + + if world.options.strict_weakness: + for weapon in weapon_damage: + for i in range(13): + if weapon == 0: + world.weapon_damage[weapon][i] = 0 + elif i in (8, 12) and not world.options.random_weakness: + continue + # Mecha Dragon only has damage range of 0-1, so allow the 1 + # Wily Machine needs all three weaknesses present, so allow + elif 4 > world.weapon_damage[weapon][i] > 0: + world.weapon_damage[weapon][i] = 0 + # handle special cases + for boss in range(14): + for weapon in (1, 3, 6, 8): + if (0 < world.weapon_damage[weapon][boss] < minimum_weakness_requirement[weapon] and + not any(world.weapon_damage[i][boss] > 0 for i in range(1, 8) if i != weapon)): + # Weapon does not have enough possible ammo to kill the boss, raise the damage + if boss == 9: + if weapon != 3: + # Atomic Fire and Crash Bomber cannot be Picopico-kun's only weakness + world.weapon_damage[weapon][boss] = 0 + weakness = world.random.choice((2, 3, 4, 5, 7, 8)) + world.weapon_damage[weakness][boss] = minimum_weakness_requirement[weakness] + elif boss == 11: + if weapon == 1: + # Atomic Fire cannot be Boobeam Trap's only weakness + world.weapon_damage[weapon][boss] = 0 + weakness = world.random.choice((2, 3, 4, 5, 6, 7, 8)) + world.weapon_damage[weakness][boss] = minimum_weakness_requirement[weakness] + else: + world.weapon_damage[weapon][boss] = minimum_weakness_requirement[weapon] + starting = world.options.starting_robot_master.value + world.weapon_damage[0][starting] = 1 + + for p_boss in world.options.plando_weakness: + for p_weapon in world.options.plando_weakness[p_boss]: + if world.options.plando_weakness[p_boss][p_weapon] < minimum_weakness_requirement[p_weapon] \ + and not any(w != p_weapon + and world.weapon_damage[w][bosses[p_boss]] > minimum_weakness_requirement[w] + for w in world.weapon_damage): + # we need to replace this weakness + weakness = world.random.choice([key for key in world.weapon_damage if key != p_weapon]) + world.weapon_damage[weakness][bosses[p_boss]] = minimum_weakness_requirement[weakness] + world.weapon_damage[weapons_to_id[p_weapon]][bosses[p_boss]] \ + = world.options.plando_weakness[p_boss][p_weapon] + + if world.weapon_damage[0][world.options.starting_robot_master.value] < 1: + world.weapon_damage[0][world.options.starting_robot_master.value] = weapon_damage[0][world.options.starting_robot_master.value] + + # final special case + # There's a vanilla crash if Time Stopper kills Wily phase 1 + # There's multiple fixes, but ensuring Wily cannot take Time Stopper damage is best + if world.weapon_damage[8][12] > 0: + world.weapon_damage[8][12] = 0 + + # weakness validation, it is better to confirm a completable seed than respect plando + boss_health = {boss: 0x1C if boss != 12 else 0x1C * 2 for boss in [*range(8), 12]} + + weapon_energy = {key: float(0x1C) for key in weapon_costs} + weapon_boss = {boss: {weapon: world.weapon_damage[weapon][boss] for weapon in world.weapon_damage} + for boss in [*range(8), 12]} + flexibility = { + boss: ( + sum(damage_value > 0 for damage_value in + weapon_damages.values()) # Amount of weapons that hit this boss + * sum(weapon_damages.values()) # Overall damage that those weapons do + ) + for boss, weapon_damages in weapon_boss.items() if boss != 12 + } + flexibility = sorted(flexibility, key=flexibility.get) # Fast way to sort dict by value + used_weapons = {i: set() for i in [*range(8), 12]} + for boss in [*flexibility, 12]: + boss_damage = weapon_boss[boss] + weapon_weight = {weapon: (weapon_energy[weapon] / damage) if damage else 0 for weapon, damage in + boss_damage.items() if weapon_energy[weapon] > 0} + if any(boss_damage[i] > 0 for i in range(8)) and 8 in weapon_weight: + # We get exactly one use of Time Stopper during the rush + # So we want to make sure that use is absolutely needed + weapon_weight[8] = min(weapon_weight[8], 0.001) + while boss_health[boss] > 0: + if boss_damage[0] > 0: + boss_health[boss] = 0 # if we can buster, we should buster + continue + highest, wp = max(zip(weapon_weight.values(), weapon_weight.keys())) + uses = weapon_energy[wp] // weapon_costs[wp] + used_weapons[boss].add(wp) + if int(uses * boss_damage[wp]) > boss_health[boss]: + used = ceil(boss_health[boss] / boss_damage[wp]) + weapon_energy[wp] -= weapon_costs[wp] * used + boss_health[boss] = 0 + elif highest <= 0: + # we are out of weapons that can actually damage the boss + # so find the weapon that has the most uses, and apply that as an additional weakness + # it should be impossible to be out of energy, simply because even if every boss took 1 from + # Quick Boomerang and no other, it would only be 28 off from defeating all 9, which Metal Blade should + # be able to cover + wp, max_uses = max((weapon, weapon_energy[weapon] // weapon_costs[weapon]) for weapon in weapon_weight + if weapon != 0) + world.weapon_damage[wp][boss] = minimum_weakness_requirement[wp] + used = min(int(weapon_energy[wp] // weapon_costs[wp]), + ceil(boss_health[boss] // minimum_weakness_requirement[wp])) + weapon_energy[wp] -= weapon_costs[wp] * used + boss_health[boss] -= int(used * minimum_weakness_requirement[wp]) + weapon_weight.pop(wp) + else: + # drain the weapon and continue + boss_health[boss] -= int(uses * boss_damage[wp]) + weapon_energy[wp] -= weapon_costs[wp] * uses + weapon_weight.pop(wp) + + world.wily_5_weapons = {boss: sorted(used_weapons[boss]) for boss in used_weapons} + + for i, boss_locations in enumerate([ + heat_man_locations, + air_man_locations, + wood_man_locations, + bubble_man_locations, + quick_man_locations, + flash_man_locations, + metal_man_locations, + crash_man_locations, + wily_1_locations, + wily_2_locations, + wily_3_locations, + wily_4_locations, + wily_5_locations, + wily_6_locations + ]): + if world.weapon_damage[0][i] > 0: + continue # this can always be in logic + weapons = [] + for weapon in range(1, 9): + if world.weapon_damage[weapon][i] > 0: + if world.weapon_damage[weapon][i] < minimum_weakness_requirement[weapon]: + continue # Atomic Fire can only be considered logical for bosses it can kill in 2 hits + weapons.append(weapons_to_name[weapon]) + if not weapons: + raise Exception(f"Attempted to have boss {i} with no weakness! Seed: {world.multiworld.seed}") + for location in boss_locations: + if i == 12: + add_rule(world.get_location(location), + lambda state, weps=tuple(weapons): state.has_all(weps, world.player)) + # TODO: when has_list gets added, check for a subset of possible weaknesses + else: + add_rule(world.get_location(location), + lambda state, weps=tuple(weapons): state.has_any(weps, world.player)) + + # Always require Crash Bomber for Boobeam Trap + add_rule(world.get_location(names.wily_4), + lambda state: state.has(names.crash_bomber, world.player)) + add_rule(world.get_location(names.wily_stage_4), + lambda state: state.has(names.crash_bomber, world.player)) + + # Need to defeat x amount of robot masters for Wily 5 + add_rule(world.get_location(names.wily_5), + lambda state: can_defeat_enough_rbms(state, world.player, world.options.wily_5_requirement.value, + world.wily_5_weapons)) + add_rule(world.get_location(names.wily_stage_5), + lambda state: can_defeat_enough_rbms(state, world.player, world.options.wily_5_requirement.value, + world.wily_5_weapons)) + + if not world.options.yoku_jumps: + add_rule(world.get_entrance("To Heat Man Stage"), + lambda state: state.has(names.item_2, world.player)) + + if not world.options.enable_lasers: + add_rule(world.get_entrance("To Quick Man Stage"), + lambda state: state.has(names.time_stopper, world.player)) + + if world.options.consumables in (Consumables.option_1up_etank, + Consumables.option_all): + add_rule(world.get_location(names.flash_man_c2), + lambda state: state.has_any([names.item_1, names.item_2, names.item_3], world.player)) + add_rule(world.get_location(names.quick_man_c1), + lambda state: state.has_any([names.item_1, names.item_2, names.item_3], world.player)) + add_rule(world.get_location(names.metal_man_c2), + lambda state: state.has_any([names.item_1, names.item_2], world.player)) + add_rule(world.get_location(names.metal_man_c3), + lambda state: state.has_any([names.item_1, names.item_2], world.player)) + add_rule(world.get_location(names.crash_man_c3), + lambda state: state.has_any([names.item_1, names.item_2, names.item_3], world.player)) + add_rule(world.get_location(names.wily_2_c5), + lambda state: state.has(names.crash_bomber, world.player)) + add_rule(world.get_location(names.wily_2_c6), + lambda state: state.has(names.crash_bomber, world.player)) + add_rule(world.get_location(names.wily_3_c2), + lambda state: state.has(names.crash_bomber, world.player)) + if world.options.consumables in (Consumables.option_weapon_health, + Consumables.option_all): + add_rule(world.get_location(names.flash_man_c3), + lambda state: state.has(names.crash_bomber, world.player)) + add_rule(world.get_location(names.flash_man_c4), + lambda state: state.has(names.crash_bomber, world.player)) + add_rule(world.get_location(names.wily_3_c1), + lambda state: state.has(names.crash_bomber, world.player)) diff --git a/worlds/mm2/src/mm2_basepatch.asm b/worlds/mm2/src/mm2_basepatch.asm new file mode 100644 index 000000000000..00c8500f03df --- /dev/null +++ b/worlds/mm2/src/mm2_basepatch.asm @@ -0,0 +1,861 @@ +norom +!headersize = 16 + +!controller_mirror = $23 +!controller_flip = $27 ; only on first frame of input, used by crash man, etc +!current_stage = $2A +!received_stages = $8A +!completed_stages = $8B +!received_item_checks = $8C +!last_wily = $8D +!deathlink = $8F +!energylink_packet = $90 +!rbm_strobe = $91 +!received_weapons = $9A +!received_items = $9B +!current_weapon = $A9 + +!stage_completion = $0F70 +!consumable_checks = $0F80 + +!CONTROLLER_SELECT = #$04 +!CONTROLLER_SELECT_START = #$0C +!CONTROLLER_ALL_BUTTON = #$0F + +!PpuControl_2000 = $2000 +!PpuMask_2001 = $2001 +!PpuAddr_2006 = $2006 +!PpuData_2007 = $2007 + +!LOAD_BANK = $C000 + +macro org(address,bank) + if == $0F + org
-$C000+($4000*)+!headersize ; org sets the position in the output file to write to (in norom, at least) + base
; base sets the position that all labels are relative to - this is necessary so labels will still start from $8000, instead of $0000 or somewhere + else + org
-$8000+($4000*)+!headersize + base
+ endif +endmacro + +%org($8400, $08) +incbin "mm2font.dat" + +%org($A900, $09) +incbin "mm2titlefont.dat" + +%org($807E, $0B) +FlashFixes: + CMP #$FF + BEQ FlashFixTarget1 + CMP #$FF + BNE FlashFixTarget2 + +%org($8086, $0B) +FlashFixTarget1: + +%org($808D, $0B) +FlashFixTarget2: + +%org($8015, $0D) +ClearRefreshHook: + ; if we're already doing a fresh load of the stage select + ; we don't need to immediately refresh it + JSR ClearRefresh + NOP + +%org($802B, $0D) +PatchFaceTiles: + LDA !received_stages + +%org($8072, $0D) +PatchFaceSprites: + LDA !received_stages + +%org($80CC, $0D) +CheckItemsForWily: + LDA !received_items + CMP #$07 + +%org($80D2, $0D) +LoadWily: + JSR GoToMostRecentWily + NOP + +%org($80DC, $0D) +CheckAccessCodes: + LDA !received_stages + +%org($8312, $0D) +HookStageSelect: + JSR RefreshRBMTiles + NOP + +%org($A315, $0D) +RemoveWeaponClear: + NOP + NOP + NOP + NOP + +;Adjust Password select flasher +%org($A32A, $0D) + LDX #$68 + +;Block password input +%org($A346, $0D) + EOR #$00 + +;Remove password text +%org($AF3A, $0D) +StartHeight: + db $AC ; set Start to center + +%org($AF49, $0D) +PasswordText: + db $40, $40, $40, $40, $40, $40, $40, $40 + +%org($AF6C, $0D) +ContinueHeight: + db $AB ; split height between 2 remaining options + +%org($AF77, $0D) +StageSelectHeight: + db $EB ; split between 2 remaining options + +%org($AF88, $0D) +GameOverPasswordText: + db $40, $40, $40, $40, $40, $40, $40, $40 + +%org($AFA5, $0D) +GetEquippedPasswordText: + db $40, $40, $40, $40, $40, $40, $40, $40 + +%org($AFAE, $0D) +GetEquippedStageSelect: + db $26, $EA + +%org($B195, $0D) +GameOverPasswordUp: + LDA #$01 ; originally 02, removing last option + +%org($B19F, $0D) +GameOverPassword: + CMP #$02 ; originally 03, remove the last option + +%org($B1ED, $0D) +FixupGameOverArrows: + db $68, $78 + +%org($BB74, $0D) +GetEquippedStage: + JSR StageGetEquipped + NOP #13 + +%org($BBD9, $0D) +GetEquippedDefault: + LDA #$01 + +%org($BC01, $0D) +GetEquippedPasswordRemove: + ORA #$01 ; originally EOR #$01, we always want 1 here + +%org($BCF1, $0D) +GetEquippedItem: + ADC #$07 + JSR ItemGetEquipped + JSR LoadItemsColor + NOP ; !!!! This is a load-bearing NOP. It gets branched to later in the function + LDX $FF + + +%org($BB08, $0D) +WilyProgress: + JSR StoreWilyProgress + NOP + +%org($BF6F, $0D) +GetEquippedStageSelectHeight: + db $B8 + +%org($805B, $0E) +InitalizeStartingRBM: + LDA #$FF ; this does two things + STA !received_stages ; we're overwriting clearing e-tanks and setting RBM available to none + +%org($8066, $0E) +BlockStartupAutoWily: + ; presumably this would be called from password? + LDA #$00 + +%org($80A7, $0E) +StageLoad: + JMP CleanWily5 + NOP + +%org($8178, $0E) +Main1: + JSR MainLoopHook + NOP + +%org($81DE, $0E) +Wily5Teleporter: + LDA $99 + CMP #$01 + BCC SkipSpawn + +%org($81F9, $0E) +SkipSpawn: +; just present to fix the branch, if we try to branch raw it'll get confused + +%org($822D, $0E) +Main2: + ; believe used in the wily 5 refights? + JSR MainLoopHook + NOP + +%org($842F, $0E) +Wily5Hook: + JMP Wily5Requirement + NOP + +%org($C10D, $0F) +Deathlink: + JSR KillMegaMan + +%org($C1BC, $0F) +RemoveETankLoss: + NOP + NOP + +%org($C23C, $0F) +WriteStageComplete: + ORA !completed_stages + STA !completed_stages + +%org($C243, $0F) +WriteReceiveItem: + ORA !received_item_checks + STA !received_item_checks + +%org($C254, $0F) +BlockAutoWily: + ; and this one is on return from stage? + LDA #$00 + +%org($C261, $0F) +WilyStageCompletion: + JSR StoreWilyStageCompletion + NOP + +%org($E5AC, $0F) +NullDeathlink: + STA $8F ; we null his HP later in the process + NOP + +%org($E5D1, $0F) +EnergylinkHook: + JSR Energylink + NOP #2 ; comment this out to enable item giving their usual reward alongside EL + +%org($E5E8, $0F) +ConsumableHook: + JSR CheckConsumable + +%org($F2E3, $0F) + +CheckConsumable: + STA $0140, Y + TXA + PHA + LDA $AD ; the consumable value + CMP #$7C + BPL .Store + print "Consumables (replace 7a): ", hex(realbase()) + CMP #$76 + BMI .Store + LDA #$00 + .Store: + STA $AD + LDA $2A + ASL + ASL + TAX + TYA + .LoopHead: + CMP #$08 + BMI .GetFlag + INX + SBC #$08 + BNE .LoopHead + .GetFlag: + TAY + LDA #$01 + .Loop2Head: + CPY #$00 + BEQ .Apply + ASL + DEY + BNE .Loop2Head + .Apply: + ORA !consumable_checks, X + STA !consumable_checks, X + PLA + TAX + RTS + +GoToMostRecentWily: + LDA !controller_mirror + CMP !CONTROLLER_SELECT_START + BEQ .Default + LDA !last_wily + BNE .Store + .Default: + LDA #$08 ; wily stage 1 + .Store: + STA !current_stage + RTS + +StoreWilyStageCompletion: + LDA #$01 + STA !stage_completion, X + INC !current_stage + LDA !current_stage + STA !last_wily + RTS + +ReturnToGameOver: + LDA #$10 + STA !PpuControl_2000 + LDA #$06 + STA !PpuMask_2001 + JMP $C1BE ; specific code that loads game over + +MainLoopHook: + LDA !controller_mirror + CMP !CONTROLLER_ALL_BUTTON + BNE .Next + JMP ReturnToGameOver + .Next: + LDA !deathlink + CMP #$01 + BNE .Next2 + JMP $E5A8 ; this kills the Mega Man + .Next2: + print "Quickswap:", hex(realbase()) + LDA #$00 ; slot data, write in enable for quickswap + CMP #$01 + BNE .Finally + LDA !controller_flip + AND !CONTROLLER_SELECT + BEQ .Finally + JMP Quickswap + .Finally: + LDA !controller_flip + AND #$08 ; this is checking for menu + RTS + +StoreWilyProgress: + STA !current_stage + TXA + PHA + LDX !current_stage + LDA #$01 + STA !stage_completion, X + PLA + TAX + print "Get Equipped Music: ", hex(realbase()) + LDA #$17 + RTS + +KillMegaMan: + JSR $C051 ; this kills the mega man + LDA #$00 + STA $06C0 ; set HP to zero so client can actually detect he died + RTS + +Wily5Requirement: + LDA #$01 + LDX #$08 + LDY #$00 + .LoopHead: + BIT $BC + BEQ .Skip + INY + .Skip: + DEX + ASL + CPX #$00 + BNE .LoopHead + print "Wily 5 Requirement:", hex(realbase()) + CPY #$08 + BCS .SpawnTeleporter + JMP $8450 + .SpawnTeleporter: + LDA #$FF + STA $BC + LDA #$01 + STA $99 + JMP $8433 + +CleanWily5: + LDA #$00 + STA $BC + STA $99 + JMP $80AB + +LoadString: + STY $00 + ASL + ASL + ASL + ASL + TAY + LDA $DB + ADC #$00 + STA $C8 + LDA #$40 + STA $C9 + LDA #$F6 + CLC + ADC $C8 + STA $CA + LDA ($C9), Y + STA $03B6 + TYA + CLC + ADC #$01 + TAY + LDA $CA + ADC #$00 + STA $CA + LDA ($C9), Y + STA $03B7 + TYA + CLC + ADC #$01 + TAY + LDA $CA + ADC #$00 + STA $CA + STY $FE + LDA #$0E + STA $FD + .LoopHead: + JSR $BD34 + LDY $FE + CPY #$40 + BNE .NotEqual + LDA $0420 + BNE .Skip + .NotEqual: + LDA ($C9), Y + .Skip: + STA $03B8 + INC $47 + INC $03B7 + LDA $FE + CLC + ADC #$01 + STA $FE + LDA $CA + ADC #$00 + STA $CA + DEC $FD + BNE .LoopHead + LDY $00 + JSR $C0AB + RTS + +StageGetEquipped: + LDA !current_stage + LDX #$00 + BCS LoadGetEquipped +ItemGetEquipped: + LDX #$02 +LoadGetEquipped: + STX $DB + ASL + ASL + PHA + SEC + JSR LoadString + PLA + ADC #$00 + PHA + SEC + JSR LoadString + PLA + ADC #$00 + PHA + SEC + JSR LoadString + LDA #$00 + SEC + JSR $BD3E + PLA + ADC #$00 + SEC + JSR LoadString + RTS + +LoadItemsColor: + LDA #$7D + STA $FD + LDA $0420 + AND #$0F + ASL + SEC + ADC #$1A + STA $FF + RTS + +Energylink: + LSR $0420, X + print "Energylink: ", hex(realbase()) + LDA #$00 + BEQ .ApplyDrop + LDA $04E0, X + BEQ .ApplyDrop ; This is a stage pickup, and not an enemy drop + STY !energylink_packet + SEC + BCS .Return + .ApplyDrop: + STY $AD + .Return: + RTS + + +Quickswap: + LDX #$0F + .LoopHead: + LDA $0420, X + BMI .Return1 ; return if we have any weapon entities spawned + DEX + CPX #$01 + BNE .LoopHead + LDX !current_weapon + BNE .DoQuickswap + LDX #$00 + .DoQuickswap: + TYA + PHA + LDX !current_weapon + INX + CPX #$09 + BPL .Items + LDA #$01 + .Loop2Head: + DEX + BEQ .FoundTarget + ASL + CPX #$00 + BNE .Loop2Head + .FoundTarget: + LDX !current_weapon + INX + .Loop3Head: + PHA + AND !received_weapons + BNE .CanSwap + PLA + INX + CPX #$09 + BPL .Items + ASL + BNE .Loop3Head + .CanSwap: + PLA + SEC + BCS .ApplySwap + .Items: + TXA + PHA + SEC + SBC #$08 + TAX + LDA #$01 + .Loop4Head: + DEX + BEQ .CheckItem + ASL + CPX #$00 + BNE .Loop4Head + .CheckItem: + TAY + PLA + TAX + TYA + .Loop5Head: + PHA + AND !received_items + BNE .CanSwap + PLA + INX + ASL + BNE .Loop5Head + LDX #$00 + SEC + BCS .ApplySwap + .Return1: + RTS + .ApplySwap: ; $F408 on old rom + LDA #$0D + JSR !LOAD_BANK + ; this is a bunch of boiler plate to make the swap work + LDA $B5 + PHA + LDA $B6 + PHA + LDA $B7 + PHA + LDA $B8 + PHA + LDA $B9 + PHA + LDA $20 + PHA + LDA $1F + PHA + ;but wait, there's more + STX !current_weapon + JSR $CC6C + LDA $1A + PHA + LDX #$00 + .Loop6Head: + STX $FD + CLC + LDA $52 + ADC $957F, X + STA $08 + LDA $53 + ADC #$00 + STA $09 + LDA $08 + LSR $09 + ROR + LSR $09 + ROR + STA $08 + AND #$3F + STA $1A + CLC + LDA $09 + ADC #$85 + STA $09 + LDA #$00 + STA $1B + LDA $FD + CMP #$08 + BCS .Past8 + LDX $A9 + LDA $9664, X + TAY + CPX #$09 + BCC .LessThanNine + LDX #$00 + BEQ .Apply + .LessThanNine: + LDX #$05 + BNE .Apply + .Past8: + LDY #$90 + LDX #$00 + .Apply: + JSR $C760 + JSR $C0AB ; iirc this is loading graphics? + LDX $FD + INX + CPX #$0F + BNE .Loop6Head + STX $FD + LDY #$90 + LDX #$00 + JSR $C760 + JSR $D2ED + ; two sections redacted here, might need to look at what they actually do? + PLA + STA $1A + PLA + STA $1F + PLA + STA $20 + PLA + STA $B9 + PLA + STA $B8 + PLA + STA $B7 + PLA + STA $B6 + PLA + STA $B5 + LDA #$00 + STA $AC + STA $2C + STA $0680 + STA $06A0 + LDA #$1A + STA $0400 + LDA #$03 + STA $AA + LDA #$30 + JSR $C051 + .Finally: + LDA #$0E + JSR !LOAD_BANK + PLA + TAY + .Return: + RTS + +RefreshRBMTiles: + ; primarily just a copy of the startup RBM setup, we just do it again + ; can't jump to it as it leads into the main loop + LDA !rbm_strobe + BNE .Update + JMP .NoUpdate + .Update: + LDA #$00 + STA !rbm_strobe + LDA #$10 + STA $F7 + STA !PpuControl_2000 + LDA #$06 + STA $F8 + STA !PpuMask_2001 + JSR $847E + JSR $843C + LDX #$00 + LDA $8A + STA $01 + .TileLoop: + STX $00 + LSR $01 + BCC .SkipTile + LDA $8531,X + STA $09 + LDA $8539,X + STA $08 + LDX #$04 + LDA #$00 + .ClearBody: + LDA $09 + STA !PpuAddr_2006 + LDA $08 + STA !PpuAddr_2006 + LDY #$04 + LDA #$00 + .ClearLine: + STA !PpuData_2007 + DEY + BNE .ClearLine + CLC + LDA $08 + ADC #$20 + STA $08 + DEX + BNE .ClearBody + .SkipTile: + LDX $00 + INX + CPX #$08 + BNE .TileLoop + LDX #$1F + JSR $829E + JSR $8473 + LDX #$00 + LDA $8A + STA $02 + LDY #$00 + .SpriteLoop: + STX $01 + LSR $02 + BCS .SkipRBM + LDA $8605,X + STA $00 + LDA $85FD,X + TAX + .WriteSprite: + LDA $8541,X + STA $0200,Y + INY + INX + DEC $00 + BNE .WriteSprite + .SkipRBM: + LDX $01 + INX + CPX #$08 + BNE .SpriteLoop + JSR $A51D + LDA #$0C + JSR $C051 + LDA #$00 + STA $2A + STA $FD + JSR $C0AB + .NoUpdate: + LDA $1C + AND #$08 + RTS + +ClearRefresh: + LDA #$00 + STA !rbm_strobe + LDA #$10 + STA $F7 + RTS + +assert realbase() <= $03F650 ; This is the start of our text data, and we absolutely cannot go past this point (text takes too much room). + +%org($F640, $0F) +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" +db $25, $4B, "PLACEHOLDER_L1" +db $25, $6B, "PLACEHOLDER_L2" +db $25, $8B, "PLACEHOLDER_L3" +db $25, $EB, "PLACEHOLDER_PL" + +%org($FFB0, $0F) +db "MM2_BASEPATCH_ARCHI " \ No newline at end of file diff --git a/worlds/mm2/src/mm2font.dat b/worlds/mm2/src/mm2font.dat new file mode 100644 index 0000000000000000000000000000000000000000..4bf97ee42c691a2f45e5afbe7ed5d16ec06047b8 GIT binary patch literal 416 zcmY+Au?hk)42CltM~53Sc#yF}L2>GMI2=_Jaj)aSJ&07Cd=KAD@I5ruYjXZ%==bwC zO={4x(7+@#70X~@aLI8AF8Ubzw(X1Ye7p=U5BI`AZiVapMmTntE(!qRHk*V4|4{gBNb1j=IrEQ)hX*eI@4$gS$nrJE4*Wqj W{~sHVgoT9#Ts_c!5JKT2=?4HnNh6;C literal 0 HcmV?d00001 diff --git a/worlds/mm2/test/__init__.py b/worlds/mm2/test/__init__.py new file mode 100644 index 000000000000..e712b0fe2ba6 --- /dev/null +++ b/worlds/mm2/test/__init__.py @@ -0,0 +1,5 @@ +from test.bases import WorldTestBase + + +class MM2TestBase(WorldTestBase): + game = "Mega Man 2" diff --git a/worlds/mm2/test/test_access.py b/worlds/mm2/test/test_access.py new file mode 100644 index 000000000000..97ef5075a3cb --- /dev/null +++ b/worlds/mm2/test/test_access.py @@ -0,0 +1,47 @@ +from . import MM2TestBase +from ..locations import (quick_man_locations, heat_man_locations, wily_1_locations, wily_2_locations, + wily_3_locations, wily_4_locations, wily_5_locations, wily_6_locations, + energy_pickups, etank_1ups) +from ..names import * + + +class TestAccess(MM2TestBase): + options = { + "consumables": "all" + } + + def test_time_stopper(self) -> None: + """Optional based on Enable Lasers setting, confirm these are the locations affected""" + locations = [*quick_man_locations, *energy_pickups["Quick Man Stage"], *etank_1ups["Quick Man Stage"]] + items = [["Time Stopper"]] + self.assertAccessDependency(locations, items) + + def test_item_2(self) -> None: + """Optional based on Yoku Block setting, confirm these are the locations affected""" + locations = [*heat_man_locations, *etank_1ups["Heat Man Stage"]] + items = [["Item 2 - Rocket"]] + self.assertAccessDependency(locations, items, True) + + def test_any_item(self) -> None: + locations = [flash_man_c2, quick_man_c1, crash_man_c3] + items = [["Item 1 - Propeller"], ["Item 2 - Rocket"], ["Item 3 - Bouncy"]] + self.assertAccessDependency(locations, items, True) + locations = [metal_man_c2, metal_man_c3] + items = [["Item 1 - Propeller"], ["Item 2 - Rocket"]] + self.assertAccessDependency(locations, items, True) + + def test_all_items(self) -> None: + locations = [flash_man_c2, quick_man_c1, crash_man_c3, metal_man_c2, metal_man_c3, *heat_man_locations, + *etank_1ups["Heat Man Stage"], *wily_1_locations, *wily_2_locations, *wily_3_locations, + *wily_4_locations, *wily_5_locations, *wily_6_locations, *etank_1ups["Wily Stage 1"], + *etank_1ups["Wily Stage 2"], *etank_1ups["Wily Stage 3"], *etank_1ups["Wily Stage 4"], + *energy_pickups["Wily Stage 1"], *energy_pickups["Wily Stage 2"], *energy_pickups["Wily Stage 3"], + *energy_pickups["Wily Stage 4"]] + items = [["Item 1 - Propeller", "Item 2 - Rocket", "Item 3 - Bouncy"]] + self.assertAccessDependency(locations, items) + + def test_crash_bomber(self) -> None: + locations = [flash_man_c3, flash_man_c4, wily_2_c5, wily_2_c6, wily_3_c1, wily_3_c2, + wily_4, wily_stage_4] + items = [["Crash Bomber"]] + self.assertAccessDependency(locations, items) diff --git a/worlds/mm2/test/test_weakness.py b/worlds/mm2/test/test_weakness.py new file mode 100644 index 000000000000..d3dc7b686704 --- /dev/null +++ b/worlds/mm2/test/test_weakness.py @@ -0,0 +1,93 @@ +from math import ceil + +from . import MM2TestBase +from ..options import bosses + + +# Need to figure out how this test should work +def validate_wily_5(base: MM2TestBase) -> None: + world = base.multiworld.worlds[base.player] + weapon_damage = world.weapon_damage + boss_health = {boss: 0x1C for boss in [*list(range(8)), 12]} + weapon_costs = { + 0: 0, + 1: 10, + 2: 2, + 3: 3, + 4: 0.5, + 5: 0.125, + 6: 4, + 7: 0.25, + 8: 7, + } + weapon_energy = {key: float(0x1C * 2) if key == 12 else float(0x1C) for key in weapon_costs} + weapon_boss = {boss: {weapon: weapon_damage[weapon][boss] for weapon in weapon_damage} + for boss in [*list(range(8)), 12]} + flexibility = [(sum(1 if weapon_boss[boss][weapon] > 0 else 0 for weapon in range(9)) * + sum(weapon_boss[boss].values()), boss) for boss in weapon_boss if boss != 12] + for _, boss in [*sorted(flexibility), (0, 12)]: + boss_damage = weapon_boss[boss] + weapon_weight = {weapon: (weapon_energy[weapon] / damage) if damage else 0 for weapon, damage in + boss_damage.items() if weapon_energy[weapon]} + if any(boss_damage[i] > 0 for i in range(8)) and 8 in weapon_weight: + # We get exactly one use of Time Stopper during the rush + # So we want to make sure that use is absolutely needed + weapon_weight[8] = min(weapon_weight[8], 0.001) + while boss_health[boss] > 0: + if boss_damage[0]: + boss_health[boss] = 0 # if we can buster, we should buster + continue + highest, wp = max(zip(weapon_weight.values(), weapon_weight.keys())) + uses = weapon_energy[wp] // weapon_costs[wp] + if int(uses * boss_damage[wp]) > boss_health[boss]: + used = ceil(boss_health[boss] / boss_damage[wp]) + weapon_energy[wp] -= weapon_costs[wp] * used + boss_health[boss] = 0 + elif highest <= 0: + # we are out of weapons that can actually damage the boss + base.fail(f"Ran out of weapon energy to damage " + f"{next(name for name in bosses if bosses[name] == boss)}\n" + f"Seed: {base.multiworld.seed}\n" + f"Damage Table: {weapon_damage}") + else: + # drain the weapon and continue + boss_health[boss] -= int(uses * boss_damage[wp]) + weapon_energy[wp] -= weapon_costs[wp] * uses + weapon_weight.pop(wp) + + +class StrictWeaknessTests(MM2TestBase): + options = { + "strict_weakness": True, + "yoku_jumps": True, + "enable_lasers": True + } + + def test_that_every_boss_has_a_weakness(self) -> None: + world = self.multiworld.worlds[self.player] + weapon_damage = world.weapon_damage + for boss in range(14): + if not any(weapon_damage[weapon][boss] for weapon in range(9)): + self.fail(f"Boss {boss} generated without weakness! Seed: {self.multiworld.seed}") + + def test_wily_5(self) -> None: + validate_wily_5(self) + + +class RandomStrictWeaknessTests(MM2TestBase): + options = { + "strict_weakness": True, + "random_weakness": "randomized", + "yoku_jumps": True, + "enable_lasers": True + } + + def test_that_every_boss_has_a_weakness(self) -> None: + world = self.multiworld.worlds[self.player] + weapon_damage = world.weapon_damage + for boss in range(14): + if not any(weapon_damage[weapon][boss] for weapon in range(9)): + self.fail(f"Boss {boss} generated without weakness! Seed: {self.multiworld.seed}") + + def test_wily_5(self) -> None: + validate_wily_5(self) diff --git a/worlds/mm2/text.py b/worlds/mm2/text.py new file mode 100644 index 000000000000..32d665bf6c7f --- /dev/null +++ b/worlds/mm2/text.py @@ -0,0 +1,90 @@ +from typing import DefaultDict +from collections import defaultdict + +MM2_WEAPON_ENCODING: DefaultDict[str, int] = defaultdict(lambda x: 0x6F, { + ' ': 0x40, + 'A': 0x41, + 'B': 0x42, + 'C': 0x43, + 'D': 0x44, + 'E': 0x45, + 'F': 0x46, + 'G': 0x47, + 'H': 0x48, + 'I': 0x49, + 'J': 0x4A, + 'K': 0x4B, + 'L': 0x4C, + 'M': 0x4D, + 'N': 0x4E, + 'O': 0x4F, + 'P': 0x50, + 'Q': 0x51, + 'R': 0x52, + 'S': 0x53, + 'T': 0x54, + 'U': 0x55, + 'V': 0x56, + 'W': 0x57, + 'X': 0x58, + 'Y': 0x59, + 'Z': 0x5A, + # 0x5B is the small r in Dr Light + '.': 0x5C, + ',': 0x5D, + '\'': 0x5E, + '!': 0x5F, + '(': 0x60, + ')': 0x61, + '#': 0x62, + '$': 0x63, + '%': 0x64, + '&': 0x65, + '*': 0x66, + '+': 0x67, + '/': 0x68, + '\\': 0x69, + ':': 0x6A, + ';': 0x6B, + '<': 0x6C, + '>': 0x6D, + '=': 0x6E, + '?': 0x6F, + '@': 0x70, + '[': 0x71, + ']': 0x72, + '^': 0x73, + '_': 0x74, + '`': 0x75, + '{': 0x76, + '}': 0x77, + '|': 0x78, + '~': 0x79, + '\"': 0x92, + '-': 0x94, + '0': 0xA0, + '1': 0xA1, + '2': 0xA2, + '3': 0xA3, + '4': 0xA4, + '5': 0xA5, + '6': 0xA6, + '7': 0xA7, + '8': 0xA8, + '9': 0xA9, +}) + + +class MM2TextEntry: + def __init__(self, text: str = "", coords: int = 0x0B): + self.target_area: int = 0x25 # don't change + self.coords: int = coords # 0xYX, Y can only be increments of 0x20 + self.text: str = text + + def resolve(self) -> bytes: + data = bytearray() + data.append(self.target_area) + data.append(self.coords) + data.extend([MM2_WEAPON_ENCODING[x] for x in self.text.upper()]) + data.extend([0x40] * (14 - len(self.text))) + return bytes(data) From 54a7bb566400ac1054d61782eae74ea3f8540cf0 Mon Sep 17 00:00:00 2001 From: Trevor L <80716066+TRPG0@users.noreply.github.com> Date: Tue, 20 Aug 2024 17:18:28 -0600 Subject: [PATCH 15/60] Blasphemous: Total overhaul (#3355) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Blasphemous: WIP overhaul * Entrance rule mistake * stuff * Getting closer * Real?? Maybe?? * Don't fail me now 🙏 * Add starting location tests * More tests (it still doesn't work actually 😔) * REAL * Add unreachable regions to test_reachability.py * PR ready - Remove unused functions from init - Use group exclusive functions in rules - Style changes * Bump required client version * Clean up unused imports * Change slot data * Review fixes - Prevent strength calculations from including excess items - Add new lines to ends of files - Fix missed deprecated option and random usage in init * Update option docstrings, add groups * Add preprocessor files * Update option docstrings again actually * Update player strength calculation * Rename group methods * Fix missing logic for RESCUED_CHERUB_06 * Register indirect conditions * Register indirect conditions (part 2) * Update extracted logic, change slot data key * Add region to excluded list * A capital letter * Use camelCase keys in preprocessor * Write some of new setup guide * Remove indents before list points * Change locationinfo to list of dictonaries * Finish docs, update extractor config and data * Mark region_data.py as generated * Suggested changes * More suggested changes * Suggested changes again - Use OptionError - Create list of disabled locations before looping - Check if options are equal to str instead of int - Clean up start location override - Reword some of setup guide - Organize location list - Remove unnecessary escaped quotes from option docstrings - Add world type to test base * C# moment * Requested changes * Update .gitattributes --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> --- .gitattributes | 1 + test/general/test_reachability.py | 12 + worlds/blasphemous/ExtractorConfig.json | 19 + worlds/blasphemous/Items.py | 70 +- worlds/blasphemous/Locations.py | 1300 +- worlds/blasphemous/Options.py | 196 +- worlds/blasphemous/Preprocessor.py | 582 + worlds/blasphemous/Rooms.py | 5405 -- worlds/blasphemous/Rules.py | 5626 +- worlds/blasphemous/Vanilla.py | 6 +- worlds/blasphemous/__init__.py | 327 +- worlds/blasphemous/docs/setup_en.md | 53 +- worlds/blasphemous/region_data.py | 48070 ++++++++++++++++ worlds/blasphemous/test/__init__.py | 7 + .../blasphemous/test/test_background_zones.py | 56 + .../test/test_starting_locations.py | 135 + 16 files changed, 50810 insertions(+), 11055 deletions(-) create mode 100644 .gitattributes create mode 100644 worlds/blasphemous/ExtractorConfig.json create mode 100644 worlds/blasphemous/Preprocessor.py delete mode 100644 worlds/blasphemous/Rooms.py create mode 100644 worlds/blasphemous/region_data.py create mode 100644 worlds/blasphemous/test/__init__.py create mode 100644 worlds/blasphemous/test/test_background_zones.py create mode 100644 worlds/blasphemous/test/test_starting_locations.py diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000000..537a05f68b67 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +worlds/blasphemous/region_data.py linguist-generated=true diff --git a/test/general/test_reachability.py b/test/general/test_reachability.py index d50013cc4178..fafa7023893c 100644 --- a/test/general/test_reachability.py +++ b/test/general/test_reachability.py @@ -14,6 +14,18 @@ class TestBase(unittest.TestCase): "Desert Northern Cliffs", # on top of mountain, only reachable via OWG "Dark Death Mountain Bunny Descent Area" # OWG Mountain descent }, + # These Blasphemous regions are not reachable with default options + "Blasphemous": { + "D01Z04S13[SE]", # difficulty must be hard + "D01Z05S25[E]", # difficulty must be hard + "D02Z02S05[W]", # difficulty must be hard and purified_hand must be true + "D04Z01S06[E]", # purified_hand must be true + "D04Z02S02[NE]", # difficulty must be hard and purified_hand must be true + "D05Z01S11[SW]", # difficulty must be hard + "D06Z01S08[N]", # difficulty must be hard and purified_hand must be true + "D20Z02S11[NW]", # difficulty must be hard + "D20Z02S11[E]", # difficulty must be hard + }, "Ocarina of Time": { "Prelude of Light Warp", # Prelude is not progression by default "Serenade of Water Warp", # Serenade is not progression by default diff --git a/worlds/blasphemous/ExtractorConfig.json b/worlds/blasphemous/ExtractorConfig.json new file mode 100644 index 000000000000..4d565ccf4a7d --- /dev/null +++ b/worlds/blasphemous/ExtractorConfig.json @@ -0,0 +1,19 @@ +{ + "type": "WorldDefinition", + "configuration": "./output/StringWorldDefinition.json", + "emptyRegionsToKeep": [ + "D17Z01S01", + "D01Z02S01", + "D02Z03S09", + "D03Z03S11", + "D04Z03S01", + "D06Z01S09", + "D20Z02S09", + "D09Z01S09[Cell24]", + "D09Z01S08[Cell7]", + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell24]", + "D09BZ01S01[Cell17]", + "D09BZ01S01[Cell19]" + ] +} \ No newline at end of file diff --git a/worlds/blasphemous/Items.py b/worlds/blasphemous/Items.py index 23cad0f5c4dd..4843a99f2d12 100644 --- a/worlds/blasphemous/Items.py +++ b/worlds/blasphemous/Items.py @@ -637,52 +637,35 @@ class ItemDict(TypedDict): 'classification': ItemClassification.filler} ] -event_table: Dict[str, str] = { - "OpenedDCGateW": "D01Z05S24", - "OpenedDCGateE": "D01Z05S12", - "OpenedDCLadder": "D01Z05S20", - "OpenedWOTWCave": "D02Z01S06", - "RodeGOTPElevator": "D02Z02S11", - "OpenedConventLadder": "D02Z03S11", - "BrokeJondoBellW": "D03Z02S09", - "BrokeJondoBellE": "D03Z02S05", - "OpenedMOMLadder": "D04Z02S06", - "OpenedTSCGate": "D05Z02S11", - "OpenedARLadder": "D06Z01S23", - "BrokeBOTTCStatue": "D08Z01S02", - "OpenedWOTHPGate": "D09Z01S05", - "OpenedBOTSSLadder": "D17Z01S04" -} - group_table: Dict[str, Set[str]] = { - "wounds" : ["Holy Wound of Attrition", + "wounds" : {"Holy Wound of Attrition", "Holy Wound of Contrition", - "Holy Wound of Compunction"], + "Holy Wound of Compunction"}, - "masks" : ["Deformed Mask of Orestes", + "masks" : {"Deformed Mask of Orestes", "Mirrored Mask of Dolphos", - "Embossed Mask of Crescente"], + "Embossed Mask of Crescente"}, - "marks" : ["Mark of the First Refuge", + "marks" : {"Mark of the First Refuge", "Mark of the Second Refuge", - "Mark of the Third Refuge"], + "Mark of the Third Refuge"}, - "tirso" : ["Bouquet of Rosemary", + "tirso" : {"Bouquet of Rosemary", "Incense Garlic", "Olive Seeds", "Dried Clove", "Sooty Garlic", - "Bouquet of Thyme"], + "Bouquet of Thyme"}, - "tentudia": ["Tentudia's Carnal Remains", + "tentudia": {"Tentudia's Carnal Remains", "Remains of Tentudia's Hair", - "Tentudia's Skeletal Remains"], + "Tentudia's Skeletal Remains"}, - "egg" : ["Melted Golden Coins", + "egg" : {"Melted Golden Coins", "Torn Bridal Ribbon", - "Black Grieving Veil"], + "Black Grieving Veil"}, - "bones" : ["Parietal bone of Lasser, the Inquisitor", + "bones" : {"Parietal bone of Lasser, the Inquisitor", "Jaw of Ashgan, the Inquisitor", "Cervical vertebra of Zicher, the Brewmaster", "Clavicle of Dalhuisen, the Schoolchild", @@ -725,14 +708,14 @@ class ItemDict(TypedDict): "Scaphoid of Fierce, the Leper", "Anklebone of Weston, the Pilgrim", "Calcaneum of Persian, the Bandit", - "Navicular of Kahnnyhoo, the Murderer"], + "Navicular of Kahnnyhoo, the Murderer"}, - "power" : ["Life Upgrade", + "power" : {"Life Upgrade", "Fervour Upgrade", "Empty Bile Vessel", - "Quicksilver"], + "Quicksilver"}, - "prayer" : ["Seguiriya to your Eyes like Stars", + "prayer" : {"Seguiriya to your Eyes like Stars", "Debla of the Lights", "Saeta Dolorosa", "Campanillero to the Sons of the Aurora", @@ -746,10 +729,17 @@ class ItemDict(TypedDict): "Romance to the Crimson Mist", "Zambra to the Resplendent Crown", "Cantina of the Blue Rose", - "Mirabras of the Return to Port"] + "Mirabras of the Return to Port"}, + + "toe" : {"Little Toe made of Limestone", + "Big Toe made of Limestone", + "Fourth Toe made of Limestone"}, + + "eye" : {"Severed Right Eye of the Traitor", + "Broken Left Eye of the Traitor"} } -tears_set: Set[str] = [ +tears_list: List[str] = [ "Tears of Atonement (500)", "Tears of Atonement (625)", "Tears of Atonement (750)", @@ -772,16 +762,16 @@ class ItemDict(TypedDict): "Tears of Atonement (30000)" ] -reliquary_set: Set[str] = [ +reliquary_set: Set[str] = { "Reliquary of the Fervent Heart", "Reliquary of the Suffering Heart", "Reliquary of the Sorrowful Heart" -] +} -skill_set: Set[str] = [ +skill_set: Set[str] = { "Combo Skill", "Charged Skill", "Ranged Skill", "Dive Skill", "Lunge Skill" -] \ No newline at end of file +} diff --git a/worlds/blasphemous/Locations.py b/worlds/blasphemous/Locations.py index 6dd6e03180b3..6c2f71cd3799 100644 --- a/worlds/blasphemous/Locations.py +++ b/worlds/blasphemous/Locations.py @@ -1,986 +1,366 @@ -from typing import List, TypedDict +from typing import Dict -class LocationDict(TypedDict): - name: str - game_id: str - room: str - +location_names: Dict[str, str] = { + # The Holy Line + "PR14": "THL: Hanging skeleton", + "RB07": "THL: Across blood platforms", + "CO04": "THL: Underground ledge", + "QI55": "THL: Underground chest", + "RESCUED_CHERUB_07": "THL: Child of Moonlight", + "QI31": "THL: Deogracias' gift", -location_table: List[LocationDict] = [ # Albero - {'name': "Albero: Tirso's house, top floor", - 'game_id': "RB01", - 'room': "D01Z02S02"}, - {'name': "Albero: Outside Ossuary", - 'game_id': "CO43", - 'room': "D01Z02S04"}, - {'name': "Albero: Graveyard", - 'game_id': "CO16", - 'room': "D01Z02S05"}, - {'name': "Albero: Gate of Travel room", - 'game_id': "QI65", - 'room': "D01Z02S07"}, - {'name': "Albero: Child of Moonlight", - 'game_id': "RESCUED_CHERUB_08", - 'room': "D01Z02S03"}, - {'name': "Albero: Bless Linen Cloth", - 'game_id': "RE04", - 'room': "D01Z02S01"}, - {'name': "Albero: Bless Hatched Egg", - 'game_id': "RE10", - 'room': "D01Z02S01"}, - {'name': "Albero: Bless Severed Hand", - 'game_id': "RE02", - 'room': "D01Z02S01"}, - {'name': "Albero: First gift for Cleofas", - 'game_id': "QI01", - 'room': "D01Z02S03"}, - {'name': "Albero: Final gift for Cleofas", - 'game_id': "PR11", - 'room': "D01BZ04S01"}, - {'name': "Albero: Tirso's 1st reward", - 'game_id': "QI66", - 'room': "D01Z02S02"}, - {'name': "Albero: Tirso's 2nd reward", - 'game_id': "Tirso[500]", - 'room': "D01Z02S02"}, - {'name': "Albero: Tirso's 3rd reward", - 'game_id': "Tirso[1000]", - 'room': "D01Z02S02"}, - {'name': "Albero: Tirso's 4th reward", - 'game_id': "Tirso[2000]", - 'room': "D01Z02S02"}, - {'name': "Albero: Tirso's 5th reward", - 'game_id': "Tirso[5000]", - 'room': "D01Z02S02"}, - {'name': "Albero: Tirso's 6th reward", - 'game_id': "Tirso[10000]", - 'room': "D01Z02S02"}, - {'name': "Albero: Tirso's final reward", - 'game_id': "QI56", - 'room': "D01Z02S02"}, - {'name': "Albero: Lvdovico's 1st reward", - 'game_id': "Lvdovico[500]", - 'room': "D01Z02S03"}, - {'name': "Albero: Lvdovico's 2nd reward", - 'game_id': "Lvdovico[1000]", - 'room': "D01Z02S03"}, - {'name': "Albero: Lvdovico's 3rd reward", - 'game_id': "PR03", - 'room': "D01Z02S03"}, - {'name': "Ossuary: Isidora, Voice of the Dead", - 'game_id': "QI201", - 'room': "D01BZ08S01"}, - {'name': "Albero: Mea Culpa altar", - 'game_id': "Sword[D01Z02S06]", - 'room': "D01Z02S06"}, - {'name': "Albero: Donate 5000 Tears", - 'game_id': "RB104", - 'room': "D01BZ04S01"}, - {'name': "Albero: Donate 50000 Tears", - 'game_id': "RB105", - 'room': "D01BZ04S01"}, - {'name': "Ossuary: 1st reward", - 'game_id': "Undertaker[250]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 2nd reward", - 'game_id': "Undertaker[500]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 3rd reward", - 'game_id': "Undertaker[750]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 4th reward", - 'game_id': "Undertaker[1000]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 5th reward", - 'game_id': "Undertaker[1250]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 6th reward", - 'game_id': "Undertaker[1500]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 7th reward", - 'game_id': "Undertaker[1750]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 8th reward", - 'game_id': "Undertaker[2000]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 9th reward", - 'game_id': "Undertaker[2500]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 10th reward", - 'game_id': "Undertaker[3000]", - 'room': "D01BZ06S01"}, - {'name': "Ossuary: 11th reward", - 'game_id': "Undertaker[5000]", - 'room': "D01BZ06S01"}, - - # All the Tears of the Sea - {'name': "AtTotS: Miriam's gift", - 'game_id': "PR201", - 'room': "D04Z04S01"}, + "RE02": "Albero: Bless Severed Hand", + "RE04": "Albero: Bless Linen Cloth", + "RE10": "Albero: Bless Hatched Egg", + "RB01": "Albero: Tirso's house, top floor", + "QI66": "Albero: Tirso's 1st reward", + "Tirso[500]": "Albero: Tirso's 2nd reward", + "Tirso[1000]": "Albero: Tirso's 3rd reward", + "Tirso[2000]": "Albero: Tirso's 4th reward", + "Tirso[5000]": "Albero: Tirso's 5th reward", + "Tirso[10000]": "Albero: Tirso's 6th reward", + "QI56": "Albero: Tirso's final reward", + "RESCUED_CHERUB_08": "Albero: Child of Moonlight", + "Lvdovico[500]": "Albero: Lvdovico's 1st reward", + "Lvdovico[1000]": "Albero: Lvdovico's 2nd reward", + "PR03": "Albero: Lvdovico's 3rd reward", + "QI01": "Albero: First gift for Cleofas", + "CO43": "Albero: Outside Ossuary", + "CO16": "Albero: Graveyard", + "Sword[D01Z02S06]": "Albero: Mea Culpa altar", + "QI65": "Albero: Gate of Travel room", + "RB104": "Albero: Donate 5000 Tears", + "RB105": "Albero: Donate 50000 Tears", + "PR11": "Albero: Final gift for Cleofas", + "Undertaker[250]": "Ossuary: 1st reward", + "Undertaker[500]": "Ossuary: 2nd reward", + "Undertaker[750]": "Ossuary: 3rd reward", + "Undertaker[1000]": "Ossuary: 4th reward", + "Undertaker[1250]": "Ossuary: 5th reward", + "Undertaker[1500]": "Ossuary: 6th reward", + "Undertaker[1750]": "Ossuary: 7th reward", + "Undertaker[2000]": "Ossuary: 8th reward", + "Undertaker[2500]": "Ossuary: 9th reward", + "Undertaker[3000]": "Ossuary: 10th reward", + "Undertaker[5000]": "Ossuary: 11th reward", + "QI201": "Ossuary: Isidora, Voice of the Dead", - # Archcathedral Rooftops - {'name': "AR: First soldier fight", - 'game_id': "QI02", - 'room': "D06Z01S03"}, - {'name': "AR: Second soldier fight", - 'game_id': "QI03", - 'room': "D06Z01S06"}, - {'name': "AR: Third soldier fight", - 'game_id': "QI04", - 'room': "D06Z01S21"}, - {'name': "AR: Upper west shaft ledge", - 'game_id': "CO06", - 'room': "D06Z01S12"}, - {'name': "AR: Upper west shaft Child of Moonlight", - 'game_id': "RESCUED_CHERUB_36", - 'room': "D06Z01S12"}, - {'name': "AR: Upper west shaft chest", - 'game_id': "PR12", - 'room': "D06Z01S12"}, - {'name': "AR: Statue near MoM", - 'game_id': "HE04", - 'room': "D06Z01S22"}, - {'name': "AR: Lady of the Six Sorrows", - 'game_id': "Lady[D06Z01S24]", - 'room': "D06Z01S24"}, - {'name': "AR: Upper east shaft ledge", - 'game_id': "CO40", - 'room': "D06Z01S15"}, - {'name': "AR: Mea Culpa altar", - 'game_id': "Sword[D06Z01S11]", - 'room': "D06Z01S11"}, - {'name': "AR: Crisanta of the Wrapped Agony", - 'game_id': "BS16", - 'room': "D06Z01S25"}, + # Wasteland of the Buried Churches + "RB04": "WotBC: Lower log path", + "CO14": "WotBC: Hidden alcove", + "CO36": "WotBC: Outside ledge", + "RESCUED_CHERUB_10": "WotBC: Outside Child of Moonlight", + "QI06": "WotBC: Under broken bridge", + "RB20": "WotBC: 3rd meeting with Redento", + "HE02": "WotBC: Cliffside statue", + "RESCUED_CHERUB_38": "WotBC: Cliffside Child of Moonlight", - # Bridge of the Three Cavalries - {'name': "BotTC: Esdras, of the Anointed Legion", - 'game_id': "BS12", - 'room': "D08Z01S01"}, - {'name': "BotTC: Esdras' gift", - 'game_id': "PR09", - 'room': "D08Z01S01"}, - {'name': "BotTC: Inside giant statue", - 'game_id': "HE101", - 'room': "D08Z01S02"}, + # Mercy Dreams + "CO30": "MD: First area hidden wall", + "CO03": "MD: Second area ledge", + "RESCUED_CHERUB_09": "MD: Second area Child of Moonlight", + "PR01": "MD: Second area trapped chest", + "RB17": "MD: First red candle", + "QI48": "MD: Third area hidden room", + "CO21": "MD: Behind gate to TSC", + "CO38": "MD: Sliding challenge", + "RESCUED_CHERUB_33": "MD: Cave Child of Moonlight", + "BS01": "MD: Ten Piedad", + "QI38": "MD: Visage of Attrition", + "QI58": "MD: Shop item 1", + "RB05": "MD: Shop item 2", + "RB09": "MD: Shop item 3", - # Brotherhood of the Silent Sorrow - {'name': "BotSS: Starting room Child of Moonlight", - 'game_id': "RESCUED_CHERUB_06", - 'room': "D17Z01S01"}, - {'name': "BotSS: Starting room ledge", - 'game_id': "RB204", - 'room': "D17Z01S01"}, - {'name': "BotSS: Chamber of the Eldest Brother", - 'game_id': "RE01", - 'room': "D17BZ01S01"}, - {'name': "BotSS: Mea Culpa altar", - 'game_id': "Sword[D17Z01S08]", - 'room': "D17Z01S08"}, - {'name': "BotSS: Platforming gauntlet", - 'game_id': "CO25", - 'room': "D17BZ02S01"}, - {'name': "BotSS: Outside church", - 'game_id': "PR203", - 'room': "D17Z01S14"}, - {'name': "BotSS: Esdras' final gift", - 'game_id': "QI204", - 'room': "D17Z01S15"}, - {'name': "BotSS: Crisanta's gift", - 'game_id': "QI301", - 'room': "D17Z01S15"}, - {'name': "BotSS: Warden of the Silent Sorrow", - 'game_id': "BS13", - 'room': "D17Z01S11"}, - - # Convent of Our Lady of the Charred Visage - {'name': "CoOLotCV: Snowy window ledge", - 'game_id': "CO05", - 'room': "D02Z03S03"}, - {'name': "CoOLotCV: Center enemy lineup", - 'game_id': "CO15", - 'room': "D02Z03S07"}, - {'name': "CoOLotCV: Center miasma room", - 'game_id': "RB08", - 'room': "D02Z03S05"}, - {'name': "CoOLotCV: Lower west statue", - 'game_id': "HE03", - 'room': "D02Z03S12"}, - {'name': "CoOLotCV: Lady of the Six Sorrows", - 'game_id': "Lady[D02Z03S15]", - 'room': "D02Z03S15"}, - {'name': "CoOLotCV: Mea Culpa altar", - 'game_id': "Sword[D02Z03S13]", - 'room': "D02Z03S13"}, - {'name': "CoOLotCV: First blue candle", - 'game_id': "RB24", - 'room': "D02Z03S17"}, - {'name': "CoOLotCV: Outside pathway", - 'game_id': "RB107", - 'room': "D02Z03S23"}, - {'name': "CoOLotCV: Fountain of burning oil", - 'game_id': "QI57", - 'room': "D02Z03S21"}, - {'name': "CoOLotCV: Our Lady of the Charred Visage", - 'game_id': "BS03", - 'room': "D02Z03S20"}, - {'name': "CoOLotCV: Visage of Compunction", - 'game_id': "QI40", - 'room': "D02Z03S21"}, - {'name': "CoOLotCV: Mask room", - 'game_id': "QI61", - 'room': "D02Z03S19"}, + # Desecrated Cistern + "CO09": "DC: Shortcut to WotBC", + "QI67": "DC: Hidden alcove near fountain", + "PR16": "DC: Upper east tunnel chest", + "RESCUED_CHERUB_13": "DC: Upper east Child of Moonlight", + "Oil[D01Z05S07]": "DC: Oil of the Pilgrims", + "QI12": "DC: Behind gate in miasma room", + "RESCUED_CHERUB_14": "DC: Child of Moonlight, miasma room", + "QI45": "DC: Lower east tunnel chest", + "RESCUED_CHERUB_12": "DC: Child of Moonlight, behind pillar", + "RESCUED_CHERUB_11": "DC: Child of Moonlight, above water", + "CO41": "DC: Behind sewage drips", + "CO32": "DC: High ledge near elevator shaft", + "RESCUED_CHERUB_15": "DC: Top of elevator Child of Moonlight", + "Lady[D01Z05S22]": "DC: Lady of the Six Sorrows, from MD", + "QI75": "DC: Chalice room", + "Sword[D01Z05S24]": "DC: Mea culpa altar", + "CO44": "DC: Elevator shaft ledge", + "RESCUED_CHERUB_22": "DC: Elevator shaft Child of Moonlight", + "Lady[D01Z05S26]": "DC: Lady of the Six Sorrows, elevator shaft", + "RB03": "DC: Shroud puzzle", - # Deambulatory of His Holiness - {'name': "DoHH: Viridiana's gift", - 'game_id': "PR08", - 'room': "D07Z01S01"}, + # Petrous + "QI101": "Petrous: Temple entrance", - # Desecrated Cistern - {'name': "DC: Lady of the Six Sorrows, from MD", - 'game_id': "Lady[D01Z05S22]", - 'room': "D01Z05S22"}, - {'name': "DC: Behind sewage drips", - 'game_id': "CO41", - 'room': "D01Z05S15"}, - {'name': "DC: Child of Moonlight, above water", - 'game_id': "RESCUED_CHERUB_11", - 'room': "D01Z05S14"}, - {'name': "DC: Lower east tunnel chest", - 'game_id': "QI45", - 'room': "D01Z05S11"}, - {'name': "DC: Upper east tunnel chest", - 'game_id': "PR16", - 'room': "D01Z05S06"}, - {'name': "DC: Upper east Child of Moonlight", - 'game_id': "RESCUED_CHERUB_13", - 'room': "D01Z05S06"}, - {'name': "DC: Hidden alcove near fountain", - 'game_id': "QI67", - 'room': "D01Z05S05"}, - {'name': "DC: Shortcut to WotBC", - 'game_id': "CO09", - 'room': "D01Z05S05"}, - {'name': "DC: Oil of the Pilgrims", - 'game_id': "Oil[D01Z05S07]", - 'room': "D01Z05S07"}, - {'name': "DC: Child of Moonlight, miasma room", - 'game_id': "RESCUED_CHERUB_14", - 'room': "D01Z05S08"}, - {'name': "DC: Behind gate in miasma room", - 'game_id': "QI12", - 'room': "D01Z05S08"}, - {'name': "DC: Child of Moonlight, behind pillar", - 'game_id': "RESCUED_CHERUB_12", - 'room': "D01Z05S13"}, - {'name': "DC: High ledge near elevator shaft", - 'game_id': "CO32", - 'room': "D01Z05S17"}, - {'name': "DC: Shroud puzzle", - 'game_id': "RB03", - 'room': "D01BZ05S01"}, - {'name': "DC: Chalice room", - 'game_id': "QI75", - 'room': "D01Z05S23"}, - {'name': "DC: Mea Culpa altar", - 'game_id': "Sword[D01Z05S24]", - 'room': "D01Z05S24"}, - {'name': "DC: Lady of the Six Sorrows, elevator shaft", - 'game_id': "Lady[D01Z05S26]", - 'room': "D01Z05S26"}, - {'name': "DC: Top of elevator Child of Moonlight", - 'game_id': "RESCUED_CHERUB_15", - 'room': "D01Z05S20"}, - {'name': "DC: Elevator shaft Child of Moonlight", - 'game_id': "RESCUED_CHERUB_22", - 'room': "D01Z05S25"}, - {'name': "DC: Elevator shaft ledge", - 'game_id': "CO44", - 'room': "D01Z05S25"}, + # Where Olive Trees Wither + "CO11": "WOTW: Below Prie Dieu", + "QI59": "WOTW: Gemino's gift", + "RB10": "WOTW: Gemino's reward", + "RESCUED_CHERUB_23": "WOTW: Upper east Child of Moonlight", + "QI20": "WOTW: Entrance to tomb", + "QI68": "WOTW: Gift for the tomb", + "QI07": "WOTW: Death run", + "CO19": "WOTW: Underground ledge", + "RESCUED_CHERUB_27": "WOTW: Underground Child of Moonlight", + "PR04": "WOTW: Underground tomb", + "HE05": "WOTW: Upper east statue", - # Echoes of Salt - {'name': "EoS: Lantern jump near MotED", - 'game_id': "RB108", - 'room': "D20Z01S02"}, - {'name': "EoS: Lantern jump near elevator", - 'game_id': "RB202", - 'room': "D20Z01S09"}, - # Graveyard of the Peaks - {'name': "GotP: Shop cave Child of Moonlight", - 'game_id': "RESCUED_CHERUB_31", - 'room': "D02Z02S08"}, - {'name': "GotP: Shop cave hidden hole", - 'game_id': "CO42", - 'room': "D02Z02S08"}, - {'name': "GotP: Shop item 1", - 'game_id': "QI11", - 'room': "D02BZ02S01"}, - {'name': "GotP: Shop item 2", - 'game_id': "RB37", - 'room': "D02BZ02S01"}, - {'name': "GotP: Shop item 3", - 'game_id': "RB02", - 'room': "D02BZ02S01"}, - {'name': "GotP: Confessor Dungeon room", - 'game_id': "RB38", - 'room': "D02Z02S06"}, - {'name': "GotP: Elevator shaft Child of Moonlight", - 'game_id': "RESCUED_CHERUB_26", - 'room': "D02Z02S11"}, - {'name': "GotP: Elevator shaft ledge", - 'game_id': "QI53", - 'room': "D02Z02S11"}, - {'name': "GotP: Lady of the Six Sorrows", - 'game_id': "Lady[D02Z02S12]", - 'room': "D02Z02S12"}, - {'name': "GotP: Self sacrifice statue", - 'game_id': "HE11", - 'room': "D02Z02S13"}, - {'name': "GotP: Lower east shaft", - 'game_id': "QI46", - 'room': "D02Z02S03"}, - {'name': "GotP: Center east shaft", - 'game_id': "CO29", - 'room': "D02Z02S03"}, - {'name': "GotP: Upper east shaft", - 'game_id': "QI08", - 'room': "D02Z02S03"}, - {'name': "GotP: East cliffside", - 'game_id': "RB106", - 'room': "D02Z02S14"}, - {'name': "GotP: West shaft Child of Moonlight", - 'game_id': "RESCUED_CHERUB_25", - 'room': "D02Z02S04"}, - {'name': "GotP: Lower west shaft", - 'game_id': "RB32", - 'room': "D02Z02S04"}, - {'name': "GotP: Upper west shaft", - 'game_id': "CO01", - 'room': "D02Z02S04"}, - {'name': "GotP: Center shaft Child of Moonlight", - 'game_id': "RESCUED_CHERUB_24", - 'room': "D02Z02S02"}, - {'name': "GotP: Center shaft ledge", - 'game_id': "RB15", - 'room': "D02Z02S05"}, - {'name': "GotP: Oil of the Pilgrims", - 'game_id': "Oil[D02Z02S10]", - 'room': "D02Z02S10"}, - {'name': "GotP: Amanecida of the Bejeweled Arrow", - 'game_id': "Amanecida[D02Z02S14]", - 'room': "D02Z02S14"}, - - # Grievance Ascends - {'name': "GA: Lower west ledge", - 'game_id': "QI44", - 'room': "D03Z03S02"}, - {'name': "GA: Miasma room treasure", - 'game_id': "RE07", - 'room': "D03Z03S06"}, - {'name': "GA: Miasma room Child of Moonlight", - 'game_id': "RESCUED_CHERUB_19", - 'room': "D03Z03S06"}, - {'name': "GA: Miasma room floor", - 'game_id': "CO12", - 'room': "D03Z03S06"}, - {'name': "GA: Oil of the Pilgrims", - 'game_id': "Oil[D03Z03S13]", - 'room': "D03Z03S13"}, - {'name': "GA: End of blood bridge", - 'game_id': "QI10", - 'room': "D03Z03S08"}, - {'name': "GA: Blood bridge Child of Moonlight", - 'game_id': "RESCUED_CHERUB_21", - 'room': "D03Z03S08"}, - {'name': "GA: Lower east Child of Moonlight", - 'game_id': "RESCUED_CHERUB_20", - 'room': "D03Z03S09"}, - {'name': "GA: Altasgracias' gift", - 'game_id': "QI13", - 'room': "D03Z03S10"}, - {'name': "GA: Empty giant egg", - 'game_id': "RB06", - 'room': "D03Z03S10"}, - {'name': "GA: Tres Angustias", - 'game_id': "BS04", - 'room': "D03Z03S15"}, - {'name': "GA: Visage of Contrition", - 'game_id': "QI39", - 'room': "D03Z03S16"}, - - # Hall of the Dawning - {'name': "HotD: Mirror room", - 'game_id': "QI105", - 'room': "D08Z03S01"}, - {'name': "HotD: Laudes, the First of the Amanecidas", - 'game_id': "LaudesBossTrigger[30000]", - 'room': "D08Z03S03"}, - + "RESCUED_CHERUB_24": "GotP: Center shaft Child of Moonlight", + "QI46": "GotP: Lower east shaft", + "CO29": "GotP: Center east shaft", + "QI08": "GotP: Upper east shaft", + "RB32": "GotP: Lower west shaft", + "CO01": "GotP: Upper west shaft", + "RESCUED_CHERUB_25": "GotP: West shaft Child of Moonlight", + "RB15": "GotP: Center shaft ledge", + "RB38": "GotP: Confessor Dungeon room", + "CO42": "GotP: Shop cave hidden hole", + "RESCUED_CHERUB_31": "GotP: Shop cave Child of Moonlight", + "Oil[D02Z02S10]": "GotP: Oil of the Pilgrims", + "QI53": "GotP: Elevator shaft ledge", + "RESCUED_CHERUB_26": "GotP: Elevator shaft Child of Moonlight", + "Lady[D02Z02S12]": "GotP: Lady of the Six Sorrows", + "HE11": "GotP: Self sacrifice statue", + "RB106": "GotP: East cliffside", + "Amanecida[D02Z02S14]": "GotP: Amanecida of the Bejeweled Arrow", + "QI11": "GotP: Shop item 1", + "RB37": "GotP: Shop item 2", + "RB02": "GotP: Shop item 3", + + # Convent of Our Lady of the Charred Visage + "CO05": "CoOLotCV: Snowy window ledge", + "RB08": "CoOLotCV: Center miasma room", + "CO15": "CoOLotCV: Center enemy lineup", + "HE03": "CoOLotCV: Lower west statue", + "Sword[D02Z03S13]": "CoOLotCV: Mea Culpa altar", + "Lady[D02Z03S15]": "CoOLotCV: Lady of the Six Sorrows", + "RB24": "CoOLotCV: First blue candle", + "QI61": "CoOLotCV: Mask room", + "BS03": "CoOLotCV: Our Lady of the Charred Visage", + "QI40": "CoOLotCV: Visage of Compunction", + "QI57": "CoOLotCV: Fountain of burning oil", + "RB107": "CoOLotCV: Outside pathway", + + # Mountains of the Endless Dusk + "CO13": "MotED: Under entrance to DC", + "QI47": "MotED: Platform above chasm", + "RB22": "MotED: 1st meeting with Redento", + "RESCUED_CHERUB_16": "MotED: Child of Moonlight, above chasm", + "Amanecida[D03Z01S03]": "MotED: Amanecida of the Golden Blades", + "QI63": "MotED: Blood platform alcove", + 'RB13': "MotED: Perpetva", + "QI14": "MotED: Egg hatching", + # Jondo - {'name': "Jondo: Upper east ledge", - 'game_id': "CO08", - 'room': "D03Z02S01"}, - {'name': "Jondo: Upper east chest", - 'game_id': "PR10", - 'room': "D03Z02S01"}, - {'name': "Jondo: Lower east under chargers", - 'game_id': "CO33", - 'room': "D03Z02S04"}, - {'name': "Jondo: Lower east bell trap", - 'game_id': "QI19", - 'room': "D03Z02S06"}, - {'name': "Jondo: Upper east Child of Moonlight", - 'game_id': "RESCUED_CHERUB_18", - 'room': "D03Z02S05"}, - {'name': "Jondo: Spike tunnel Child of Moonlight", - 'game_id': "RESCUED_CHERUB_37", - 'room': "D03Z02S11"}, - {'name': "Jondo: Spike tunnel statue", - 'game_id': "HE06", - 'room': "D03Z02S11"}, - {'name': "Jondo: Spike tunnel cave", - 'game_id': "QI103", - 'room': "D03Z02S15"}, - {'name': "Jondo: Lower west lift alcove", - 'game_id': "CO07", - 'room': "D03Z02S07"}, - {'name': "Jondo: Lower west bell alcove", - 'game_id': "QI41", - 'room': "D03Z02S08"}, - {'name': "Jondo: Upper west bell puzzle", - 'game_id': "QI52", - 'room': "D03Z02S12"}, - {'name': "Jondo: Upper west tree root", - 'game_id': "RB28", - 'room': "D03Z02S13"}, - {'name': "Jondo: Upper west Child of Moonlight", - 'game_id': "RESCUED_CHERUB_17", - 'room': "D03Z02S10"}, - - # Knot of the Three Words - {'name': "KotTW: Gift from the Traitor", - 'game_id': "HE201", - 'room': "D04Z03S02"}, - - # Library of the Negated Words - {'name': "LotNW: Platform room Child of Moonlight", - 'game_id': "RESCUED_CHERUB_01", - 'room': "D05Z01S04"}, - {'name': "LotNW: Platform room ledge", - 'game_id': "CO18", - 'room': "D05Z01S04"}, - {'name': "LotNW: Root ceiling platform", - 'game_id': "CO22", - 'room': "D05Z01S05"}, - {'name': "LotNW: Hidden floor", - 'game_id': "QI50", - 'room': "D05Z01S05"}, - {'name': "LotNW: Miasma hallway chest", - 'game_id': "RB31", - 'room': "D05Z01S06"}, - {'name': "LotNW: Lady of the Six Sorrows", - 'game_id': "Lady[D05Z01S14]", - 'room': "D05Z01S14"}, - {'name': "LotNW: Bone puzzle", - 'game_id': "PR15", - 'room': "D05Z01S18"}, - {'name': "LotNW: Lowest west upper ledge", - 'game_id': "CO28", - 'room': "D05Z01S11"}, - {'name': "LotNW: Platform puzzle chest", - 'game_id': "PR07", - 'room': "D05Z01S10"}, - {'name': "LotNW: Lowest west center ledge", - 'game_id': "RB30", - 'room': "D05Z01S11"}, - {'name': "LotNW: Lowest west Child of Moonlight", - 'game_id': "RESCUED_CHERUB_02", - 'room': "D05Z01S11"}, - {'name': "LotNW: Oil of the Pilgrims", - 'game_id': "Oil[D05Z01S19]", - 'room': "D05Z01S19"}, - {'name': "LotNW: Elevator Child of Moonlight", - 'game_id': "RESCUED_CHERUB_32", - 'room': "D05Z01S21"}, - {'name': "LotNW: Mask room", - 'game_id': "QI62", - 'room': "D05Z01S15"}, - {'name': "LotNW: Mea Culpa altar", - 'game_id': "Sword[D05Z01S13]", - 'room': "D05Z01S13"}, - {'name': "LotNW: Silence for Diosdado", - 'game_id': "RB203", - 'room': "D05Z01S11"}, - {'name': "LotNW: Twisted wood hidden wall", - 'game_id': "RB301", - 'room': "D05BZ01S01"}, + "CO08": "Jondo: Upper east ledge", + "PR10": "Jondo: Upper east chest", + "CO33": "Jondo: Lower east under chargers", + "RESCUED_CHERUB_18": "Jondo: Upper east Child of Moonlight", + "QI19": "Jondo: Lower east bell trap", + "CO07": "Jondo: Lower west lift alcove", + "QI41": "Jondo: Lower west bell alcove", + "RESCUED_CHERUB_17": "Jondo: Upper west Child of Moonlight", + "HE06": "Jondo: Spike tunnel statue", + "RESCUED_CHERUB_37": "Jondo: Spike tunnel Child of Moonlight", + "QI52": "Jondo: Upper west bell puzzle", + "RB28": "Jondo: Upper west tree root", + "QI103": "Jondo: Spike tunnel cave", - # Mercy Dreams - {'name': "MD: First area hidden wall", - 'game_id': "CO30", - 'room': "D01Z04S05"}, - {'name': "MD: Second area trapped chest", - 'game_id': "PR01", - 'room': "D01Z04S07"}, - {'name': "MD: Second area ledge", - 'game_id': "CO03", - 'room': "D01Z04S06"}, - {'name': "MD: Second area Child of Moonlight", - 'game_id': "RESCUED_CHERUB_09", - 'room': "D01Z04S06"}, - {'name': "MD: First red candle", - 'game_id': "RB17", - 'room': "D01Z04S08"}, - {'name': "MD: Shop item 1", - 'game_id': "QI58", - 'room': "D01BZ02S01"}, - {'name': "MD: Shop item 2", - 'game_id': "RB05", - 'room': "D01BZ02S01"}, - {'name': "MD: Shop item 3", - 'game_id': "RB09", - 'room': "D01BZ02S01"}, - {'name': "MD: Third area hidden room", - 'game_id': "QI48", - 'room': "D01Z04S11"}, - {'name': "MD: Sliding challenge", - 'game_id': "CO38", - 'room': "D01Z04S14"}, - {'name': "MD: Ten Piedad", - 'game_id': "BS01", - 'room': "D01Z04S18"}, - {'name': "MD: Visage of Attrition", - 'game_id': "QI38", - 'room': "D01Z04S19"}, - {'name': "MD: Cave Child of Moonlight", - 'game_id': "RESCUED_CHERUB_33", - 'room': "D01Z04S16"}, - {'name': "MD: Behind gate to TSC", - 'game_id': "CO21", - 'room': "D01Z04S13"}, + # Grievance Ascends + "QI44": "GA: Lower west ledge", + "CO12": "GA: Miasma room floor", + "RE07": "GA: Miasma room treasure", + "RESCUED_CHERUB_19": "GA: Miasma room Child of Moonlight", + "QI10": "GA: End of blood bridge", + "RESCUED_CHERUB_21": "GA: Blood bridge Child of Moonlight", + "RESCUED_CHERUB_20": "GA: Lower east Child of Moonlight", + "QI13": "GA: Altasgracias' gift", + "RB06": "GA: Empty giant egg", + "Oil[D03Z03S13]": "GA: Oil of the Pilgrims", + "BS04": "GA: Tres Angustias", + "QI39": "GA: Visage of Contrition", + + # Patio of the Silent Steps + "CO23": "PotSS: First area ledge", + "RESCUED_CHERUB_35": "PotSS: First area Child of Moonlight", + "RB14": "PotSS: Second area ledge", + "QI37": "PotSS: Third area lower ledge", + "CO39": "PotSS: Third area upper ledge", + "RESCUED_CHERUB_28": "PotSS: Third area Child of Moonlight", + "RB21": "PotSS: 4th meeting with Redento", + "Amanecida[D04Z01S04]": "PotSS: Amanecida of the Chiselled Steel", + "QI102": "PotSS: Climb to WotHP", # Mother of Mothers - {'name': "MoM: Oil of the Pilgrims", - 'game_id': "Oil[D04Z02S14]", - 'room': "D04Z02S14"}, - {'name': "MoM: Upper east ledge", - 'game_id': "RB33", - 'room': "D04Z02S07"}, - {'name': "MoM: East chandelier platform", - 'game_id': "CO35", - 'room': "D04Z02S07"}, - {'name': "MoM: Lower west Child of Moonlight", - 'game_id': "RESCUED_CHERUB_30", - 'room': "D04Z02S01"}, - {'name': "MoM: Upper west floor", - 'game_id': "CO17", - 'room': "D04Z02S02"}, - {'name': "MoM: Redento's treasure", - 'game_id': "RE03", - 'room': "D04BZ02S01"}, - {'name': "MoM: Final meeting with Redento", - 'game_id': "QI54", - 'room': "D04BZ02S01"}, - {'name': "MoM: Giant chandelier statue", - 'game_id': "HE01", - 'room': "D04Z02S16"}, - {'name': "MoM: Outside Cleofas' room", - 'game_id': "CO34", - 'room': "D04Z02S06"}, - {'name': "MoM: Upper center floor", - 'game_id': "CO20", - 'room': "D04Z02S11"}, - {'name': "MoM: Upper center Child of Moonlight", - 'game_id': "RESCUED_CHERUB_29", - 'room': "D04Z02S11"}, - {'name': "MoM: Mea Culpa altar", - 'game_id': "Sword[D04Z02S12]", - 'room': "D04Z02S12"}, - {'name': "MoM: Melquiades, The Exhumed Archbishop", - 'game_id': "BS05", - 'room': "D04Z02S22"}, - {'name': "MoM: Mask room", - 'game_id': "QI60", - 'room': "D04Z02S15"}, + "RE402": "MoM: Western room ledge", + "RESCUED_CHERUB_30": "MoM: Lower west Child of Moonlight", + "CO17": "MoM: Upper west floor", + "CO34": "MoM: Outside Cleofas' room", + "CO35": "MoM: East chandelier platform", + "RB33": "MoM: Upper east ledge", + "CO20": "MoM: Upper center floor", + "RESCUED_CHERUB_29": "MoM: Upper center Child of Moonlight", + "Sword[D04Z02S12]": "MoM: Mea Culpa altar", + "Oil[D04Z02S14]": "MoM: Oil of the Pilgrims", + "QI60": "MoM: Mask room", + "HE01": "MoM: Giant chandelier statue", + "BS05": "MoM: Melquiades, The Exhumed Archbishop", + "RE03": "MoM: Redento's treasure", + "QI54": "MoM: Final meeting with Redento", - # Mountains of the Endless Dusk - {'name': "MotED: Under entrance to DC", - 'game_id': "CO13", - 'room': "D03Z01S01"}, - {'name': "MotED: Perpetva", - 'game_id': "RB13", - 'room': "D03Z01S06"}, - {'name': "MotED: Child of Moonlight, above chasm", - 'game_id': "RESCUED_CHERUB_16", - 'room': "D03Z01S03"}, - {'name': "MotED: Platform above chasm", - 'game_id': "QI47", - 'room': "D03Z01S03"}, - {'name': "MotED: 1st meeting with Redento", - 'game_id': "RB22", - 'room': "D03Z01S03"}, - {'name': "MotED: Blood platform alcove", - 'game_id': "QI63", - 'room': "D03Z01S04"}, - {'name': "MotED: Egg hatching", - 'game_id': "QI14", - 'room': "D03Z01S06"}, - {'name': "MotED: Amanecida of the Golden Blades", - 'game_id': "Amanecida[D03Z01S03]", - 'room': "D03Z01S03"}, + # Knot of the Three Words + "HE201": "KotTW: Gift from the Traitor", - # Mourning and Havoc - {'name': "MaH: West chest", - 'game_id': "PR202", - 'room': "D20Z02S11"}, - {'name': "MaH: Upper east chest", - 'game_id': "RB201", - 'room': "D20Z02S02"}, - {'name': "MaH: Sierpes' eye", - 'game_id': "QI202", - 'room': "D20Z02S08"}, - {'name': "MaH: Sierpes", - 'game_id': "BossTrigger[5000]", - 'room': "D20Z02S08"}, - - # Patio of the Silent Steps - {'name': "PotSS: First area Child of Moonlight", - 'game_id': "RESCUED_CHERUB_35", - 'room': "D04Z01S01"}, - {'name': "PotSS: First area ledge", - 'game_id': "CO23", - 'room': "D04Z01S01"}, - {'name': "PotSS: Second area ledge", - 'game_id': "RB14", - 'room': "D04Z01S02"}, - {'name': "PotSS: Third area Child of Moonlight", - 'game_id': "RESCUED_CHERUB_28", - 'room': "D04Z01S03"}, - {'name': "PotSS: Third area lower ledge", - 'game_id': "QI37", - 'room': "D04Z01S03"}, - {'name': "PotSS: Third area upper ledge", - 'game_id': "CO39", - 'room': "D04Z01S03"}, - {'name': "PotSS: Climb to WotHP", - 'game_id': "QI102", - 'room': "D04Z01S06"}, - {'name': "PotSS: 4th meeting with Redento", - 'game_id': "RB21", - 'room': "D04Z01S04"}, - {'name': "PotSS: Amanecida of the Chiselled Steel", - 'game_id': "Amanecida[D04Z01S04]", - 'room': "D04Z01S04"}, + # All the Tears of the Sea + "PR201": "AtTotS: Miriam's gift", - # Petrous - {'name': "Petrous: Temple entrance", - 'game_id': "QI101", - 'room': "D01Z06S01"}, + # Library of the Negated Words + "CO18": "LotNW: Platform room ledge", + "RESCUED_CHERUB_01": "LotNW: Platform room Child of Moonlight", + "QI50": "LotNW: Hidden floor", + "CO22": "LotNW: Root ceiling platform", + "RB31": "LotNW: Miasma hallway chest", + "PR07": "LotNW: Platform puzzle chest", + "RB203": "LotNW: Silence for Diosdado", + "CO28": "LotNW: Lowest west upper ledge", + "RB30": "LotNW: Lowest west center ledge", + "RESCUED_CHERUB_02": "LotNW: Lowest west Child of Moonlight", + "Sword[D05Z01S13]": "LotNW: Mea Culpa altar", + "Lady[D05Z01S14]": "LotNW: Lady of the Six Sorrows", + "QI62": "LotNW: Mask room", + "PR15": "LotNW: Bone puzzle", + "Oil[D05Z01S19]": "LotNW: Oil of the Pilgrims", + "RESCUED_CHERUB_32": "LotNW: Elevator Child of Moonlight", + "RB301": "LotNW: Twisted wood hidden wall", - # The Resting Place of the Sister - {'name': "TRPotS: Perpetva's shrine", - 'game_id': "QI203", - 'room': "D20Z03S01"}, - # The Sleeping Canvases - {'name': "TSC: Painting ladder ledge", - 'game_id': "QI64", - 'room': "D05Z02S02"}, - {'name': "TSC: Candle wax puzzle", - 'game_id': "HE07", - 'room': "D05Z02S08"}, - {'name': "TSC: Shop item 1", - 'game_id': "RB12", - 'room': "D05BZ02S01"}, - {'name': "TSC: Shop item 2", - 'game_id': "QI49", - 'room': "D05BZ02S01"}, - {'name': "TSC: Shop item 3", - 'game_id': "QI71", - 'room': "D05BZ02S01"}, - {'name': "TSC: Swinging blade tunnel", - 'game_id': "QI104", - 'room': "D05Z02S15"}, - {'name': "TSC: Exposito, Scion of Abjuration", - 'game_id': "BS06", - 'room': "D05Z02S14"}, - {'name': "TSC: Under elevator shaft", - 'game_id': "CO31", - 'room': "D05Z02S11"}, - {'name': "TSC: Jocinero's 1st reward", - 'game_id': "RE05", - 'room': "D05Z02S10"}, - {'name': "TSC: Jocinero's final reward", - 'game_id': "PR05", - 'room': "D05Z02S10"}, + "QI64": "TSC: Painting ladder ledge", + "HE07": "TSC: Candle wax puzzle", + "RE05": "TSC: Jocinero's 1st reward", + "PR05": "TSC: Jocinero's final reward", + "CO31": "TSC: Under elevator shaft", + "BS06": "TSC: Exposito, Scion of Abjuration", + "QI104": "TSC: Swinging blade tunnel", + "RB12": "TSC: Shop item 1", + "QI49": "TSC: Shop item 2", + "QI71": "TSC: Shop item 3", - # The Holy Line - {'name': "THL: Deogracias' gift", - 'game_id': "QI31", - 'room': "D01Z01S07"}, - {'name': "THL: Hanging skeleton", - 'game_id': "PR14", - 'room': "D01Z01S02"}, - {'name': "THL: Across blood platforms", - 'game_id': "RB07", - 'room': "D01Z01S02"}, - {'name': "THL: Child of Moonlight", - 'game_id': "RESCUED_CHERUB_07", - 'room': "D01Z01S03"}, - {'name': "THL: Underground ledge", - 'game_id': "CO04", - 'room': "D01Z01S03"}, - {'name': "THL: Underground chest", - 'game_id': "QI55", - 'room': "D01Z01S03"}, + # Archcathedral Rooftops + "QI02": "AR: First soldier fight", + "QI03": "AR: Second soldier fight", + "QI04": "AR: Third soldier fight", + "Sword[D06Z01S11]": "AR: Mea Culpa altar", + "CO06": "AR: Upper west shaft ledge", + "PR12": "AR: Upper west shaft chest", + "RESCUED_CHERUB_36": "AR: Upper west shaft Child of Moonlight", + "CO40": "AR: Upper east shaft ledge", + "HE04": "AR: Statue near MoM", + "Lady[D06Z01S24]": "AR: Lady of the Six Sorrows", + "BS16": "AR: Crisanta of the Wrapped Agony", + + # Deambulatory of His Holiness + "PR08": "DoHH: Viridiana's gift", + + # Bridge of the Three Cavalries + "BS12": "BotTC: Esdras, of the Anointed Legion", + "PR09": "BotTC: Esdras' gift", + "HE101": "BotTC: Inside giant statue", + + # Hall of the Dawning + "QI105": "HotD: Mirror room", + "LaudesBossTrigger[30000]": "HotD: Laudes, the First of the Amanecidas", # Wall of the Holy Prohibitions - {'name': "WotHP: Upper east room, lift puzzle", - 'game_id': "RB11", - 'room': "D09Z01S02"}, - {'name': "WotHP: Upper east room, center cell ledge", - 'game_id': "CO10", - 'room': "D09BZ01S01"}, - {'name': "WotHP: Upper east room, center cell floor", - 'game_id': "QI69", - 'room': "D09BZ01S01"}, - {'name': "WotHP: Upper east room, top bronze cell", - 'game_id': "RESCUED_CHERUB_03", - 'room': "D09BZ01S01"}, - {'name': "WotHP: Upper east room, top silver cell", - 'game_id': "CO24", - 'room': "D09BZ01S01"}, - {'name': "WotHP: Upper east room, center gold cell", - 'game_id': "QI51", - 'room': "D09Z01S02"}, - {'name': "WotHP: Upper west room, center gold cell", - 'game_id': "CO26", - 'room': "D09BZ01S01"}, - {'name': "WotHP: Lower west room, bottom gold cell", - 'game_id': "CO02", - 'room': "D09BZ01S01"}, - {'name': "WotHP: Upper west room, top silver cell", - 'game_id': "RESCUED_CHERUB_34", - 'room': "D09BZ01S01"}, - {'name': "WotHP: Lower west room, top ledge", - 'game_id': "RB16", - 'room': "D09Z01S09"}, - {'name': "WotHP: Lower east room, hidden ledge", - 'game_id': "CO27", - 'room': "D09Z01S10"}, - {'name': "WotHP: Lower east room, bottom silver cell", - 'game_id': "RESCUED_CHERUB_04", - 'room': "D09BZ01S01"}, - {'name': "WotHP: Lower east room, top bronze cell", - 'game_id': "QI70", - 'room': "D09Z01S10"}, - {'name': "WotHP: Lower east room, top silver cell", - 'game_id': "CO37", - 'room': "D09BZ01S01"}, - {'name': "WotHP: Outside Child of Moonlight", - 'game_id': "RESCUED_CHERUB_05", - 'room': "D09Z01S06"}, - {'name': "WotHP: Oil of the Pilgrims", - 'game_id': "Oil[D09Z01S12]", - 'room': "D09Z01S12"}, - {'name': "WotHP: Quirce, Returned By The Flames", - 'game_id': "BS14", - 'room': "D09Z01S03"}, - {'name': "WotHP: Collapsing floor ledge", - 'game_id': "QI72", - 'room': "D09Z01S08"}, - {'name': "WotHP: Amanecida of the Molten Thorn", - 'game_id': "Amanecida[D09Z01S01]", - 'room': "D09Z01S01"}, + "Amanecida[D09Z01S01]": "WotHP: Amanecida of the Molten Thorn", + "QI51": "WotHP: Upper east room, center gold cell", + "RB11": "WotHP: Upper east room, lift puzzle", + "BS14": "WotHP: Quirce, Returned By The Flames", + "RESCUED_CHERUB_05": "WotHP: Outside Child of Moonlight", + "QI72": "WotHP: Collapsing floor ledge", + "RB16": "WotHP: Lower west room, top ledge", + "QI70": "WotHP: Lower east room, top bronze cell", + "CO27": "WotHP: Lower east room, hidden ledge", + "Oil[D09Z01S12]": "WotHP: Oil of the Pilgrims", + "CO10": "WotHP: Upper east room, center cell ledge", + "QI69": "WotHP: Upper east room, center cell floor", + "RESCUED_CHERUB_03": "WotHP: Upper east room, top bronze cell", + "CO24": "WotHP: Upper east room, top silver cell", + "RESCUED_CHERUB_34": "WotHP: Upper west room, top silver cell", + "CO26": "WotHP: Upper west room, center gold cell", + "CO02": "WotHP: Lower west room, bottom gold cell", + "CO37": "WotHP: Lower east room, top silver cell", + "RESCUED_CHERUB_04": "WotHP: Lower east room, bottom silver cell", - # Wasteland of the Buried Churches - {'name': "WotBC: Lower log path", - 'game_id': "RB04", - 'room': "D01Z03S01"}, - {'name': "WotBC: Hidden alcove", - 'game_id': "CO14", - 'room': "D01Z03S02"}, - {'name': "WotBC: Outside ledge", - 'game_id': "CO36", - 'room': "D01Z03S03"}, - {'name': "WotBC: Outside Child of Moonlight", - 'game_id': "RESCUED_CHERUB_10", - 'room': "D01Z03S03"}, - {'name': "WotBC: Under broken bridge", - 'game_id': "QI06", - 'room': "D01Z03S05"}, - {'name': "WotBC: Cliffside statue", - 'game_id': "HE02", - 'room': "D01Z03S07"}, - {'name': "WotBC: Cliffside Child of Moonlight", - 'game_id': "RESCUED_CHERUB_38", - 'room': "D01Z03S07"}, - {'name': "WotBC: 3rd meeting with Redento", - 'game_id': "RB20", - 'room': "D01Z03S06"}, - - # Where Olive Trees Wither - {'name': "WOTW: Below Prie Dieu", - 'game_id': "CO11", - 'room': "D02Z01S01"}, - {'name': "WOTW: Entrance to tomb", - 'game_id': "QI20", - 'room': "D02Z01S04"}, - {'name': "WOTW: Gift for the tomb", - 'game_id': "QI68", - 'room': "D02Z01S04"}, - {'name': "WOTW: Underground tomb", - 'game_id': "PR04", - 'room': "D02Z01S08"}, - {'name': "WOTW: Underground Child of Moonlight", - 'game_id': "RESCUED_CHERUB_27", - 'room': "D02Z01S06"}, - {'name': "WOTW: Underground ledge", - 'game_id': "CO19", - 'room': "D02Z01S06"}, - {'name': "WOTW: Upper east Child of Moonlight", - 'game_id': "RESCUED_CHERUB_23", - 'room': "D02Z01S02"}, - {'name': "WOTW: Upper east statue", - 'game_id': "HE05", - 'room': "D02Z01S09"}, - {'name': "WOTW: Death run", - 'game_id': "QI07", - 'room': "D02Z01S05"}, - {'name': "WOTW: Gemino's gift", - 'game_id': "QI59", - 'room': "D02Z01S01"}, - {'name': "WOTW: Gemino's reward", - 'game_id': "RB10", - 'room': "D02Z01S01"}, + # Brotherhood of the Silent Sorrow + "RB204": "BotSS: Starting room ledge", + "RESCUED_CHERUB_06": "BotSS: Starting room Child of Moonlight", + "RE401": "BotSS: 2nd meeting with Redento", + "Sword[D17Z01S08]": "BotSS: Mea Culpa altar", + "BS13": "BotSS: Warden of the Silent Sorrow", + "PR203": "BotSS: Outside church", + "QI204": "BotSS: Esdras' final gift", + "QI301": "BotSS: Crisanta's gift", + "RE01": "BotSS: Chamber of the Eldest Brother", + "CO25": "BotSS: Platforming gauntlet", + + # Echoes of Salt + "RB108": "EoS: Lantern jump near MotED", + "RB202": "EoS: Lantern jump near elevator", - # Various - {'name': "Beginning gift", - 'game_id': "QI106", - 'room': "Misc"}, - {'name': "Second red candle", - 'game_id': "RB18", - 'room': "Misc"}, - {'name': "Third red candle", - 'game_id': "RB19", - 'room': "Misc"}, - {'name': "Second blue candle", - 'game_id': "RB25", - 'room': "Misc"}, - {'name': "Third blue candle", - 'game_id': "RB26", - 'room': "Misc"}, - {'name': "Confessor Dungeon 1 extra", - 'game_id': "Arena_NailManager[1000]", - 'room': "Misc"}, - {'name': "Confessor Dungeon 1 main", - 'game_id': "QI32", - 'room': "Misc"}, - {'name': "Confessor Dungeon 2 extra", - 'game_id': "HE10", - 'room': "Misc"}, - {'name': "Confessor Dungeon 2 main", - 'game_id': "QI33", - 'room': "Misc"}, - {'name': "Confessor Dungeon 3 extra", - 'game_id': "Arena_NailManager[3000]", - 'room': "Misc"}, - {'name': "Confessor Dungeon 3 main", - 'game_id': "QI34", - 'room': "Misc"}, - {'name': "Confessor Dungeon 4 extra", - 'game_id': "RB34", - 'room': "Misc"}, - {'name': "Confessor Dungeon 4 main", - 'game_id': "QI35", - 'room': "Misc"}, - {'name': "Confessor Dungeon 5 extra", - 'game_id': "Arena_NailManager[5000]", - 'room': "Misc"}, - {'name': "Confessor Dungeon 5 main", - 'game_id': "QI79", - 'room': "Misc"}, - {'name': "Confessor Dungeon 6 extra", - 'game_id': "RB35", - 'room': "Misc"}, - {'name': "Confessor Dungeon 6 main", - 'game_id': "QI80", - 'room': "Misc"}, - {'name': "Confessor Dungeon 7 extra", - 'game_id': "RB36", - 'room': "Misc"}, - {'name': "Confessor Dungeon 7 main", - 'game_id': "QI81", - 'room': "Misc"}, - {'name': "Defeat 1 Amanecida", - 'game_id': "QI107", - 'room': "Misc"}, - {'name': "Defeat 2 Amanecidas", - 'game_id': "QI108", - 'room': "Misc"}, - {'name': "Defeat 3 Amanecidas", - 'game_id': "QI109", - 'room': "Misc"}, - {'name': "Defeat 4 Amanecidas", - 'game_id': "QI110", - 'room': "Misc"}, - {'name': "Defeat all Amanecidas", - 'game_id': "PR101", - 'room': "Misc"}, - {'name': "Skill 1, Tier 1", - 'game_id': "COMBO_1", - 'room': "Misc"}, - {'name': "Skill 1, Tier 2", - 'game_id': "COMBO_2", - 'room': "Misc"}, - {'name': "Skill 1, Tier 3", - 'game_id': "COMBO_3", - 'room': "Misc"}, - {'name': "Skill 2, Tier 1", - 'game_id': "CHARGED_1", - 'room': "Misc"}, - {'name': "Skill 2, Tier 2", - 'game_id': "CHARGED_2", - 'room': "Misc"}, - {'name': "Skill 2, Tier 3", - 'game_id': "CHARGED_3", - 'room': "Misc"}, - {'name': "Skill 3, Tier 1", - 'game_id': "RANGED_1", - 'room': "Misc"}, - {'name': "Skill 3, Tier 2", - 'game_id': "RANGED_2", - 'room': "Misc"}, - {'name': "Skill 3, Tier 3", - 'game_id': "RANGED_3", - 'room': "Misc"}, - {'name': "Skill 4, Tier 1", - 'game_id': "VERTICAL_1", - 'room': "Misc"}, - {'name': "Skill 4, Tier 2", - 'game_id': "VERTICAL_2", - 'room': "Misc"}, - {'name': "Skill 4, Tier 3", - 'game_id': "VERTICAL_3", - 'room': "Misc"}, - {'name': "Skill 5, Tier 1", - 'game_id': "LUNGE_1", - 'room': "Misc"}, - {'name': "Skill 5, Tier 2", - 'game_id': "LUNGE_2", - 'room': "Misc"}, - {'name': "Skill 5, Tier 3", - 'game_id': "LUNGE_3", - 'room': "Misc"}, + # Mourning and Havoc + "RB201": "MaH: Upper east chest", + "BossTrigger[5000]": "MaH: Sierpes", + "QI202": "MaH: Sierpes' eye", + "PR202": "MaH: West chest", + + # The Resting Place of the Sister + "QI203": "TRPotS: Perpetva's shrine", - # Custom Items - {'name': "BotSS: 2nd meeting with Redento", - 'game_id': "RE401", - 'room': "D17Z01S04"}, - {'name': "MoM: Western room ledge", - 'game_id': "RE402", - 'room': "D04Z02S01"} -] \ No newline at end of file + # Misc + "QI106": "Beginning gift", + "RB18": "Second red candle", + "RB19": "Third red candle", + "RB25": "Second blue candle", + "RB26": "Third blue candle", + "QI107": "Defeat 1 Amanecida", + "QI108": "Defeat 2 Amanecidas", + "QI109": "Defeat 3 Amanecidas", + "QI110": "Defeat 4 Amanecidas", + "PR101": "Defeat all Amanecidas", + "QI32": "Confessor Dungeon 1 main", + "QI33": "Confessor Dungeon 2 main", + "QI34": "Confessor Dungeon 3 main", + "QI35": "Confessor Dungeon 4 main", + "QI79": "Confessor Dungeon 5 main", + "QI80": "Confessor Dungeon 6 main", + "QI81": "Confessor Dungeon 7 main", + "Arena_NailManager[1000]": "Confessor Dungeon 1 extra", + "HE10": "Confessor Dungeon 2 extra", + "Arena_NailManager[3000]": "Confessor Dungeon 3 extra", + "RB34": "Confessor Dungeon 4 extra", + "Arena_NailManager[5000]": "Confessor Dungeon 5 extra", + "RB35": "Confessor Dungeon 6 extra", + "RB36": "Confessor Dungeon 7 extra", + "COMBO_1": "Skill 1, Tier 1", + "COMBO_2": "Skill 1, Tier 2", + "COMBO_3": "Skill 1, Tier 3", + "CHARGED_1": "Skill 2, Tier 1", + "CHARGED_2": "Skill 2, Tier 2", + "CHARGED_3": "Skill 2, Tier 3", + "RANGED_1": "Skill 3, Tier 1", + "RANGED_2": "Skill 3, Tier 2", + "RANGED_3": "Skill 3, Tier 3", + "VERTICAL_1": "Skill 4, Tier 1", + "VERTICAL_2": "Skill 4, Tier 2", + "VERTICAL_3": "Skill 4, Tier 3", + "LUNGE_1": "Skill 5, Tier 1", + "LUNGE_2": "Skill 5, Tier 2", + "LUNGE_3": "Skill 5, Tier 3" +} diff --git a/worlds/blasphemous/Options.py b/worlds/blasphemous/Options.py index 127a1dc77669..0bd08b13b260 100644 --- a/worlds/blasphemous/Options.py +++ b/worlds/blasphemous/Options.py @@ -1,4 +1,5 @@ -from Options import Choice, Toggle, DefaultOnToggle, DeathLink, StartInventoryPool +from dataclasses import dataclass +from Options import Choice, Toggle, DefaultOnToggle, DeathLink, PerGameCommonOptions, OptionGroup import random @@ -20,23 +21,30 @@ def from_text(cls, text: str) -> Choice: class PrieDieuWarp(DefaultOnToggle): - """Automatically unlocks the ability to warp between Prie Dieu shrines.""" + """ + Automatically unlocks the ability to warp between Prie Dieu shrines. + """ display_name = "Unlock Fast Travel" class SkipCutscenes(DefaultOnToggle): - """Automatically skips most cutscenes.""" + """ + Automatically skips most cutscenes. + """ display_name = "Auto Skip Cutscenes" class CorpseHints(DefaultOnToggle): - """Changes the 34 corpses in game to give various hints about item locations.""" + """ + Changes the 34 corpses in game to give various hints about item locations. + """ display_name = "Corpse Hints" class Difficulty(Choice): - """Adjusts the overall difficulty of the randomizer, including upgrades required to defeat bosses - and advanced movement tricks or glitches.""" + """ + Adjusts the overall difficulty of the randomizer, including upgrades required to defeat bosses and advanced movement tricks or glitches. + """ display_name = "Difficulty" option_easy = 0 option_normal = 1 @@ -45,15 +53,18 @@ class Difficulty(Choice): class Penitence(Toggle): - """Allows one of the three Penitences to be chosen at the beginning of the game.""" + """ + Allows one of the three Penitences to be chosen at the beginning of the game. + """ display_name = "Penitence" class StartingLocation(ChoiceIsRandom): - """Choose where to start the randomizer. Note that some starting locations cannot be chosen with certain - other options. - Specifically, Brotherhood and Mourning And Havoc cannot be chosen if Shuffle Dash is enabled, and Grievance Ascends - cannot be chosen if Shuffle Wall Climb is enabled.""" + """ + Choose where to start the randomizer. Note that some starting locations cannot be chosen with certain other options. + + Specifically, Brotherhood and Mourning And Havoc cannot be chosen if Shuffle Dash is enabled, and Grievance Ascends cannot be chosen if Shuffle Wall Climb is enabled. + """ display_name = "Starting Location" option_brotherhood = 0 option_albero = 1 @@ -66,10 +77,15 @@ class StartingLocation(ChoiceIsRandom): class Ending(Choice): - """Choose which ending is required to complete the game. + """ + Choose which ending is required to complete the game. + Talking to Tirso in Albero will tell you the selected ending for the current game. + Ending A: Collect all thorn upgrades. - Ending C: Collect all thorn upgrades and the Holy Wound of Abnegation.""" + + Ending C: Collect all thorn upgrades and the Holy Wound of Abnegation. + """ display_name = "Ending" option_any_ending = 0 option_ending_a = 1 @@ -78,14 +94,18 @@ class Ending(Choice): class SkipLongQuests(Toggle): - """Ensures that the rewards for long quests will be filler items. - Affected locations: \"Albero: Donate 50000 Tears\", \"Ossuary: 11th reward\", \"AtTotS: Miriam's gift\", - \"TSC: Jocinero's final reward\"""" + """ + Ensures that the rewards for long quests will be filler items. + + Affected locations: "Albero: Donate 50000 Tears", "Ossuary: 11th reward", "AtTotS: Miriam's gift", "TSC: Jocinero's final reward" + """ display_name = "Skip Long Quests" class ThornShuffle(Choice): - """Shuffles the Thorn given by Deogracias and all Thorn upgrades into the item pool.""" + """ + Shuffles the Thorn given by Deogracias and all Thorn upgrades into the item pool. + """ display_name = "Shuffle Thorn" option_anywhere = 0 option_local_only = 1 @@ -94,50 +114,68 @@ class ThornShuffle(Choice): class DashShuffle(Toggle): - """Turns the ability to dash into an item that must be found in the multiworld.""" + """ + Turns the ability to dash into an item that must be found in the multiworld. + """ display_name = "Shuffle Dash" class WallClimbShuffle(Toggle): - """Turns the ability to climb walls with your sword into an item that must be found in the multiworld.""" + """ + Turns the ability to climb walls with your sword into an item that must be found in the multiworld. + """ display_name = "Shuffle Wall Climb" class ReliquaryShuffle(DefaultOnToggle): - """Adds the True Torment exclusive Reliquary rosary beads into the item pool.""" + """ + Adds the True Torment exclusive Reliquary rosary beads into the item pool. + """ display_name = "Shuffle Penitence Rewards" class CustomItem1(Toggle): - """Adds the custom relic Boots of Pleading into the item pool, which grants the ability to fall onto spikes - and survive. - Must have the \"Blasphemous-Boots-of-Pleading\" mod installed to connect to a multiworld.""" + """ + Adds the custom relic Boots of Pleading into the item pool, which grants the ability to fall onto spikes and survive. + + Must have the "Boots of Pleading" mod installed to connect to a multiworld. + """ display_name = "Boots of Pleading" class CustomItem2(Toggle): - """Adds the custom relic Purified Hand of the Nun into the item pool, which grants the ability to jump - a second time in mid-air. - Must have the \"Blasphemous-Double-Jump\" mod installed to connect to a multiworld.""" + """ + Adds the custom relic Purified Hand of the Nun into the item pool, which grants the ability to jump a second time in mid-air. + + Must have the "Double Jump" mod installed to connect to a multiworld. + """ display_name = "Purified Hand of the Nun" class StartWheel(Toggle): - """Changes the beginning gift to The Young Mason's Wheel.""" + """ + Changes the beginning gift to The Young Mason's Wheel. + """ display_name = "Start with Wheel" class SkillRando(Toggle): - """Randomizes the abilities from the skill tree into the item pool.""" + """ + Randomizes the abilities from the skill tree into the item pool. + """ display_name = "Skill Randomizer" class EnemyRando(Choice): - """Randomizes the enemies that appear in each room. - Shuffled: Enemies will be shuffled amongst each other, but can only appear as many times as they do in - a standard game. + """ + Randomizes the enemies that appear in each room. + + Shuffled: Enemies will be shuffled amongst each other, but can only appear as many times as they do in a standard game. + Randomized: Every enemy is completely random, and can appear any number of times. - Some enemies will never be randomized.""" + + Some enemies will never be randomized. + """ display_name = "Enemy Randomizer" option_disabled = 0 option_shuffled = 1 @@ -146,43 +184,75 @@ class EnemyRando(Choice): class EnemyGroups(DefaultOnToggle): - """Randomized enemies will chosen from sets of specific groups. + """ + Randomized enemies will be chosen from sets of specific groups. + (Weak, normal, large, flying) - Has no effect if Enemy Randomizer is disabled.""" + + Has no effect if Enemy Randomizer is disabled. + """ display_name = "Enemy Groups" class EnemyScaling(DefaultOnToggle): - """Randomized enemies will have their stats increased or decreased depending on the area they appear in. - Has no effect if Enemy Randomizer is disabled.""" + """ + Randomized enemies will have their stats increased or decreased depending on the area they appear in. + + Has no effect if Enemy Randomizer is disabled. + """ display_name = "Enemy Scaling" class BlasphemousDeathLink(DeathLink): - """When you die, everyone dies. The reverse is also true. - Note that Guilt Fragments will not appear when killed by Death Link.""" - - -blasphemous_options = { - "prie_dieu_warp": PrieDieuWarp, - "skip_cutscenes": SkipCutscenes, - "corpse_hints": CorpseHints, - "difficulty": Difficulty, - "penitence": Penitence, - "starting_location": StartingLocation, - "ending": Ending, - "skip_long_quests": SkipLongQuests, - "thorn_shuffle" : ThornShuffle, - "dash_shuffle": DashShuffle, - "wall_climb_shuffle": WallClimbShuffle, - "reliquary_shuffle": ReliquaryShuffle, - "boots_of_pleading": CustomItem1, - "purified_hand": CustomItem2, - "start_wheel": StartWheel, - "skill_randomizer": SkillRando, - "enemy_randomizer": EnemyRando, - "enemy_groups": EnemyGroups, - "enemy_scaling": EnemyScaling, - "death_link": BlasphemousDeathLink, - "start_inventory": StartInventoryPool -} \ No newline at end of file + """ + When you die, everyone dies. The reverse is also true. + + Note that Guilt Fragments will not appear when killed by Death Link. + """ + + +@dataclass +class BlasphemousOptions(PerGameCommonOptions): + prie_dieu_warp: PrieDieuWarp + skip_cutscenes: SkipCutscenes + corpse_hints: CorpseHints + difficulty: Difficulty + penitence: Penitence + starting_location: StartingLocation + ending: Ending + skip_long_quests: SkipLongQuests + thorn_shuffle: ThornShuffle + dash_shuffle: DashShuffle + wall_climb_shuffle: WallClimbShuffle + reliquary_shuffle: ReliquaryShuffle + boots_of_pleading: CustomItem1 + purified_hand: CustomItem2 + start_wheel: StartWheel + skill_randomizer: SkillRando + enemy_randomizer: EnemyRando + enemy_groups: EnemyGroups + enemy_scaling: EnemyScaling + death_link: BlasphemousDeathLink + + +blas_option_groups = [ + OptionGroup("Quality of Life", [ + PrieDieuWarp, + SkipCutscenes, + CorpseHints, + SkipLongQuests, + StartWheel + ]), + OptionGroup("Moveset", [ + DashShuffle, + WallClimbShuffle, + SkillRando, + CustomItem1, + CustomItem2 + ]), + OptionGroup("Enemy Randomizer", [ + EnemyRando, + EnemyGroups, + EnemyScaling + ]) +] diff --git a/worlds/blasphemous/Preprocessor.py b/worlds/blasphemous/Preprocessor.py new file mode 100644 index 000000000000..dd845f26d5ab --- /dev/null +++ b/worlds/blasphemous/Preprocessor.py @@ -0,0 +1,582 @@ +# Preprocessor to convert Blasphemous Randomizer logic into a StringWorldDefinition for use with APHKLogicExtractor +# https://github.com/BrandenEK/Blasphemous.Randomizer +# https://github.com/ArchipelagoMW-HollowKnight/APHKLogicExtractor + + +import json, requests, argparse +from typing import List, Dict, Any + + +def load_resource_local(file: str) -> List[Dict[str, Any]]: + print(f"Reading from {file}") + loaded = [] + with open(file, encoding="utf-8") as f: + loaded = read_json(f.readlines()) + f.close() + + return loaded + + +def load_resource_from_web(url: str) -> List[Dict[str, Any]]: + req = requests.get(url, timeout=1) + print(f"Reading from {url}") + req.encoding = "utf-8" + lines: List[str] = [] + for line in req.text.splitlines(): + while "\t" in line: + line = line[1::] + if line != "": + lines.append(line) + return read_json(lines) + + +def read_json(lines: List[str]) -> List[Dict[str, Any]]: + loaded = [] + creating_object: bool = False + obj: str = "" + for line in lines: + stripped = line.strip() + if "{" in stripped: + creating_object = True + obj += stripped + continue + elif "}," in stripped or "}" in stripped and "]" in lines[lines.index(line)+1]: + creating_object = False + obj += "}" + #print(f"obj = {obj}") + loaded.append(json.loads(obj)) + obj = "" + continue + + if not creating_object: + continue + else: + try: + if "}," in lines[lines.index(line)+1] and stripped[-1] == ",": + obj += stripped[:-1] + else: + obj += stripped + except IndexError: + obj += stripped + + return loaded + + +def get_room_from_door(door: str) -> str: + return door[:door.find("[")] + + +def preprocess_logic(is_door: bool, id: str, logic: str) -> str: + if id in logic and not is_door: + index: int = logic.find(id) + logic = logic[:index] + logic[index+len(id)+4:] + + while ">=" in logic: + index: int = logic.find(">=") + logic = logic[:index-1] + logic[index+3:] + + while ">" in logic: + index: int = logic.find(">") + count = int(logic[index+2]) + count += 1 + logic = logic[:index-1] + str(count) + logic[index+3:] + + while "<=" in logic: + index: int = logic.find("<=") + logic = logic[:index-1] + logic[index+3:] + + while "<" in logic: + index: int = logic.find("<") + count = int(logic[index+2]) + count += 1 + logic = logic[:index-1] + str(count) + logic[index+3:] + + #print(logic) + return logic + + +def build_logic_conditions(logic: str) -> List[List[str]]: + all_conditions: List[List[str]] = [] + + parts = logic.split() + sub_part: str = "" + current_index: int = 0 + parens: int = -1 + current_condition: List[str] = [] + parens_conditions: List[List[List[str]]] = [] + + for index, part in enumerate(parts): + #print(current_index, index, parens, part) + + # skip parts that have already been handled + if index < current_index: + continue + + # break loop if reached final part + try: + parts[index+1] + except IndexError: + #print("INDEXERROR", part) + if parens < 0: + current_condition.append(part) + if len(parens_conditions) > 0: + for i in parens_conditions: + for j in i: + all_conditions.append(j + current_condition) + else: + all_conditions.append(current_condition) + break + + #print(current_condition, parens, sub_part) + + # prepare for subcondition + if "(" in part: + # keep track of nested parentheses + if parens == -1: + parens = 0 + for char in part: + if char == "(": + parens += 1 + + # add to sub part + if sub_part == "": + sub_part = part + else: + sub_part += f" {part}" + #if not ")" in part: + continue + + # end of subcondition + if ")" in part: + # read every character in case of multiple closing parentheses + for char in part: + if char == ")": + parens -= 1 + + sub_part += f" {part}" + + # if reached end of parentheses, handle subcondition + if parens == 0: + #print(current_condition, sub_part) + parens = -1 + + try: + parts[index+1] + except IndexError: + #print("END OF LOGIC") + if len(parens_conditions) > 0: + parens_conditions.append(build_logic_subconditions(current_condition, sub_part)) + #print("PARENS:", parens_conditions) + + temp_conditions: List[List[str]] = [] + + for i in parens_conditions[0]: + for j in parens_conditions[1]: + temp_conditions.append(i + j) + + parens_conditions.pop(0) + parens_conditions.pop(0) + + while len(parens_conditions) > 0: + temp_conditions2 = temp_conditions + temp_conditions = [] + for k in temp_conditions2: + for l in parens_conditions[0]: + temp_conditions.append(k + l) + + parens_conditions.pop(0) + + #print("TEMP:", remove_duplicates(temp_conditions)) + all_conditions += temp_conditions + else: + all_conditions += build_logic_subconditions(current_condition, sub_part) + else: + #print("NEXT PARTS:", parts[index+1], parts[index+2]) + if parts[index+1] == "&&": + parens_conditions.append(build_logic_subconditions(current_condition, sub_part)) + #print("PARENS:", parens_conditions) + else: + if len(parens_conditions) > 0: + parens_conditions.append(build_logic_subconditions(current_condition, sub_part)) + #print("PARENS:", parens_conditions) + + temp_conditions: List[List[str]] = [] + + for i in parens_conditions[0]: + for j in parens_conditions[1]: + temp_conditions.append(i + j) + + parens_conditions.pop(0) + parens_conditions.pop(0) + + while len(parens_conditions) > 0: + temp_conditions2 = temp_conditions + temp_conditions = [] + for k in temp_conditions2: + for l in parens_conditions[0]: + temp_conditions.append(k + l) + + parens_conditions.pop(0) + + #print("TEMP:", remove_duplicates(temp_conditions)) + all_conditions += temp_conditions + else: + all_conditions += build_logic_subconditions(current_condition, sub_part) + + current_index = index+2 + + current_condition = [] + sub_part = "" + + continue + + # collect all parts until reaching end of parentheses + if parens > 0: + sub_part += f" {part}" + continue + + current_condition.append(part) + + # continue with current condition + if parts[index+1] == "&&": + current_index = index+2 + continue + + # add condition to list and start new one + elif parts[index+1] == "||": + if len(parens_conditions) > 0: + for i in parens_conditions: + for j in i: + all_conditions.append(j + current_condition) + parens_conditions = [] + else: + all_conditions.append(current_condition) + current_condition = [] + current_index = index+2 + continue + + return remove_duplicates(all_conditions) + + +def build_logic_subconditions(current_condition: List[str], subcondition: str) -> List[List[str]]: + #print("STARTED SUBCONDITION", current_condition, subcondition) + subconditions = build_logic_conditions(subcondition[1:-1]) + final_conditions = [] + + for condition in subconditions: + final_condition = current_condition + condition + final_conditions.append(final_condition) + + #print("ENDED SUBCONDITION") + #print(final_conditions) + return final_conditions + + +def remove_duplicates(conditions: List[List[str]]) -> List[List[str]]: + final_conditions: List[List[str]] = [] + for condition in conditions: + final_conditions.append(list(dict.fromkeys(condition))) + + return final_conditions + + +def handle_door_visibility(door: Dict[str, Any]) -> Dict[str, Any]: + if door.get("visibilityFlags") == None: + return door + else: + flags: List[str] = str(door.get("visibilityFlags")).split(", ") + #print(flags) + temp_flags: List[str] = [] + this_door: bool = False + #required_doors: str = "" + + if "ThisDoor" in flags: + this_door = True + + #if "requiredDoors" in flags: + # required_doors: str = " || ".join(door.get("requiredDoors")) + + if "DoubleJump" in flags: + temp_flags.append("DoubleJump") + + if "NormalLogic" in flags: + temp_flags.append("NormalLogic") + + if "NormalLogicAndDoubleJump" in flags: + temp_flags.append("NormalLogicAndDoubleJump") + + if "HardLogic" in flags: + temp_flags.append("HardLogic") + + if "HardLogicAndDoubleJump" in flags: + temp_flags.append("HardLogicAndDoubleJump") + + if "EnemySkips" in flags: + temp_flags.append("EnemySkips") + + if "EnemySkipsAndDoubleJump" in flags: + temp_flags.append("EnemySkipsAndDoubleJump") + + # remove duplicates + temp_flags = list(dict.fromkeys(temp_flags)) + + original_logic: str = door.get("logic") + temp_logic: str = "" + + if this_door: + temp_logic = door.get("id") + + if temp_flags != []: + if temp_logic != "": + temp_logic += " || " + temp_logic += ' && '.join(temp_flags) + + if temp_logic != "" and original_logic != None: + if len(original_logic.split()) == 1: + if len(temp_logic.split()) == 1: + door["logic"] = f"{temp_logic} && {original_logic}" + else: + door["logic"] = f"({temp_logic}) && {original_logic}" + else: + if len(temp_logic.split()) == 1: + door["logic"] = f"{temp_logic} && ({original_logic})" + else: + door["logic"] = f"({temp_logic}) && ({original_logic})" + elif temp_logic != "" and original_logic == None: + door["logic"] = temp_logic + + return door + + +def get_state_provider_for_condition(condition: List[str]) -> str: + for item in condition: + if (item[0] == "D" and item[3] == "Z" and item[6] == "S")\ + or (item[0] == "D" and item[3] == "B" and item[4] == "Z" and item[7] == "S"): + return item + return None + + +def parse_args() -> argparse.Namespace: + parser = argparse.ArgumentParser() + parser.add_argument('-l', '--local', action="store_true", help="Use local files in the same directory instead of reading resource files from the BrandenEK/Blasphemous-Randomizer repository.") + args = parser.parse_args() + return args + + +def main(args: argparse.Namespace): + doors = [] + locations = [] + + if (args.local): + doors = load_resource_local("doors.json") + locations = load_resource_local("locations_items.json") + + else: + doors = load_resource_from_web("https://raw.githubusercontent.com/BrandenEK/Blasphemous-Randomizer/main/resources/data/Randomizer/doors.json") + locations = load_resource_from_web("https://raw.githubusercontent.com/BrandenEK/Blasphemous-Randomizer/main/resources/data/Randomizer/locations_items.json") + + original_connections: Dict[str, str] = {} + rooms: Dict[str, List[str]] = {} + output: Dict[str, Any] = {} + logic_objects: List[Dict[str, Any]] = [] + + for door in doors: + if door.get("originalDoor") != None: + if not door.get("id") in original_connections: + original_connections[door.get("id")] = door.get("originalDoor") + original_connections[door.get("originalDoor")] = door.get("id") + + room: str = get_room_from_door(door.get("originalDoor")) + if not room in rooms.keys(): + rooms[room] = [door.get("id")] + else: + rooms[room].append(door.get("id")) + + def flip_doors_in_condition(condition: List[str]) -> List[str]: + new_condition = [] + for item in condition: + if item in original_connections: + new_condition.append(original_connections[item]) + else: + new_condition.append(item) + + return new_condition + + for room in rooms.keys(): + obj = { + "Name": room, + "Logic": [], + "Handling": "Default" + } + + for door in rooms[room]: + logic = { + "StateProvider": door, + "Conditions": [], + "StateModifiers": [] + } + obj["Logic"].append(logic) + + logic_objects.append(obj) + + for door in doors: + if door.get("direction") == 5: + continue + + handling: str = "Transition" + if "Cell" in door.get("id"): + handling = "Default" + obj = { + "Name": door.get("id"), + "Logic": [], + "Handling": handling + } + + visibility_flags: List[str] = [] + if door.get("visibilityFlags") != None: + visibility_flags = str(door.get("visibilityFlags")).split(", ") + if "1" in visibility_flags: + visibility_flags.remove("1") + visibility_flags.append("ThisDoor") + + required_doors: List[str] = [] + if door.get("requiredDoors"): + required_doors = door.get("requiredDoors") + + if len(visibility_flags) > 0: + for flag in visibility_flags: + if flag == "RequiredDoors": + continue + + if flag == "ThisDoor": + flag = original_connections[door.get("id")] + + if door.get("logic") != None: + logic: str = door.get("logic") + logic = f"{flag} && ({logic})" + logic = preprocess_logic(True, door.get("id"), logic) + conditions = build_logic_conditions(logic) + for condition in conditions: + condition = flip_doors_in_condition(condition) + state_provider: str = get_room_from_door(door.get("id")) + + if get_state_provider_for_condition(condition) != None: + state_provider = get_state_provider_for_condition(condition) + condition.remove(state_provider) + + logic = { + "StateProvider": state_provider, + "Conditions": condition, + "StateModifiers": [] + } + obj["Logic"].append(logic) + else: + logic = { + "StateProvider": get_room_from_door(door.get("id")), + "Conditions": [flag], + "StateModifiers": [] + } + obj["Logic"].append(logic) + + if "RequiredDoors" in visibility_flags: + for d in required_doors: + flipped = original_connections[d] + if door.get("logic") != None: + logic: str = preprocess_logic(True, door.get("id"), door.get("logic")) + conditions = build_logic_conditions(logic) + for condition in conditions: + condition = flip_doors_in_condition(condition) + state_provider: str = flipped + + if flipped in condition: + condition.remove(flipped) + + logic = { + "StateProvider": state_provider, + "Conditions": condition, + "StateModifiers": [] + } + obj["Logic"].append(logic) + else: + logic = { + "StateProvider": flipped, + "Conditions": [], + "StateModifiers": [] + } + obj["Logic"].append(logic) + + else: + if door.get("logic") != None: + logic: str = preprocess_logic(True, door.get("id"), door.get("logic")) + conditions = build_logic_conditions(logic) + for condition in conditions: + condition = flip_doors_in_condition(condition) + stateProvider: str = get_room_from_door(door.get("id")) + + if get_state_provider_for_condition(condition) != None: + stateProvider = get_state_provider_for_condition(condition) + condition.remove(stateProvider) + + logic = { + "StateProvider": stateProvider, + "Conditions": condition, + "StateModifiers": [] + } + obj["Logic"].append(logic) + else: + logic = { + "StateProvider": get_room_from_door(door.get("id")), + "Conditions": [], + "StateModifiers": [] + } + obj["Logic"].append(logic) + + logic_objects.append(obj) + + for location in locations: + obj = { + "Name": location.get("id"), + "Logic": [], + "Handling": "Location" + } + + if location.get("logic") != None: + for condition in build_logic_conditions(preprocess_logic(False, location.get("id"), location.get("logic"))): + condition = flip_doors_in_condition(condition) + stateProvider: str = location.get("room") + + if get_state_provider_for_condition(condition) != None: + stateProvider = get_state_provider_for_condition(condition) + condition.remove(stateProvider) + + if stateProvider == "Initial": + stateProvider = None + + logic = { + "StateProvider": stateProvider, + "Conditions": condition, + "StateModifiers": [] + } + obj["Logic"].append(logic) + else: + stateProvider: str = location.get("room") + if stateProvider == "Initial": + stateProvider = None + logic = { + "StateProvider": stateProvider, + "Conditions": [], + "StateModifiers": [] + } + obj["Logic"].append(logic) + + logic_objects.append(obj) + + output["LogicObjects"] = logic_objects + + with open("StringWorldDefinition.json", "w") as file: + print("Writing to StringWorldDefinition.json") + file.write(json.dumps(output, indent=4)) + + +if __name__ == "__main__": + main(parse_args()) diff --git a/worlds/blasphemous/Rooms.py b/worlds/blasphemous/Rooms.py deleted file mode 100644 index 74f245adeff7..000000000000 --- a/worlds/blasphemous/Rooms.py +++ /dev/null @@ -1,5405 +0,0 @@ -from typing import List, TypedDict - - -room_table: List[str] = [ - "D01Z01S01", # THL - "D01Z01S02", # THL - "D01Z01S03", # THL - "D01Z01S07", # THL - "D01Z02S01", # Albero - "D01Z02S02", # Albero - "D01Z02S03", # Albero - "D01Z02S04", # Albero - "D01Z02S05", # Albero - "D01Z02S06", # Albero - "D01Z02S07", # Albero - "D01BZ04S01", # Albero Church - "D01BZ06S01", # Ossuary - "D01BZ08S01", # Ossuary - isidora's room? - "D01Z03S01", # WotBC - "D01Z03S02", # WotBC - "D01Z03S03", # WotBC - "D01Z03S04", # WotBC - "D01Z03S05", # WotBC - "D01Z03S06", # WotBC - "D01Z03S07", # WotBC - "D01Z04S01", # MD - "D01Z04S02", # MD - "D01Z04S03", # MD - "D01Z04S05", # MD - "D01Z04S06", # MD - "D01Z04S07", # MD - "D01Z04S08", # MD - "D01Z04S09", # MD - "D01Z04S10", # MD - "D01Z04S11", # MD - "D01Z04S12", # MD - "D01Z04S13", # MD - "D01Z04S14", # MD - "D01Z04S15", # MD - "D01Z04S16", # MD - "D01Z04S17", # MD - "D01Z04S18", # MD - "D01Z04S19", # MD - "D01BZ02S01", # MD - shop - "D01Z05S01", # DC - "D01Z05S02", # DC - "D01Z05S03", # DC - "D01Z05S04", # DC - "D01Z05S05", # DC - "D01Z05S06", # DC - "D01Z05S07", # DC - "D01Z05S08", # DC - "D01Z05S09", # DC - "D01Z05S10", # DC - "D01Z05S11", # DC - "D01Z05S12", # DC - "D01Z05S13", # DC - "D01Z05S14", # DC - "D01Z05S15", # DC - "D01Z05S16", # DC - "D01Z05S17", # DC - "D01Z05S18", # DC - "D01Z05S19", # DC - "D01Z05S20", # DC - "D01Z05S21", # DC - "D01Z05S22", # DC - "D01Z05S23", # DC - "D01Z05S24", # DC - "D01Z05S25", # DC - "D01Z05S26", # DC - "D01Z05S27", # DC - "D01BZ05S01", # DC - shroud of dreamt sins room? - "D01BZ09S01", # DC - arcade room - "D01Z06S01", # Petrous - "D01BZ07S01", # Petrous - Jibrael - "D02Z01S01", # WOTW - "D02Z01S02", # WOTW - "D02Z01S03", # WOTW - "D02Z01S04", # WOTW - "D02Z01S05", # WOTW - "D02Z01S06", # WOTW - "D02Z01S08", # WOTW - "D02Z01S09", # WOTW - "D02Z02S01", # GOTP - "D02Z02S02", # GOTP - "D02Z02S03", # GOTP - "D02Z02S04", # GOTP - "D02Z02S05", # GOTP - "D02Z02S06", # GOTP - "D02Z02S07", # GOTP - "D02Z02S08", # GOTP - "D02Z02S09", # GOTP - "D02Z02S10", # GOTP - "D02Z02S11", # GOTP - "D02Z02S12", # GOTP - "D02Z02S13", # GOTP - "D02Z02S14", # GOTP - "D02BZ02S01", # GOTP - shop - "D02Z03S01", # COOLOTCV - "D02Z03S02", # COOLOTCV - "D02Z03S03", # COOLOTCV - "D02Z03S05", # COOLOTCV - "D02Z03S06", # COOLOTCV - "D02Z03S07", # COOLOTCV - "D02Z03S08", # COOLOTCV - "D02Z03S09", # COOLOTCV - "D02Z03S10", # COOLOTCV - "D02Z03S11", # COOLOTCV - "D02Z03S12", # COOLOTCV - "D02Z03S13", # COOLOTCV - "D02Z03S14", # COOLOTCV - "D02Z03S15", # COOLOTCV - "D02Z03S16", # COOLOTCV - "D02Z03S17", # COOLOTCV - "D02Z03S18", # COOLOTCV - "D02Z03S19", # COOLOTCV - "D02Z03S20", # COOLOTCV - "D02Z03S21", # COOLOTCV - "D02Z03S22", # COOLOTCV - "D02Z03S23", # COOLOTCV - "D02Z03S24", # COOLOTCV - "D03Z01S01", # MOTED - "D03Z01S02", # MOTED - "D03Z01S03", # MOTED - "D03Z01S04", # MOTED - "D03Z01S05", # MOTED - "D03Z01S06", # MOTED - "D03Z02S01", # Jondo - "D03Z02S02", # Jondo - "D03Z02S03", # Jondo - "D03Z02S04", # Jondo - "D03Z02S05", # Jondo - "D03Z02S06", # Jondo - "D03Z02S07", # Jondo - "D03Z02S08", # Jondo - "D03Z02S09", # Jondo - "D03Z02S10", # Jondo - "D03Z02S11", # Jondo - "D03Z02S12", # Jondo - "D03Z02S13", # Jondo - "D03Z02S14", # Jondo - "D03Z02S15", # Jondo - "D03Z03S01", # GA - "D03Z03S02", # GA - "D03Z03S03", # GA - "D03Z03S04", # GA - "D03Z03S05", # GA - "D03Z03S06", # GA - "D03Z03S07", # GA - "D03Z03S08", # GA - "D03Z03S09", # GA - "D03Z03S10", # GA - "D03Z03S11", # GA - "D03Z03S12", # GA - "D03Z03S13", # GA - "D03Z03S14", # GA - "D03Z03S15", # GA - "D03Z03S16", # GA - "D03Z03S17", # GA - "D03Z03S18", # GA - "D03Z03S19", # GA - "D04Z01S01", # POTSS - "D04Z01S02", # POTSS - "D04Z01S03", # POTSS - "D04Z01S04", # POTSS - "D04Z01S05", # POTSS - "D04Z01S06", # POTSS - "D04Z02S01", # MOM - "D04Z02S02", # MOM - "D04Z02S03", # MOM - "D04Z02S04", # MOM - "D04Z02S05", # MOM - "D04Z02S06", # MOM - "D04Z02S07", # MOM - "D04Z02S08", # MOM - "D04Z02S09", # MOM - "D04Z02S10", # MOM - "D04Z02S11", # MOM - "D04Z02S12", # MOM - "D04Z02S13", # MOM - "D04Z02S14", # MOM - "D04Z02S15", # MOM - "D04Z02S16", # MOM - "D04Z02S17", # MOM - "D04Z02S19", # MOM - "D04Z02S20", # MOM - "D04Z02S21", # MOM - "D04Z02S22", # MOM - "D04Z02S23", # MOM - "D04Z02S24", # MOM - "D04Z02S25", # MOM - "D04BZ02S01", # MOM - Redento - "D04Z03S01", # KOTTW - "D04Z03S02", # KOTTW - "D04Z04S01", # ATTOTS - "D04Z04S02", # ATTOTS - "D05Z01S01", # LOTNW - "D05Z01S02", # LOTNW - "D05Z01S03", # LOTNW - "D05Z01S04", # LOTNW - "D05Z01S05", # LOTNW - "D05Z01S06", # LOTNW - "D05Z01S07", # LOTNW - "D05Z01S08", # LOTNW - "D05Z01S09", # LOTNW - "D05Z01S10", # LOTNW - "D05Z01S11", # LOTNW - "D05Z01S12", # LOTNW - "D05Z01S13", # LOTNW - "D05Z01S14", # LOTNW - "D05Z01S15", # LOTNW - "D05Z01S16", # LOTNW - "D05Z01S17", # LOTNW - "D05Z01S18", # LOTNW - "D05Z01S19", # LOTNW - "D05Z01S20", # LOTNW - "D05Z01S21", # LOTNW - "D05Z01S22", # LOTNW - "D05Z01S23", # LOTNW - "D05Z01S24", # LOTNW - "D05BZ01S01", # LOTNW - secret entrance to KOTTW? - "D05Z02S01", # TSC - "D05Z02S02", # TSC - "D05Z02S03", # TSC - "D05Z02S04", # TSC - "D05Z02S05", # TSC - "D05Z02S06", # TSC - "D05Z02S07", # TSC - "D05Z02S08", # TSC - "D05Z02S09", # TSC - "D05Z02S10", # TSC - "D05Z02S11", # TSC - "D05Z02S12", # TSC - "D05Z02S13", # TSC - "D05Z02S14", # TSC - "D05Z02S15", # TSC - "D05BZ02S01", # TSC - shop - "D06Z01S01", # AR - "D06Z01S02", # AR - "D06Z01S03", # AR - "D06Z01S04", # AR - "D06Z01S05", # AR - "D06Z01S06", # AR - "D06Z01S07", # AR - "D06Z01S08", # AR - "D06Z01S09", # AR - "D06Z01S10", # AR - "D06Z01S11", # AR - "D06Z01S12", # AR - "D06Z01S13", # AR - "D06Z01S14", # AR - "D06Z01S15", # AR - "D06Z01S16", # AR - "D06Z01S17", # AR - "D06Z01S18", # AR - "D06Z01S19", # AR - "D06Z01S20", # AR - "D06Z01S21", # AR - "D06Z01S22", # AR - "D06Z01S23", # AR - "D06Z01S24", # AR - "D06Z01S25", # AR - "D06Z01S26", # AR - "D07Z01S01", # DOHH? - "D07Z01S02", # DOHH? - "D07Z01S03", # DOHH? - "D08Z01S01", # BOTTC - "D08Z01S02", # BOTTC - "D08Z02S01", # FT - "D08Z02S02", # FT - "D08Z02S03", # FT - "D08Z03S01", # HOTD - "D08Z03S02", # HOTD - "D08Z03S03", # HOTD - "D09Z01S01", # WOTHP - "D09Z01S02", # WOTHP - "D09Z01S03", # WOTHP - "D09Z01S04", # WOTHP - "D09Z01S05", # WOTHP - "D09Z01S06", # WOTHP - "D09Z01S07", # WOTHP - "D09Z01S08", # WOTHP - "D09Z01S09", # WOTHP - "D09Z01S10", # WOTHP - "D09Z01S11", # WOTHP - "D09Z01S12", # WOTHP - "D09Z01S13", # WOTHP - "D09BZ01S01", # WOTHP - all cells - "D17Z01S01", # BOTSS - "D17Z01S02", # BOTSS - "D17Z01S03", # BOTSS - "D17Z01S04", # BOTSS - "D17Z01S05", # BOTSS - "D17Z01S06", # BOTSS - "D17Z01S07", # BOTSS - "D17Z01S08", # BOTSS - "D17Z01S09", # BOTSS - "D17Z01S10", # BOTSS - "D17Z01S11", # BOTSS - "D17Z01S12", # BOTSS - "D17Z01S13", # BOTSS - "D17Z01S14", # BOTSS - "D17Z01S15", # BOTSS - "D17BZ01S01", # BOTSS - chamber of the eldest brother - "D17BZ02S01", # BOTSS - platforming challenge - "D20Z01S01", # EOS - "D20Z01S02", # EOS - "D20Z01S03", # EOS - "D20Z01S04", # EOS - "D20Z01S05", # EOS - "D20Z01S06", # EOS - "D20Z01S07", # EOS - "D20Z01S08", # EOS - "D20Z01S09", # EOS - "D20Z01S10", # EOS - "D20Z01S11", # EOS - "D20Z01S12", # EOS - "D20Z01S13", # EOS - "D20Z01S14", # EOS - "D20Z02S01", # MAH - "D20Z02S02", # MAH - "D20Z02S03", # MAH - "D20Z02S04", # MAH - "D20Z02S05", # MAH - "D20Z02S06", # MAH - "D20Z02S07", # MAH - "D20Z02S08", # MAH - "D20Z02S09", # MAH - "D20Z02S10", # MAH - "D20Z02S11", # MAH - "D20Z02S12", # MAH - "D20Z03S01", # TRPOTS -] - - -class DoorDict(TypedDict, total=False): - Id: str - Direction: int - OriginalDoor: str - Type: int - Logic: str - VisibilityFlags: int - RequiredDoors: List[str] - - -door_table: List[DoorDict] = [ - { - "Id": "D01Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D01Z01S07[E]" - }, - { - "Id": "D01Z01S01[E]", - "Direction": 2, - "OriginalDoor": "D01Z01S02[W]" - }, - { - "Id": "D01Z01S01[S]", - "Direction": 2, - "OriginalDoor": "D01Z06S01[N]", - "Type": 1, - "Logic": "D01Z01S01[S] || canBreakHoles || doubleJump" - }, - { - "Id": "D01Z01S02[W]", - "Direction": 1, - "OriginalDoor": "D01Z01S01[E]" - }, - { - "Id": "D01Z01S02[E]", - "Direction": 2, - "OriginalDoor": "D01Z01S03[W]" - }, - { - "Id": "D01Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D01Z01S02[E]" - }, - { - "Id": "D01Z01S03[E]", - "Direction": 2, - "OriginalDoor": "D01Z02S01[W]", - "Type": 1 - }, - { - "Id": "D01Z01S07[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S03[E]", - "Type": 1 - }, - { - "Id": "D01Z01S07[E]", - "Direction": 2, - "OriginalDoor": "D01Z01S01[W]" - }, - - { - "Id": "D01Z02S01[W]", - "Direction": 1, - "OriginalDoor": "D01Z01S03[E]", - "Type": 1 - }, - { - "Id": "D01Z02S01[E]", - "Direction": 2, - "OriginalDoor": "D01Z02S02[W]" - }, - { - "Id": "D01Z02S02[SW]", - "Direction": 1, - "OriginalDoor": "D01Z02S06[E]" - }, - { - "Id": "D01Z02S02[SE]", - "Direction": 2, - "OriginalDoor": "D01Z02S04[W]" - }, - { - "Id": "D01Z02S02[W]", - "Direction": 1, - "OriginalDoor": "D01Z02S01[E]" - }, - { - "Id": "D01Z02S02[E]", - "Direction": 2, - "OriginalDoor": "D01Z02S03[W]" - }, - { - "Id": "D01Z02S02[NE]", - "Direction": 2, - "OriginalDoor": "D01Z02S03[NW]" - }, - { - "Id": "D01Z02S03[W]", - "Direction": 1, - "OriginalDoor": "D01Z02S02[E]" - }, - { - "Id": "D01Z02S03[NW]", - "Direction": 1, - "OriginalDoor": "D01Z02S02[NE]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D02Z02S11[NW]", "D02Z02S11[NE]", "D02Z02S11[W]", "D02Z02S11[E]", "D02Z02S11[SE]" ] - }, - { - "Id": "D01Z02S03[E]", - "Direction": 2, - "OriginalDoor": "D01Z02S05[W]" - }, - { - "Id": "D01Z02S03[church]", - "Direction": 4, - "OriginalDoor": "D01BZ04S01[church]", - "Logic": "canBeatMercyBoss || canBeatConventBoss || canBeatGrievanceBoss" - }, - { - "Id": "D01Z02S03[Cherubs]", - "Direction": 5 - }, - { - "Id": "D01Z02S04[W]", - "Direction": 1, - "OriginalDoor": "D01Z02S02[SE]" - }, - { - "Id": "D01Z02S04[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S01[N]", - "Type": 1 - }, - { - "Id": "D01Z02S04[Ossary]", - "Direction": 4, - "OriginalDoor": "D01BZ06S01[Ossary]" - }, - { - "Id": "D01Z02S05[W]", - "Direction": 1, - "OriginalDoor": "D01Z02S03[E]" - }, - { - "Id": "D01Z02S05[E]", - "Direction": 2, - "OriginalDoor": "D01Z03S01[W]", - "Type": 1 - }, - { - "Id": "D01Z02S06[W]", - "Direction": 1, - "OriginalDoor": "D01Z02S07[E]" - }, - { - "Id": "D01Z02S06[E]", - "Direction": 2, - "OriginalDoor": "D01Z02S02[SW]" - }, - { - "Id": "D01Z02S07[E]", - "Direction": 2, - "OriginalDoor": "D01Z02S06[W]" - }, - { - "Id": "D01BZ04S01[church]", - "Direction": 7, - "OriginalDoor": "D01Z02S03[church]" - }, - { - "Id": "D01BZ06S01[Ossary]", - "Direction": 7, - "OriginalDoor": "D01Z02S04[Ossary]" - }, - { - "Id": "D01BZ06S01[E]", - "Direction": 2, - "OriginalDoor": "D01BZ08S01[W]", - "Logic": "bones >= 30" - }, - { - "Id": "D01BZ08S01[W]", - "Direction": 1, - "OriginalDoor": "D01BZ06S01[E]" - }, - - { - "Id": "D01Z03S01[W]", - "Direction": 1, - "OriginalDoor": "D01Z02S05[E]", - "Type": 1 - }, - { - "Id": "D01Z03S01[E]", - "Direction": 2, - "OriginalDoor": "D01Z03S02[W]" - }, - { - "Id": "D01Z03S01[SE]", - "Direction": 2, - "OriginalDoor": "D01Z03S02[SW]", - "VisibilityFlags": 1 - }, - { - "Id": "D01Z03S02[W]", - "Direction": 1, - "OriginalDoor": "D01Z03S01[E]" - }, - { - "Id": "D01Z03S02[SW]", - "Direction": 1, - "OriginalDoor": "D01Z03S01[SE]" - }, - { - "Id": "D01Z03S02[E]", - "Direction": 2, - "OriginalDoor": "D01Z03S03[W]" - }, - { - "Id": "D01Z03S02[S]", - "Direction": 3, - "OriginalDoor": "D01Z05S05[N]", - "Type": 1, - "VisibilityFlags": 1 - }, - { - "Id": "D01Z03S03[W]", - "Direction": 1, - "OriginalDoor": "D01Z03S02[E]" - }, - { - "Id": "D01Z03S03[E]", - "Direction": 2, - "OriginalDoor": "D01Z03S04[SW]" - }, - { - "Id": "D01Z03S03[Cherubs]", - "Direction": 5 - }, - { - "Id": "D01Z03S03[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D01Z05S06[Cherubs]", - "Type": 1, - "Logic": "linen" - }, - { - "Id": "D01Z03S04[SW]", - "Direction": 1, - "OriginalDoor": "D01Z03S03[E]" - }, - { - "Id": "D01Z03S04[W]", - "Direction": 1, - "OriginalDoor": "D01Z03S07[E]" - }, - { - "Id": "D01Z03S04[NW]", - "Direction": 1, - "OriginalDoor": "D02Z01S01[SE]", - "Type": 1 - }, - { - "Id": "D01Z03S04[SE]", - "Direction": 2, - "OriginalDoor": "D01Z03S05[W]" - }, - { - "Id": "D01Z03S04[E]", - "Direction": 2, - "OriginalDoor": "D01Z03S06[W]" - }, - { - "Id": "D01Z03S05[W]", - "Direction": 1, - "OriginalDoor": "D01Z03S04[SE]" - }, - { - "Id": "D01Z03S05[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S01[NW]", - "Type": 1 - }, - { - "Id": "D01Z03S05[Cherubs]", - "Direction": 6, - "OriginalDoor": "D01Z05S11[Cherubs]", - "Type": 1, - "Logic": "linen" - }, - { - "Id": "D01Z03S06[W]", - "Direction": 1, - "OriginalDoor": "D01Z03S04[E]" - }, - { - "Id": "D01Z03S06[E]", - "Direction": 2, - "OriginalDoor": "D08Z01S01[W]", - "Type": 1 - }, - { - "Id": "D01Z03S07[E]", - "Direction": 2, - "OriginalDoor": "D01Z03S04[W]" - }, - { - "Id": "D01Z03S07[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D01Z03S03[Cherubs]", - "Logic": "linen" - }, - - { - "Id": "D01Z04S01[NW]", - "Direction": 1, - "OriginalDoor": "D01Z03S05[E]", - "Type": 1 - }, - { - "Id": "D01Z04S01[NE]", - "Direction": 2, - "OriginalDoor": "D01Z04S17[W]" - }, - { - "Id": "D01Z04S01[W]", - "Direction": 1, - "OriginalDoor": "D01Z04S03[E]" - }, - { - "Id": "D01Z04S01[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S05[NW]" - }, - { - "Id": "D01Z04S01[SE]", - "Direction": 2, - "OriginalDoor": "D01Z04S05[SW]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D01Z04S01[S]" ] - }, - { - "Id": "D01Z04S01[S]", - "Direction": 3, - "OriginalDoor": "D01Z04S15[N]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D01Z04S01[SE]" ] - }, - { - "Id": "D01Z04S02[W]", - "Direction": 1, - "OriginalDoor": "D01Z04S13[NE]" - }, - { - "Id": "D01Z04S03[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S01[W]" - }, - { - "Id": "D01Z04S05[NW]", - "Direction": 1, - "OriginalDoor": "D01Z04S01[E]" - }, - { - "Id": "D01Z04S05[SW]", - "Direction": 1, - "OriginalDoor": "D01Z04S01[SE]" - }, - { - "Id": "D01Z04S06[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S07[W]" - }, - { - "Id": "D01Z04S06[NW]", - "Direction": 1, - "OriginalDoor": "D01Z04S15[NE]" - }, - { - "Id": "D01Z04S06[SW]", - "Direction": 1, - "OriginalDoor": "D01Z04S15[E]" - }, - { - "Id": "D01Z04S07[W]", - "Direction": 1, - "OriginalDoor": "D01Z04S06[E]" - }, - { - "Id": "D01Z04S08[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S15[W]" - }, - { - "Id": "D01Z04S09[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S12[E]", - "Type": 1, - "Logic": "openedDCGateE" - }, - { - "Id": "D01Z04S09[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S15[SW]" - }, - { - "Id": "D01Z04S09[C]", - "Direction": 4, - "OriginalDoor": "D01BZ02S01[C]" - }, - { - "Id": "D01Z04S10[NW]", - "Direction": 1, - "OriginalDoor": "D01Z04S15[SE]" - }, - { - "Id": "D01Z04S10[SW]", - "Direction": 3, - "OriginalDoor": "D01Z04S11[NE]" - }, - { - "Id": "D01Z04S10[SE]", - "Direction": 3, - "OriginalDoor": "D01Z04S12[NW]" - }, - { - "Id": "D01Z04S11[NE]", - "Direction": 0, - "OriginalDoor": "D01Z04S10[SW]" - }, - { - "Id": "D01Z04S12[NW]", - "Direction": 0, - "OriginalDoor": "D01Z04S10[SE]" - }, - { - "Id": "D01Z04S12[W]", - "Direction": 1, - "OriginalDoor": "D01Z04S18[E]" - }, - { - "Id": "D01Z04S12[SE]", - "Direction": 2, - "OriginalDoor": "D01Z04S13[NW]" - }, - { - "Id": "D01Z04S13[NW]", - "Direction": 1, - "OriginalDoor": "D01Z04S12[SE]" - }, - { - "Id": "D01Z04S13[NE]", - "Direction": 2, - "OriginalDoor": "D01Z04S02[W]" - }, - { - "Id": "D01Z04S13[SW]", - "Direction": 1, - "OriginalDoor": "D01Z04S14[E]" - }, - { - "Id": "D01Z04S13[SE]", - "Direction": 2, - "OriginalDoor": "D01Z04S16[W]", - "VisibilityFlags": 5, - "Logic": "D01Z04S13[SE] || canDiveLaser && (canAirStall || wheel || doubleJump || canEnemyBounce)" - }, - { - "Id": "D01Z04S14[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S13[SW]" - }, - { - "Id": "D01Z04S15[N]", - "Direction": 0, - "OriginalDoor": "D01Z04S01[S]" - }, - { - "Id": "D01Z04S15[NE]", - "Direction": 2, - "OriginalDoor": "D01Z04S06[NW]" - }, - { - "Id": "D01Z04S15[W]", - "Direction": 1, - "OriginalDoor": "D01Z04S08[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D01Z04S15[E]", "D01Z04S15[SW]", "D01Z04S15[SE]" ] - }, - { - "Id": "D01Z04S15[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S06[SW]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D01Z04S15[W]", "D01Z04S15[SW]", "D01Z04S15[SE]" ] - }, - { - "Id": "D01Z04S15[SW]", - "Direction": 1, - "OriginalDoor": "D01Z04S09[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D01Z04S15[W]", "D01Z04S15[E]", "D01Z04S15[SE]" ] - }, - { - "Id": "D01Z04S15[SE]", - "Direction": 2, - "OriginalDoor": "D01Z04S10[NW]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D01Z04S15[W]", "D01Z04S15[E]", "D01Z04S15[SW]" ] - }, - { - "Id": "D01Z04S16[W]", - "Direction": 1, - "OriginalDoor": "D01Z04S13[SE]" - }, - { - "Id": "D01Z04S16[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S12[W]", - "Type": 1 - }, - { - "Id": "D01Z04S17[W]", - "Direction": 1, - "OriginalDoor": "D01Z04S01[NE]" - }, - { - "Id": "D01Z04S18[W]", - "Direction": 1, - "OriginalDoor": "D01Z04S19[E]", - "Logic": "D01Z04S18[W] || canBeatMercyBoss" - }, - { - "Id": "D01Z04S18[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S12[W]", - "Logic": "D01Z04S18[E] || canBeatMercyBoss" - }, - { - "Id": "D01Z04S19[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S19[E]", - "Type": 1 - }, - { - "Id": "D01Z04S19[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S18[W]" - }, - { - "Id": "D01BZ02S01[C]", - "Direction": 7, - "OriginalDoor": "D01Z04S09[C]" - }, - - { - "Id": "D01Z05S01[N]", - "Direction": 1, - "OriginalDoor": "D01Z02S04[E]", - "Type": 1 - }, - { - "Id": "D01Z05S01[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S27[E]" - }, - { - "Id": "D01Z05S01[S]", - "Direction": 3, - "OriginalDoor": "D01Z05S02[N]" - }, - { - "Id": "D01Z05S02[N]", - "Direction": 0, - "OriginalDoor": "D01Z05S01[S]" - }, - { - "Id": "D01Z05S02[W]", - "Direction": 1, - "OriginalDoor": "D03Z01S01[NE]", - "Type": 1 - }, - { - "Id": "D01Z05S02[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S03[NW]", - "VisibilityFlags": 1 - }, - { - "Id": "D01Z05S02[S]", - "Direction": 3, - "OriginalDoor": "D01Z05S20[N]", - "Logic": "openedDCLadder" - }, - { - "Id": "D01Z05S03[NW]", - "Direction": 1, - "OriginalDoor": "D01Z05S02[E]" - }, - { - "Id": "D01Z05S03[NE]", - "Direction": 2, - "OriginalDoor": "D01Z05S04[W]" - }, - { - "Id": "D01Z05S03[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S07[E]" - }, - { - "Id": "D01Z05S03[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S08[W]" - }, - { - "Id": "D01Z05S03[S]", - "Direction": 3, - "OriginalDoor": "D01Z05S13[N]" - }, - { - "Id": "D01Z05S04[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S03[NE]" - }, - { - "Id": "D01Z05S04[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S05[NW]" - }, - { - "Id": "D01Z05S05[N]", - "Direction": 0, - "OriginalDoor": "D01Z03S02[S]", - "Type": 1 - }, - { - "Id": "D01Z05S05[NW]", - "Direction": 1, - "OriginalDoor": "D01Z05S04[E]" - }, - { - "Id": "D01Z05S05[NE]", - "Direction": 2, - "OriginalDoor": "D01Z05S06[W]" - }, - { - "Id": "D01Z05S05[SW]", - "Direction": 1, - "OriginalDoor": "D01Z05S18[E]" - }, - { - "Id": "D01Z05S05[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S09[NW]" - }, - { - "Id": "D01Z05S06[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S05[NE]" - }, - { - "Id": "D01Z05S06[Cherubs]", - "Direction": 5, - "Type": 1 - }, - { - "Id": "D01Z05S07[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S03[W]" - }, - { - "Id": "D01Z05S08[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S03[E]" - }, - { - "Id": "D01Z05S09[NW]", - "Direction": 1, - "OriginalDoor": "D01Z05S05[E]" - }, - { - "Id": "D01Z05S09[SE]", - "Direction": 2, - "OriginalDoor": "D01Z05S10[W]" - }, - { - "Id": "D01Z05S10[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S09[SE]" - }, - { - "Id": "D01Z05S10[NE]", - "Direction": 2, - "OriginalDoor": "D01Z05S11[W]" - }, - { - "Id": "D01Z05S10[SE]", - "Direction": 2, - "OriginalDoor": "D01Z05S12[W]" - }, - { - "Id": "D01Z05S10[S]", - "Direction": 3, - "OriginalDoor": "D01Z05S14[N]" - }, - { - "Id": "D01Z05S11[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S10[NE]" - }, - { - "Id": "D01Z05S11[Cherubs]", - "Direction": 5, - "Type": 1 - }, - { - "Id": "D01Z05S12[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S10[SE]" - }, - { - "Id": "D01Z05S12[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S09[W]", - "Type": 1 - }, - { - "Id": "D01Z05S13[SW]", - "Direction": 3, - "OriginalDoor": "D01Z05S16[N]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D01Z05S13[E]" ], - "Logic": "D01Z05S13[SW] || canSurvivePoison3 && canWaterJump" - }, - { - "Id": "D01Z05S13[N]", - "Direction": 0, - "OriginalDoor": "D01Z05S03[S]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D01Z05S13[E]" ], - "Logic": "D01Z05S13[N] || canSurvivePoison3 && canWaterJump" - }, - { - "Id": "D01Z05S13[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S14[W]", - "VisibilityFlags": 1 - }, - { - "Id": "D01Z05S14[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S13[E]" - }, - { - "Id": "D01Z05S14[N]", - "Direction": 0, - "OriginalDoor": "D01Z05S10[S]" - }, - { - "Id": "D01Z05S14[SE]", - "Direction": 2, - "OriginalDoor": "D01Z05S15[W]" - }, - { - "Id": "D01Z05S15[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S14[SE]" - }, - { - "Id": "D01Z05S15[SW]", - "Direction": 1, - "OriginalDoor": "D01Z05S22[E]" - }, - { - "Id": "D01Z05S15[SE]", - "Direction": 2, - "OriginalDoor": "D01Z05S19[W]" - }, - { - "Id": "D01Z05S16[N]", - "Direction": 0, - "OriginalDoor": "D01Z05S13[SW]" - }, - { - "Id": "D01Z05S16[SW]", - "Direction": 1, - "OriginalDoor": "D01Z05S21[E]" - }, - { - "Id": "D01Z05S16[SE]", - "Direction": 2, - "OriginalDoor": "D01Z05S17[W]" - }, - { - "Id": "D01Z05S17[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S16[SE]" - }, - { - "Id": "D01Z05S17[E]", - "Direction": 2, - "OriginalDoor": "D01BZ09S01[W]", - "Logic": "dash && (D01Z05S17[E] || canWaterJump || canCrossGap5)" - }, - { - "Id": "D01Z05S18[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S05[SW]" - }, - { - "Id": "D01Z05S19[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S15[SE]" - }, - { - "Id": "D01Z05S19[E]", - "Direction": 2, - "OriginalDoor": "D01Z04S19[W]", - "Type": 1 - }, - { - "Id": "D01Z05S20[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S25[NE]" - }, - { - "Id": "D01Z05S20[N]", - "Direction": 0, - "OriginalDoor": "D01Z05S02[S]" - }, - { - "Id": "D01Z05S21[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S25[E]" - }, - { - "Id": "D01Z05S21[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S16[SW]" - }, - { - "Id": "D01Z05S21[Reward]", - "Direction": 4, - "OriginalDoor": "D01BZ05S01[Reward]", - "Logic": "shroud" - }, - { - "Id": "D01Z05S22[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S15[SW]" - }, - { - "Id": "D01Z05S23[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S24[E]", - "Logic": "chalice && chaliceRooms >= 3" - }, - { - "Id": "D01Z05S23[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S25[W]" - }, - { - "Id": "D01Z05S24[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S04[E]", - "Type": 1 - }, - { - "Id": "D01Z05S24[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S23[W]" - }, - { - "Id": "D01Z05S25[NE]", - "Direction": 2, - "OriginalDoor": "D01Z05S20[W]", - "Logic": "D01Z05S25[SW] || D01Z05S25[SE] || D01Z05S25[NE] || linen" - }, - { - "Id": "D01Z05S25[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S23[E]", - "Logic": "D01Z05S25[W] || (linen && (canWalkOnRoot || doubleJump || canAirStall)) || (D01Z05S25[E] && (canWalkOnRoot || canCrossGap3))" - }, - { - "Id": "D01Z05S25[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S21[W]", - "VisibiliyFlags": 5, - "Logic": "D01Z05S25[E] || canBreakTirana && (linen || D01Z05S25[W] && (canWalkOnRoot || canCrossGap3))" - }, - { - "Id": "D01Z05S25[SW]", - "Direction": 1, - "OriginalDoor": "D03Z03S17[E]", - "Type": 1, - "Logic": "D01Z05S25[SW] || D01Z05S25[SE] || D01Z05S25[NE] || linen" - }, - { - "Id": "D01Z05S25[SE]", - "Direction": 2, - "OriginalDoor": "D01Z05S26[W]", - "Logic": "D01Z05S25[SW] || D01Z05S25[SE] || D01Z05S25[NE] || linen" - }, - { - "Id": "D01Z05S25[EchoesW]", - "Direction": 1, - "OriginalDoor": "D20Z01S09[E]", - "Type": 1, - "VisibilityFlags": 11, - "RequiredDoors": [ "D01Z05S25[EchoesE]" ], - "Logic": "D01Z05S25[EchoesW] || (D01Z05S25[EchoesE] && (blood || canCrossGap8)) || (linen && doubleJump)" - }, - { - "Id": "D01Z05S25[EchoesE]", - "Direction": 2, - "OriginalDoor": "D20Z01S10[W]", - "Type": 1, - "VisibilityFlags": 11, - "RequiredDoors": [ "D01Z05S25[EchoesW]" ], - "Logic": "D01Z05S25[EchoesE] || (D01Z05S25[EchoesW] && (blood || canCrossGap8)) || (linen && doubleJump)" - }, - { - "Id": "D01Z05S26[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S25[SE]" - }, - { - "Id": "D01Z05S27[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S01[W]" - }, - { - "Id": "D01BZ05S01[Reward]", - "Direction": 7, - "OriginalDoor": "D01Z05S21[Reward]" - }, - { - "Id": "D01BZ09S01[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S17[E]" - }, - - { - "Id": "D01Z06S01[N]", - "Direction": 1, - "OriginalDoor": "D01Z01S01[S]", - "Type": 1 - }, - { - "Id": "D01Z06S01[Santos]", - "Direction": 4, - "OriginalDoor": "D01BZ07S01[Santos]", - "Logic": "bell" - }, - { - "Id": "D01BZ07S01[Santos]", - "Direction": 7, - "OriginalDoor": "D01Z06S01[Santos]" - }, - - { - "Id": "D02Z01S01[SW]", - "Direction": 1, - "OriginalDoor": "D02Z01S06[E]", - "Logic": "openedWOTWCave && (D02Z01S01[W] || D02Z01S01[CherubsL] || D02Z01S01[SW] || D02Z01S01[CherubsR] || doubleJump || wallClimb)" - }, - { - "Id": "D02Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D02Z01S02[E]", - "Logic": "D02Z01S01[W] || D02Z01S01[CherubsL] || wallClimb || doubleJump || ((D02Z01S01[SW] || D02Z01S01[CherubsR]) && canDawnJump)" - }, - { - "Id": "D02Z01S01[SE]", - "Direction": 2, - "OriginalDoor": "D01Z03S04[NW]", - "Type": 1 - }, - { - "Id": "D02Z01S01[CherubsL]", - "Direction": 5 - }, - { - "Id": "D02Z01S01[CherubsR]", - "Direction": 5 - }, - { - "Id": "D02Z01S02[W]", - "Direction": 1, - "OriginalDoor": "D02Z01S04[E]" - }, - { - "Id": "D02Z01S02[NW]", - "Direction": 1, - "OriginalDoor": "D02Z01S03[SE]", - "Logic": "D02Z01S02[NW] || wallClimb || doubleJump || (D02Z01S02[NE] && canWalkOnRoot && canCrossGap5)" - }, - { - "Id": "D02Z01S02[E]", - "Direction": 2, - "OriginalDoor": "D02Z01S01[W]" - }, - { - "Id": "D02Z01S02[NE]", - "Direction": 2, - "OriginalDoor": "D02Z01S09[W]", - "Logic": "D02Z01S02[NE] || (doubleJump && canEnemyBounce) || (D02Z01S02[NW] || wallClimb || doubleJump) && (canWalkOnRoot || canCrossGap10)" - }, - { - "Id": "D02Z01S02[]", - "Direction": 6, - "OriginalDoor": "D02Z01S06[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D02Z01S03[SW]", - "Direction": 1, - "OriginalDoor": "D02Z01S05[E]" - }, - { - "Id": "D02Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S01[E]", - "Type": 1, - "Logic": "D02Z01S03[W] || D02Z01S03[SE] || D02Z01S03[Cherubs] || wallClimb" - }, - { - "Id": "D02Z01S03[SE]", - "Direction": 2, - "OriginalDoor": "D02Z01S02[NW]", - "Logic": "D02Z01S03[W] || D02Z01S03[SE] || D02Z01S03[Cherubs] || wallClimb" - }, - { - "Id": "D02Z01S03[Cherubs]", - "Direction": 5 - }, - { - "Id": "D02Z01S04[E]", - "Direction": 2, - "OriginalDoor": "D02Z01S02[W]" - }, - { - "Id": "D02Z01S04[-N]", - "Direction": 6, - "OriginalDoor": "D02Z01S08[N]", - "Logic": "fullThimble && (D02Z01S01[W] || D02Z01S01[CherubsL] || wallClimb || doubleJump || ((D02Z01S01[SW] || D02Z01S01[CherubsR]) && canDawnJump))" - }, - { - "Id": "D02Z01S05[E]", - "Direction": 2, - "OriginalDoor": "D02Z01S03[SW]" - }, - { - "Id": "D02Z01S06[W]", - "Direction": 1, - "OriginalDoor": "D02Z01S08[E]", - "Logic": "D02Z01S06[W] || dash || wallClimb && doubleJump" - }, - { - "Id": "D02Z01S06[E]", - "Direction": 2, - "OriginalDoor": "D02Z01S01[SW]", - "Logic": "D02Z01S06[E] || wallClimb" - }, - { - "Id": "D02Z01S06[Cherubs]", - "Direction": 5 - }, - { - "Id": "D02Z01S08[E]", - "Direction": 2, - "OriginalDoor": "D02Z01S06[W]" - }, - { - "Id": "D02Z01S08[N]", - "Direction": 5 - }, - { - "Id": "D02Z01S09[W]", - "Direction": 1, - "OriginalDoor": "D02Z01S02[NE]" - }, - { - "Id": "D02Z01S09[-CherubsL]", - "Direction": 6, - "OriginalDoor": "D02Z01S01[CherubsL]", - "Logic": "linen" - }, - { - "Id": "D02Z01S09[-CherubsR]", - "Direction": 6, - "OriginalDoor": "D02Z01S01[CherubsR]", - "Logic": "linen && (canWalkOnRoot || canCrossGap2 || canEnemyBounce && canAirStall)" - }, - - { - "Id": "D02Z02S01[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S08[E]", - "Logic": "D02Z02S01[W] || D02Z02S01[NW] || D02Z02S01[Cherubs] || dash" - }, - { - "Id": "D02Z02S01[NW]", - "Direction": 1, - "OriginalDoor": "D02Z02S02[SE]", - "Logic": "D02Z02S01[NW] || D02Z02S01[Cherubs] || wallClimb && (D02Z02S01[W] || dash)" - }, - { - "Id": "D02Z02S01[E]", - "Direction": 2, - "OriginalDoor": "D02Z01S03[W]", - "Type": 1, - "Logic": "D02Z02S01[E] || D02Z02S01[NW] || D02Z02S01[Cherubs] || wallClimb || dash" - }, - { - "Id": "D02Z02S01[Cherubs]", - "Direction": 5 - }, - { - "Id": "D02Z02S02[SE]", - "Direction": 2, - "OriginalDoor": "D02Z02S01[NW]" - }, - { - "Id": "D02Z02S02[NW]", - "Direction": 1, - "OriginalDoor": "D02Z02S04[SE]", - "Logic": "D02Z02S02[NW] || D02Z02S02[NE] || D02Z02S02[CherubsL] || D02Z02S02[CherubsR] || wallClimb" - }, - { - "Id": "D02Z02S02[NE]", - "Direction": 2, - "OriginalDoor": "D02Z02S03[SW]", - "Logic": "D02Z02S02[NW] || D02Z02S02[NE] || D02Z02S02[CherubsL] || D02Z02S02[CherubsR] || wallClimb" - }, - { - "Id": "D02Z02S02[-CherubsR]", - "Direction": 6, - "OriginalDoor": "D02Z02S08[CherubsR]", - "Logic": "linen" - }, - { - "Id": "D02Z02S02[CherubsL]", - "Direction": 5 - }, - { - "Id": "D02Z02S02[CherubsR]", - "Direction": 5 - }, - { - "Id": "D02Z02S03[SW]", - "Direction": 1, - "OriginalDoor": "D02Z02S02[NE]" - }, - { - "Id": "D02Z02S03[NW]", - "Direction": 1, - "OriginalDoor": "D02Z02S05[SE]", - "Logic": "D02Z02S03[NW] || doubleJump || wallClimb || D02Z02S03[NE] && canWalkOnRoot" - }, - { - "Id": "D02Z02S03[NE]", - "Direction": 2, - "OriginalDoor": "D02Z02S14[W]", - "Logic": "D02Z02S03[NE] || wallClimb && (canCrossGap11 || (blood && (canWalkOnRoot || canCrossGap7)) || (canWalkOnRoot && (doubleJump || canAirStall)))" - }, - { - "Id": "D02Z02S03[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D02Z02S01[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D02Z02S04[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S09[E]", - "Logic": "D02Z02S04[NE] || D02Z02S04[W] || D02Z02S04[E] && dash || D02Z02S04[SE] && (wallClimb || doubleJump && canEnemyUpslash)" - }, - { - "Id": "D02Z02S04[SE]", - "Direction": 2, - "OriginalDoor": "D02Z02S02[NW]", - "Logic": "D02Z02S04[NE] || D02Z02S04[W] || D02Z02S04[SE] || dash" - }, - { - "Id": "D02Z02S04[E]", - "Direction": 2, - "OriginalDoor": "D02Z02S05[SW]", - "VisibilityFlags": 1 - }, - { - "Id": "D02Z02S04[NE]", - "Direction": 2, - "OriginalDoor": "D02Z02S05[W]", - "Logic": "D02Z02S04[NE] || ((D02Z02S04[W] || D02Z02S04[E] && dash) && (doubleJump || wallClimb)) || (D02Z02S04[SE] && (wallClimb || doubleJump && canEnemyUpslash))" - }, - { - "Id": "D02Z02S04[-CherubsL]", - "Direction": 6, - "OriginalDoor": "D02Z02S08[CherubsL]", - "Logic": "linen && (D02Z02S04[NE] || D02Z02S04[W] || D02Z02S04[SE] || dash)" - }, - { - "Id": "D02Z02S05[SW]", - "Direction": 1, - "OriginalDoor": "D02Z02S04[E]" - }, - { - "Id": "D02Z02S05[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S04[NE]", - "VisibilityFlags": 65, - "Logic": "D02Z02S05[W] || doubleJump && canEnemyBounce" - }, - { - "Id": "D02Z02S05[SE]", - "Direction": 2, - "OriginalDoor": "D02Z02S03[NW]" - }, - { - "Id": "D02Z02S05[E]", - "Direction": 2, - "OriginalDoor": "D02Z02S10[W]", - "Logic": "D02Z02S05[NW] || D02Z02S05[E] || wallClimb" - }, - { - "Id": "D02Z02S05[NW]", - "Direction": 1, - "OriginalDoor": "D02Z02S07[E]", - "Logic": "D02Z02S05[NW] || wallClimb" - }, - { - "Id": "D02Z02S05[-CherubsL]", - "Direction": 6, - "OriginalDoor": "D02Z02S02[CherubsL]", - "Logic": "linen" - }, - { - "Id": "D02Z02S05[-CherubsR]", - "Direction": 6, - "OriginalDoor": "D02Z02S02[CherubsR]", - "Logic": "linen" - }, - { - "Id": "D02Z02S06[E]", - "Direction": 2, - "OriginalDoor": "D02Z02S11[W]" - }, - { - "Id": "D02Z02S07[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S01[E]", - "Type": 1 - }, - { - "Id": "D02Z02S07[E]", - "Direction": 2, - "OriginalDoor": "D02Z02S05[NW]" - }, - { - "Id": "D02Z02S07[Cherubs]", - "Direction": 5 - }, - { - "Id": "D02Z02S08[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S11[SE]" - }, - { - "Id": "D02Z02S08[E]", - "Direction": 2, - "OriginalDoor": "D02Z02S01[W]" - }, - { - "Id": "D02Z02S08[C]", - "Direction": 4, - "OriginalDoor": "D02BZ02S01[C]" - }, - { - "Id": "D02Z02S08[CherubsL]", - "Direction": 5 - }, - { - "Id": "D02Z02S08[CherubsR]", - "Direction": 5 - }, - { - "Id": "D02Z02S09[E]", - "Direction": 2, - "OriginalDoor": "D02Z02S04[W]" - }, - { - "Id": "D02Z02S10[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S05[E]" - }, - { - "Id": "D02Z02S11[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S06[E]" - }, - { - "Id": "D02Z02S11[SE]", - "Direction": 2, - "OriginalDoor": "D02Z02S08[W]" - }, - { - "Id": "D02Z02S11[E]", - "Direction": 2, - "OriginalDoor": "D02Z02S12[W]", - "Logic": "D02Z02S11[E] || D02Z02S11[NW] || D02Z02S11[NE] || canCrossGap6" - }, - { - "Id": "D02Z02S11[NW]", - "Direction": 1, - "OriginalDoor": "D02Z03S14[E]", - "Type": 1, - "VisibilityFlags": 3, - "RequiredDoors": [ "D02Z02S11[NE]" ] - }, - { - "Id": "D02Z02S11[NE]", - "Direction": 2, - "OriginalDoor": "D02Z02S13[W]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D02Z02S11[NW]" ] - }, - { - "Id": "D02Z02S11[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D01Z02S03[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D02Z02S12[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S11[E]" - }, - { - "Id": "D02Z02S13[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S11[NE]" - }, - { - "Id": "D02Z02S14[W]", - "Direction": 1, - "OriginalDoor": "D02Z02S03[NE]" - }, - { - "Id": "D02Z02S14[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D02Z01S03[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D02BZ02S01[C]", - "Direction": 7, - "OriginalDoor": "D02Z02S08[C]" - }, - - { - "Id": "D02Z03S01[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S08[E]" - }, - { - "Id": "D02Z03S01[E]", - "Direction": 2, - "OriginalDoor": "D02Z02S07[W]", - "Type": 1 - }, - { - "Id": "D02Z03S02[S]", - "Direction": 3, - "OriginalDoor": "D02Z03S16[N]" - }, - { - "Id": "D02Z03S02[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S03[E]", - "Logic": "D02Z03S02[NW] || D02Z03S02[NE] || D02Z03S02[N] || D02Z03S02[W] || doubleJump || wallClimb" - }, - { - "Id": "D02Z03S02[NW]", - "Direction": 1, - "OriginalDoor": "D02Z03S21[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D02Z03S02[NE]", "D02Z03S02[N]" ] - }, - { - "Id": "D02Z03S02[NE]", - "Direction": 2, - "OriginalDoor": "D02Z03S13[W]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D02Z03S02[NW]", "D02Z03S02[N]" ] - }, - { - "Id": "D02Z03S02[N]", - "Direction": 0, - "OriginalDoor": "D02Z03S11[S]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D02Z03S02[NW]", "D02Z03S02[NE]" ], - "Logic": "openedConventLadder" - }, - { - "Id": "D02Z03S03[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S05[E]" - }, - { - "Id": "D02Z03S03[NW]", - "Direction": 1, - "OriginalDoor": "D02Z03S05[NE]", - "Logic": "D02Z03S03[NW] || blood || canCrossGap3" - }, - { - "Id": "D02Z03S03[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S02[W]" - }, - { - "Id": "D02Z03S05[S]", - "Direction": 3, - "OriginalDoor": "D02Z03S07[N]", - "Logic": "D02Z03S05[S] || D02Z03S05[NE] || wallClimb" - }, - { - "Id": "D02Z03S05[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S03[W]" - }, - { - "Id": "D02Z03S05[NE]", - "Direction": 2, - "OriginalDoor": "D02Z03S03[NW]", - "Logic": "D02Z03S05[S] || D02Z03S05[NE] || wallClimb || doubleJump" - }, - { - "Id": "D02Z03S06[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S18[SE]" - }, - { - "Id": "D02Z03S06[S]", - "Direction": 3, - "OriginalDoor": "D02Z03S07[NW]" - }, - { - "Id": "D02Z03S07[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S17[E]" - }, - { - "Id": "D02Z03S07[NWW]", - "Direction": 1, - "OriginalDoor": "D02Z03S24[E]" - }, - { - "Id": "D02Z03S07[NW]", - "Direction": 0, - "OriginalDoor": "D02Z03S06[S]" - }, - { - "Id": "D02Z03S07[N]", - "Direction": 0, - "OriginalDoor": "D02Z03S05[S]" - }, - { - "Id": "D02Z03S07[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S08[W]" - }, - { - "Id": "D02Z03S08[SW]", - "Direction": 1, - "OriginalDoor": "D02Z03S12[E]" - }, - { - "Id": "D02Z03S08[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S07[E]", - "VisibilityFlags": 1 - }, - { - "Id": "D02Z03S08[SE]", - "Direction": 2, - "OriginalDoor": "D02Z03S14[W]" - }, - { - "Id": "D02Z03S08[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S01[W]" - }, - { - "Id": "D02Z03S08[NE]", - "Direction": 2, - "OriginalDoor": "D02Z03S16[W]" - }, - { - "Id": "D02Z03S09[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S18[NE]" - }, - { - "Id": "D02Z03S09[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S20[W]" - }, - { - "Id": "D02Z03S10[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S11[E]" - }, - { - "Id": "D02Z03S10[-W]", - "Direction": 2, - "OriginalDoor": "D09Z01S06[-E]", - "Type": 1 - }, - { - "Id": "D02Z03S10[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D02Z02S07[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D02Z03S11[S]", - "Direction": 3, - "OriginalDoor": "D02Z03S02[N]" - }, - { - "Id": "D02Z03S11[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S15[E]" - }, - { - "Id": "D02Z03S11[NW]", - "Direction": 1, - "OriginalDoor": "D02Z03S19[E]" - }, - { - "Id": "D02Z03S11[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S10[W]" - }, - { - "Id": "D02Z03S11[NE]", - "Direction": 2, - "OriginalDoor": "D02Z03S22[W]" - }, - { - "Id": "D02Z03S12[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S08[SW]" - }, - { - "Id": "D02Z03S13[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S02[NE]" - }, - { - "Id": "D02Z03S14[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S08[SE]" - }, - { - "Id": "D02Z03S14[E]", - "Direction": 2, - "OriginalDoor": "D02Z02S11[NW]", - "Type": 1 - }, - { - "Id": "D02Z03S15[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S11[W]" - }, - { - "Id": "D02Z03S16[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S08[NE]" - }, - { - "Id": "D02Z03S16[N]", - "Direction": 0, - "OriginalDoor": "D02Z03S02[S]" - }, - { - "Id": "D02Z03S17[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S07[W]" - }, - { - "Id": "D02Z03S18[NW]", - "Direction": 1, - "OriginalDoor": "D02Z03S23[E]", - "Logic": "D02Z03S18[NW] || D02Z03S18[NE] || wallClimb" - }, - { - "Id": "D02Z03S18[SE]", - "Direction": 2, - "OriginalDoor": "D02Z03S06[W]" - }, - { - "Id": "D02Z03S18[NE]", - "Direction": 2, - "OriginalDoor": "D02Z03S09[W]", - "Logic": "D02Z03S18[NW] || D02Z03S18[NE] || wallClimb" - }, - { - "Id": "D02Z03S19[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S11[NW]" - }, - { - "Id": "D02Z03S20[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S09[E]", - "Logic": "D02Z03S20[W] || canBeatConventBoss" - }, - { - "Id": "D02Z03S20[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S21[W]", - "Logic": "D02Z03S20[E] || canBeatConventBoss" - }, - { - "Id": "D02Z03S21[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S20[E]" - }, - { - "Id": "D02Z03S21[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S02[NW]" - }, - { - "Id": "D02Z03S22[W]", - "Direction": 1, - "OriginalDoor": "D02Z03S11[NE]" - }, - { - "Id": "D02Z03S23[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S18[NW]" - }, - { - "Id": "D02Z03S24[E]", - "Direction": 2, - "OriginalDoor": "D02Z03S07[NWW]" - }, - - { - "Id": "D03Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D03Z01S02[E]" - }, - { - "Id": "D03Z01S01[NE]", - "Direction": 2, - "OriginalDoor": "D01Z05S02[W]", - "Type": 1 - }, - { - "Id": "D03Z01S01[S]", - "Direction": 3, - "OriginalDoor": "D20Z01S03[N]", - "Type": 1, - "VisibilityFlags": 1 - }, - { - "Id": "D03Z01S01[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D20Z01S01[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D03Z01S02[W]", - "Direction": 1, - "OriginalDoor": "D03Z01S06[E]", - "Logic": "D03Z01S02[W] || wallClimb || canCrossGap3" - }, - { - "Id": "D03Z01S02[E]", - "Direction": 2, - "OriginalDoor": "D03Z01S01[W]", - "Logic": "D03Z01S02[E] || wallClimb || canCrossGap7" - }, - { - "Id": "D03Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D03Z01S04[E]", - "Logic": "D03Z01S03[W] || wallClimb && (D03Z01S03[SW] || canCrossGap9)" - }, - { - "Id": "D03Z01S03[E]", - "Direction": 2, - "OriginalDoor": "D03Z01S06[W]", - "Logic": "D03Z01S03[E] || wallClimb" - }, - { - "Id": "D03Z01S03[SW]", - "Direction": 3, - "OriginalDoor": "D03Z02S10[N]", - "Type": 1, - "Logic": "D03Z01S03[W] || D03Z01S03[SW] || canCrossGap9" - }, - { - "Id": "D03Z01S03[SE]", - "Direction": 3, - "OriginalDoor": "D03Z02S01[N]", - "Type": 1 - }, - { - "Id": "D03Z01S03[-WestL]", - "Direction": 6, - "OriginalDoor": "D03Z02S10[Cherubs]", - "Type": 1, - "Logic": "linen && (D03Z01S03[W] || D03Z01S03[SW] || canCrossGap9)" - }, - { - "Id": "D03Z01S03[-WestR]", - "Direction": 6, - "OriginalDoor": "D03Z02S02[CherubsL]", - "Type": 1, - "Logic": "linen && (D03Z01S03[W] || D03Z01S03[SW] || canCrossGap9)" - }, - { - "Id": "D03Z01S03[-EastL]", - "Direction": 6, - "OriginalDoor": "D03Z02S02[CherubsR]", - "Type": 1, - "Logic": "linen && (D03Z01S03[W] || D03Z01S03[SW] || canCrossGap5)" - }, - { - "Id": "D03Z01S03[-EastR]", - "Direction": 6, - "OriginalDoor": "D03Z02S01[Cherubs]", - "Type": 1, - "Logic": "linen" - }, - { - "Id": "D03Z01S04[NW]", - "Direction": 1, - "OriginalDoor": "D03Z01S05[E]" - }, - { - "Id": "D03Z01S04[E]", - "Direction": 2, - "OriginalDoor": "D03Z01S03[W]" - }, - { - "Id": "D03Z01S05[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S07[SE]", - "Type": 1 - }, - { - "Id": "D03Z01S05[E]", - "Direction": 2, - "OriginalDoor": "D03Z01S04[NW]" - }, - { - "Id": "D03Z01S06[W]", - "Direction": 1, - "OriginalDoor": "D03Z01S03[E]", - "Logic": "D03Z01S06[W] || canBeatPerpetua" - }, - { - "Id": "D03Z01S06[E]", - "Direction": 2, - "OriginalDoor": "D03Z01S02[W]", - "Logic": "D03Z01S06[E] || canBeatPerpetua" - }, - - { - "Id": "D03Z02S01[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S02[E]", - "Logic": "D03Z02S01[W] || wallClimb || doubleJump && canEnemyBounce" - }, - { - "Id": "D03Z02S01[N]", - "Direction": 0, - "OriginalDoor": "D03Z01S03[SE]", - "Type": 1, - "Logic": "D03Z02S01[N] || wallClimb || doubleJump" - }, - { - "Id": "D03Z02S01[Cherubs]", - "Direction": 5, - "Type": 1 - }, - { - "Id": "D03Z02S02[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S10[E]", - "Logic": "D03Z02S02[W] || D03Z02S02[CherubsL] || doubleJump && (D03Z02S02[E] || D03Z02S02[CherubsR] || wallClimb || canEnemyBounce)" - }, - { - "Id": "D03Z02S02[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S01[W]", - "Logic": "D03Z02S02[E] || wallClimb || doubleJump && canEnemyBounce" - }, - { - "Id": "D03Z02S02[S]", - "Direction": 3, - "OriginalDoor": "D03Z02S03[N]" - }, - { - "Id": "D03Z02S02[CherubsL]", - "Direction": 5, - "Type": 1 - }, - { - "Id": "D03Z02S02[CherubsR]", - "Direction": 5, - "Type": 1 - }, - { - "Id": "D03Z02S03[W]", - "Direction": 3, - "OriginalDoor": "D03Z02S07[N]", - "Logic": "D03Z02S03[W] || dash && (D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])" - }, - { - "Id": "D03Z02S03[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S05[W]", - "Logic": "D03Z02S03[E] || (canAirStall || doubleJump || boots) && (D03Z02S03[E] && dash || D03Z02S03[N] || D03Z02S03[SE2])" - }, - { - "Id": "D03Z02S03[N]", - "Direction": 0, - "OriginalDoor": "D03Z02S02[S]", - "Logic": "D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2]" - }, - { - "Id": "D03Z02S03[SE2]", - "Direction": 3, - "OriginalDoor": "D03Z02S04[NW]", - "Logic": "D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2]" - }, - { - "Id": "D03Z02S03[SW]", - "Direction": 1, - "OriginalDoor": "D03Z02S07[E]", - "Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])" - }, - { - "Id": "D03Z02S03[SE]", - "Direction": 2, - "OriginalDoor": "D03Z02S06[W]", - "Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])" - }, - { - "Id": "D03Z02S03[SSL]", - "Direction": 3, - "OriginalDoor": "D03Z03S01[NL]", - "Type": 1, - "Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])" - }, - { - "Id": "D03Z02S03[SSC]", - "Direction": 6, - "OriginalDoor": "D03Z03S01[NC]", - "Type": 1, - "Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])" - }, - { - "Id": "D03Z02S03[SSR]", - "Direction": 3, - "OriginalDoor": "D03Z03S01[NR]", - "Type": 1, - "Logic": "D03Z02S03[SW] || D03Z02S03[SE] || D03Z02S03[SSL] || D03Z02S03[SSR] || brokeJondoBellW && brokeJondoBellE && (D03Z02S03[W] && dash || D03Z02S03[E] || D03Z02S03[N] || D03Z02S03[SE2])" - }, - { - "Id": "D03Z02S04[NW]", - "Direction": 0, - "OriginalDoor": "D03Z02S03[SE2]", - "Logic": "D03Z02S04[NW] || wallClimb || doubleJump" - }, - { - "Id": "D03Z02S04[NE]", - "Direction": 0, - "OriginalDoor": "D03Z02S05[S]", - "Logic": "D03Z02S04[NE] || wallClimb || (D03Z02S04[S] && doubleJump)" - }, - { - "Id": "D03Z02S04[S]", - "Direction": 3, - "OriginalDoor": "D03Z02S06[N]", - "Logic": "D03Z02S04[NE] || D03Z02S04[S] || wallClimb" - }, - { - "Id": "D03Z02S05[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S03[E]" - }, - { - "Id": "D03Z02S05[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S11[W]", - "Logic": "D03Z02S05[E] || D03Z02S05[S] || canCrossGap5 || (canEnemyBounce && canCrossGap3)" - }, - { - "Id": "D03Z02S05[S]", - "Direction": 3, - "OriginalDoor": "D03Z02S04[NE]", - "Logic": "D03Z02S05[E] || D03Z02S05[S] || canCrossGap5 || (canEnemyBounce && canCrossGap3)" - }, - { - "Id": "D03Z02S06[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S03[SE]", - "VisibilityFlags": 1 - }, - { - "Id": "D03Z02S06[N]", - "Direction": 0, - "OriginalDoor": "D03Z02S04[S]" - }, - { - "Id": "D03Z02S07[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S08[E]" - }, - { - "Id": "D03Z02S07[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S03[SW]", - "VisibilityFlags": 1 - }, - { - "Id": "D03Z02S07[N]", - "Direction": 0, - "OriginalDoor": "D03Z02S03[W]" - }, - { - "Id": "D03Z02S08[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S14[E]", - "Logic": "D03Z02S08[N] || D03Z02S08[W] || wallClimb || doubleJump" - }, - { - "Id": "D03Z02S08[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S07[W]" - }, - { - "Id": "D03Z02S08[N]", - "Direction": 0, - "OriginalDoor": "D03Z02S09[S]", - "Logic": "D03Z02S08[N] || D03Z02S08[W] || wallClimb || doubleJump" - }, - { - "Id": "D03Z02S09[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S12[E]", - "Logic": "D03Z02S09[W] || dash" - }, - { - "Id": "D03Z02S09[N]", - "Direction": 0, - "OriginalDoor": "D03Z02S10[S]", - "Logic": "D03Z02S09[N] || D03Z02S09[S] || D03Z02S09[Cherubs] || dash" - }, - { - "Id": "D03Z02S09[S]", - "Direction": 3, - "OriginalDoor": "D03Z02S08[N]", - "Logic": "D03Z02S09[N] || D03Z02S09[S] || D03Z02S09[Cherubs] || dash" - }, - { - "Id": "D03Z02S09[Cherubs]", - "Direction": 5 - }, - { - "Id": "D03Z02S10[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S13[E]" - }, - { - "Id": "D03Z02S10[N]", - "Direction": 0, - "OriginalDoor": "D03Z01S03[SW]", - "Type": 1 - }, - { - "Id": "D03Z02S10[S]", - "Direction": 3, - "OriginalDoor": "D03Z02S09[N]" - }, - { - "Id": "D03Z02S10[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S02[W]" - }, - { - "Id": "D03Z02S10[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D03Z02S09[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D03Z02S10[Cherubs]", - "Direction": 5, - "Type": 1 - }, - { - "Id": "D03Z02S11[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S05[E]", - "Logic": "D03Z02S11[W] || dash && (doubleJump || wallClimb || canCrossGap2)" - }, - { - "Id": "D03Z02S11[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S15[W]", - "Logic": "D03Z02S11[E] || dash && (wallClimb || doubleJump)" - }, - { - "Id": "D03Z02S12[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S09[W]" - }, - { - "Id": "D03Z02S12[Cherubs]", - "Direction": 5 - }, - { - "Id": "D03Z02S13[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S10[W]" - }, - { - "Id": "D03Z02S13[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D03Z02S12[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D03Z02S14[E]", - "Direction": 2, - "OriginalDoor": "D03Z02S08[W]" - }, - { - "Id": "D03Z02S15[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S11[E]" - }, - { - "Id": "D03Z02S15[E]", - "Direction": 2, - "OriginalDoor": "D20Z01S01[W]", - "Type": 1 - }, - - { - "Id": "D03Z03S01[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S18[E]" - }, - { - "Id": "D03Z03S01[S]", - "Direction": 2, - "OriginalDoor": "D03Z03S12[W]" - }, - { - "Id": "D03Z03S01[NL]", - "Direction": 0, - "OriginalDoor": "D03Z02S03[SSL]", - "Type": 1, - "Logic": "D03Z03S01[NL] || D03Z03S01[NR] || D03Z03S01[NC] || wallClimb || doubleJump" - }, - { - "Id": "D03Z03S01[NC]", - "Direction": 5, - "Type": 1 - }, - { - "Id": "D03Z03S01[NR]", - "Direction": 0, - "OriginalDoor": "D03Z02S03[SSR]", - "Type": 1, - "Logic": "D03Z03S01[NL] || D03Z03S01[NR] || D03Z03S01[NC] || wallClimb || doubleJump" - }, - { - "Id": "D03Z03S02[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S12[E]", - "Logic": "D03Z03S02[NE] || D03Z03S02[W] || wallClimb || doubleJump" - }, - { - "Id": "D03Z03S02[NE]", - "Direction": 2, - "OriginalDoor": "D03Z03S14[W]", - "Logic": "D03Z03S02[NE] || wallClimb || doubleJump" - }, - { - "Id": "D03Z03S02[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S03[W]" - }, - { - "Id": "D03Z03S03[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S02[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D03Z03S03[NE]" ] - }, - { - "Id": "D03Z03S03[NE]", - "Direction": 2, - "OriginalDoor": "D03Z03S04[NW]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D03Z03S03[W]" ] - }, - { - "Id": "D03Z03S03[SE]", - "Direction": 2, - "OriginalDoor": "D03Z03S04[SW]", - "VisibilityFlags": 1 - }, - { - "Id": "D03Z03S04[NW]", - "Direction": 1, - "OriginalDoor": "D03Z03S03[NE]", - "Logic": "D03Z03S04[NW] || D03Z03S04[NE] || (wallClimb || doubleJump) && (D03Z03S04[E] || D03Z03S04[SW] || blood || canCrossGap10)" - }, - { - "Id": "D03Z03S04[NE]", - "Direction": 2, - "OriginalDoor": "D03Z03S05[NW]", - "Logic": "D03Z03S04[NE] || wallClimb && (D03Z03S04[NW] || D03Z03S04[E] || D03Z03S04[SW] || blood || canCrossGap10)" - }, - { - "Id": "D03Z03S04[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S05[SW]", - "Logic": "D03Z03S04[NW] || D03Z03S04[NE] || D03Z03S04[E] || (wallClimb || doubleJump) && (D03Z03S04[SW] || blood || canCrossGap10)" - }, - { - "Id": "D03Z03S04[SW]", - "Direction": 1, - "OriginalDoor": "D03Z03S03[SE]", - "Logic": "D03Z03S04[NW] || D03Z03S04[NE] || D03Z03S04[E] || D03Z03S04[SW] || blood || canCrossGap10" - }, - { - "Id": "D03Z03S04[SE]", - "Direction": 2, - "OriginalDoor": "D03Z03S13[W]", - "Logic": "D03Z03S04[SE] || blood" - }, - { - "Id": "D03Z03S04[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D03Z03S10[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D03Z03S05[NW]", - "Direction": 1, - "OriginalDoor": "D03Z03S04[NE]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D03Z03S05[NE]" ] - }, - { - "Id": "D03Z03S05[NE]", - "Direction": 2, - "OriginalDoor": "D03Z03S06[W]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D03Z03S05[NW]" ] - }, - { - "Id": "D03Z03S05[SW]", - "Direction": 1, - "OriginalDoor": "D03Z03S04[E]", - "Logic": "D03Z03S05[SW] || D03Z03S05[SE] || linen" - }, - { - "Id": "D03Z03S05[SE]", - "Direction": 2, - "OriginalDoor": "D03Z03S07[SW]", - "Logic": "D03Z03S05[SW] || D03Z03S05[SE] || linen" - }, - { - "Id": "D03Z03S06[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S05[NE]" - }, - { - "Id": "D03Z03S07[NW]", - "Direction": 1, - "OriginalDoor": "D03Z03S19[E]", - "Logic": "D03Z03S07[NW] || D03Z03S07[NE] || wallClimb || doubleJump" - }, - { - "Id": "D03Z03S07[NE]", - "Direction": 2, - "OriginalDoor": "D03Z03S08[W]", - "Logic": "D03Z03S07[NW] || D03Z03S07[NE] || wallClimb || doubleJump" - }, - { - "Id": "D03Z03S07[SW]", - "Direction": 1, - "OriginalDoor": "D03Z03S05[SE]" - }, - { - "Id": "D03Z03S07[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S11[W]" - }, - { - "Id": "D03Z03S07[S]", - "Direction": 3, - "OriginalDoor": "D03Z03S09[N]" - }, - { - "Id": "D03Z03S08[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S07[NE]" - }, - { - "Id": "D03Z03S08[-CherubsL]", - "Direction": 6, - "OriginalDoor": "D03Z03S11[CherubsL]", - "Logic": "linen" - }, - { - "Id": "D03Z03S08[-CherubsR]", - "Direction": 6, - "OriginalDoor": "D03Z03S11[CherubsR]", - "Logic": "linen" - }, - { - "Id": "D03Z03S09[SW]", - "Direction": 1, - "OriginalDoor": "D03Z03S10[E]" - }, - { - "Id": "D03Z03S09[N]", - "Direction": 0, - "OriginalDoor": "D03Z03S07[S]" - }, - { - "Id": "D03Z03S10[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S09[SW]" - }, - { - "Id": "D03Z03S10[Cherubs]", - "Direction": 5 - }, - { - "Id": "D03Z03S11[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S07[E]" - }, - { - "Id": "D03Z03S11[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S15[W]" - }, - { - "Id": "D03Z03S11[CherubsL]", - "Direction": 5 - }, - { - "Id": "D03Z03S11[CherubsR]", - "Direction": 5 - }, - { - "Id": "D03Z03S12[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S01[S]" - }, - { - "Id": "D03Z03S12[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S02[W]" - }, - { - "Id": "D03Z03S13[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S04[SE]" - }, - { - "Id": "D03Z03S14[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S02[NE]" - }, - { - "Id": "D03Z03S15[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S11[E]", - "Logic": "canBeatGrievanceBoss" - }, - { - "Id": "D03Z03S15[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S16[W]", - "Logic": "canBeatGrievanceBoss" - }, - { - "Id": "D03Z03S16[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S15[E]" - }, - { - "Id": "D03Z03S16[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S17[W]" - }, - { - "Id": "D03Z03S17[W]", - "Direction": 1, - "OriginalDoor": "D03Z03S16[E]" - }, - { - "Id": "D03Z03S17[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S25[SW]", - "Type": 1 - }, - { - "Id": "D03Z03S18[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S01[W]" - }, - { - "Id": "D03Z03S19[E]", - "Direction": 2, - "OriginalDoor": "D03Z03S07[NW]" - }, - - { - "Id": "D04Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D08Z02S01[E]", - "Type": 1 - }, - { - "Id": "D04Z01S01[E]", - "Direction": 2, - "OriginalDoor": "D04Z01S02[W]" - }, - { - "Id": "D04Z01S01[NE]", - "Direction": 2, - "OriginalDoor": "D04Z01S02[NW]", - "Logic": "D04Z01S01[NE] || D04Z01S01[N] || canCrossGap3" - }, - { - "Id": "D04Z01S01[N]", - "Direction": 0, - "OriginalDoor": "D04Z01S05[S]", - "Logic": "D04Z01S01[NE] || D04Z01S01[N] || canCrossGap3" - }, - { - "Id": "D04Z01S01[Cherubs]", - "Direction": 5 - }, - { - "Id": "D04Z01S02[W]", - "Direction": 1, - "OriginalDoor": "D04Z01S01[E]" - }, - { - "Id": "D04Z01S02[NW]", - "Direction": 1, - "OriginalDoor": "D04Z01S01[NE]" - }, - { - "Id": "D04Z01S02[E]", - "Direction": 2, - "OriginalDoor": "D04Z01S03[W]" - }, - { - "Id": "D04Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D04Z01S02[E]" - }, - { - "Id": "D04Z01S03[E]", - "Direction": 2, - "OriginalDoor": "D04Z01S04[W]" - }, - { - "Id": "D04Z01S03[S]", - "Direction": 3, - "OriginalDoor": "D05Z01S20[N]", - "Type": 1, - "VisibilityFlags": 1 - }, - { - "Id": "D04Z01S04[W]", - "Direction": 1, - "OriginalDoor": "D04Z01S03[E]" - }, - { - "Id": "D04Z01S04[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S01[W]", - "Type": 1 - }, - { - "Id": "D04Z01S04[Cherubs]", - "Direction": 5, - "Type": 1 - }, - { - "Id": "D04Z01S05[S]", - "Direction": 3, - "OriginalDoor": "D04Z01S01[N]" - }, - { - "Id": "D04Z01S05[N]", - "Direction": 0, - "OriginalDoor": "D04Z01S06[S]", - "Logic": "D04Z01S05[N] || (blood && canClimbOnRoot) || doubleJump && (blood || canClimbOnRoot)" - }, - { - "Id": "D04Z01S05[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D04Z01S01[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D04Z01S05[CherubsN]", - "Direction": 5 - }, - { - "Id": "D04Z01S06[S]", - "Direction": 3, - "OriginalDoor": "D04Z01S05[N]" - }, - { - "Id": "D04Z01S06[E]", - "Direction": 2, - "OriginalDoor": "D09Z01S09[SW]", - "Type": 1, - "VisibilityFlags": 9, - "Logic": "D04Z01S06[E] || doubleJump" - }, - { - "Id": "D04Z01S06[Cherubs]", - "Direction": 6, - "OriginalDoor": "D04Z01S05[CherubsN]", - "Logic": "linen" - }, - - { - "Id": "D04Z02S01[W]", - "Direction": 1, - "OriginalDoor": "D04Z01S04[E]", - "Type": 1 - }, - { - "Id": "D04Z02S01[N]", - "Direction": 0, - "OriginalDoor": "D04Z02S02[S]", - "Logic": "D04Z02S01[N] || D04Z02S01[NE] && dash && (doubleJump || wallClimb)" - }, - { - "Id": "D04Z02S01[E]", - "Direction": 2, - "OriginalDoor": "D04Z03S01[W]", - "Type": 1 - }, - { - "Id": "D04Z02S01[NE]", - "Direction": 2, - "OriginalDoor": "D04Z02S03[W]", - "Logic": "D04Z02S01[NE] || D04Z02S01[N] && dash && canCrossGap1" - }, - { - "Id": "D04Z02S02[S]", - "Direction": 3, - "OriginalDoor": "D04Z02S01[N]" - }, - { - "Id": "D04Z02S02[SE]", - "Direction": 2, - "OriginalDoor": "D04Z02S17[W]" - }, - { - "Id": "D04Z02S02[NE]", - "Direction": 2, - "OriginalDoor": "D04Z02S15[W]", - "VisibilityFlags": 49, - "Logic": "D04Z02S02[NE] || (doubleJump && upwarpSkipsAllowed) || (doubleJump && canEnemyUpslash) || (canEnemyUpslash && upwarpSkipsAllowed && (wallClimb || D04Z02S02[N]))" - }, - { - "Id": "D04Z02S02[N]", - "Direction": 0, - "OriginalDoor": "D06Z01S02[S]", - "Type": 1, - "Logic": "D04Z02S02[N] || D04Z02S02[NE] || wallClimb || doubleJump" - }, - { - "Id": "D04Z02S03[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S01[NE]" - }, - { - "Id": "D04Z02S03[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S04[NW]" - }, - { - "Id": "D04Z02S04[SW]", - "Direction": 1, - "OriginalDoor": "D04Z02S14[E]" - }, - { - "Id": "D04Z02S04[SE]", - "Direction": 2, - "OriginalDoor": "D05Z01S01[NW]", - "Type": 1 - }, - { - "Id": "D04Z02S04[W]", - "Direction": 1, - "OriginalDoor": "D04Z03S01[E]", - "Type": 1 - }, - { - "Id": "D04Z02S04[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S05[W]" - }, - { - "Id": "D04Z02S04[NW]", - "Direction": 1, - "OriginalDoor": "D04Z02S03[E]", - "Logic": "D04Z02S04[NW] || D04Z02S04[NE] || D04Z02S04[N] || D04Z02S04[Cherubs] || wallClimb && doubleJump" - }, - { - "Id": "D04Z02S04[NE]", - "Direction": 2, - "OriginalDoor": "D04Z02S19[W]", - "Logic": "D04Z02S04[NW] || D04Z02S04[NE] || D04Z02S04[N] || D04Z02S04[Cherubs] || wallClimb && doubleJump" - }, - { - "Id": "D04Z02S04[N]", - "Direction": 0, - "OriginalDoor": "D04Z02S06[S]", - "Logic": "(D04Z02S04[NW] || D04Z02S04[NE] || D04Z02S04[N] || D04Z02S04[Cherubs] || wallClimb && doubleJump) && openedMoMLadder" - }, - { - "Id": "D04Z02S04[Cherubs]", - "Direction": 5 - }, - { - "Id": "D04Z02S05[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S04[E]" - }, - { - "Id": "D04Z02S05[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S07[SW]" - }, - { - "Id": "D04Z02S06[S]", - "Direction": 3, - "OriginalDoor": "D04Z02S04[N]" - }, - { - "Id": "D04Z02S06[NW]", - "Direction": 1, - "OriginalDoor": "D04Z02S11[E]", - "Logic": "D04Z02S06[NW] || D04Z02S06[N] || D04Z02S06[NE] || wallClimb" - }, - { - "Id": "D04Z02S06[N]", - "Direction": 0, - "OriginalDoor": "D06Z01S23[S]", - "Type": 1, - "Logic": "(D04Z02S06[NW] || D04Z02S06[N] || D04Z02S06[NE] || wallClimb) && openedARLadder" - }, - { - "Id": "D04Z02S06[NE]", - "Direction": 2, - "OriginalDoor": "D04Z02S09[W]", - "Logic": "D04Z02S06[NW] || D04Z02S06[N] || D04Z02S06[NE] || wallClimb" - }, - { - "Id": "D04Z02S06[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S10[W]" - }, - { - "Id": "D04Z02S06[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D04Z02S04[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D04Z02S07[SW]", - "Direction": 1, - "OriginalDoor": "D04Z02S05[E]" - }, - { - "Id": "D04Z02S07[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S19[E]" - }, - { - "Id": "D04Z02S07[N]", - "Direction": 0, - "OriginalDoor": "D04Z02S08[S]" - }, - { - "Id": "D04Z02S07[NE]", - "Direction": 2, - "OriginalDoor": "D04Z02S13[W]" - }, - { - "Id": "D04Z02S07[SE]", - "Direction": 2, - "OriginalDoor": "D04Z02S23[W]" - }, - { - "Id": "D04Z02S08[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S09[E]" - }, - { - "Id": "D04Z02S08[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S20[W]" - }, - { - "Id": "D04Z02S08[S]", - "Direction": 3, - "OriginalDoor": "D04Z02S07[N]" - }, - { - "Id": "D04Z02S08[Cherubs]", - "Direction": 5 - }, - { - "Id": "D04Z02S09[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S06[NE]" - }, - { - "Id": "D04Z02S09[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S08[W]" - }, - { - "Id": "D04Z02S09[NE]", - "Direction": 2, - "OriginalDoor": "D04Z02S16[W]", - "Logic": "D04Z02S09[NE] || blood" - }, - { - "Id": "D04Z02S10[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S06[E]" - }, - { - "Id": "D04Z02S11[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S21[SE]" - }, - { - "Id": "D04Z02S11[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S06[NW]" - }, - { - "Id": "D04Z02S12[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S21[NE]" - }, - { - "Id": "D04Z02S13[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S07[NE]" - }, - { - "Id": "D04Z02S14[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S04[SW]" - }, - { - "Id": "D04Z02S15[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S02[NE]" - }, - { - "Id": "D04Z02S15[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S22[W]" - }, - { - "Id": "D04Z02S16[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S09[NE]" - }, - { - "Id": "D04Z02S16[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D04Z02S08[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D04Z02S17[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S02[SE]" - }, - { - "Id": "D04Z02S19[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S04[NE]" - }, - { - "Id": "D04Z02S19[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S07[W]" - }, - { - "Id": "D04Z02S20[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S08[E]" - }, - { - "Id": "D04Z02S20[Redento]", - "Direction": 4, - "OriginalDoor": "D04BZ02S01[Redento]", - "Logic": "redentoRooms >= 5" - }, - { - "Id": "D04Z02S21[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S22[E]", - "Logic": "D04Z02S21[NE] || D04Z02S21[W] || wallClimb || doubleJump" - }, - { - "Id": "D04Z02S21[SE]", - "Direction": 2, - "OriginalDoor": "D04Z02S11[W]" - }, - { - "Id": "D04Z02S21[NE]", - "Direction": 2, - "OriginalDoor": "D04Z02S12[W]", - "Logic": "D04Z02S21[NE] || wallClimb || doubleJump" - }, - { - "Id": "D04Z02S22[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S15[E]", - "Logic": "D04Z02S22[W] || canBeatMothersBoss" - }, - { - "Id": "D04Z02S22[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S21[W]", - "Logic": "D04Z02S22[E] || canBeatMothersBoss" - }, - { - "Id": "D04Z02S23[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S07[SE]" - }, - { - "Id": "D04Z02S23[SE]", - "Direction": 2, - "OriginalDoor": "D04Z02S24[NW]" - }, - { - "Id": "D04Z02S23[NE]", - "Direction": 2, - "OriginalDoor": "D04Z04S01[W]", - "Type": 1 - }, - { - "Id": "D04Z02S24[NW]", - "Direction": 1, - "OriginalDoor": "D04Z02S23[SE]" - }, - { - "Id": "D04Z02S24[SW]", - "Direction": 1, - "OriginalDoor": "D20Z02S01[E]", - "Type": 1 - }, - { - "Id": "D04Z02S24[SE]", - "Direction": 2, - "OriginalDoor": "D04Z02S25[W]" - }, - { - "Id": "D04Z02S25[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S24[SE]" - }, - { - "Id": "D04BZ02S01[Redento]", - "Direction": 7, - "OriginalDoor": "D04Z02S20[Redento]" - }, - - { - "Id": "D04Z03S01[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S01[E]", - "Type": 1 - }, - { - "Id": "D04Z03S01[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S04[W]", - "Type": 1 - }, - { - "Id": "D04Z03S02[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S22[E]", - "Type": 1 - }, - - { - "Id": "D04Z04S01[W]", - "Direction": 1, - "OriginalDoor": "D04Z02S23[NE]", - "Type": 1 - }, - { - "Id": "D04Z04S01[E]", - "Direction": 2, - "OriginalDoor": "D04Z04S02[W]", - "Type": 9 - }, - { - "Id": "D04Z04S02[W]", - "Direction": 1, - "OriginalDoor": "D04Z04S01[E]", - "Type": 9 - }, - - { - "Id": "D05Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S02[E]" - }, - { - "Id": "D05Z01S01[NW]", - "Direction": 1, - "OriginalDoor": "D04Z02S04[SE]", - "Type": 1 - }, - { - "Id": "D05Z01S01[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S16[W]" - }, - { - "Id": "D05Z01S02[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S15[E]", - "VisibilityFlags": 1 - }, - { - "Id": "D05Z01S02[NW]", - "Direction": 1, - "OriginalDoor": "D05Z01S03[E]" - }, - { - "Id": "D05Z01S02[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S01[W]" - }, - { - "Id": "D05Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S04[E]" - }, - { - "Id": "D05Z01S03[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S02[NW]" - }, - { - "Id": "D05Z01S03[Frontal]", - "Direction": 4, - "OriginalDoor": "D05BZ01S01[FrontalS]", - "Logic": "woodKey && D05Z01S23[E] && (D05Z01S11[NW] || D05Z01S11[NE])" - }, - { - "Id": "D05Z01S04[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S05[E]" - }, - { - "Id": "D05Z01S04[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S03[W]" - }, - { - "Id": "D05Z01S05[SW]", - "Direction": 1, - "OriginalDoor": "D05Z01S07[E]" - }, - { - "Id": "D05Z01S05[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S04[W]" - }, - { - "Id": "D05Z01S05[NE]", - "Direction": 2, - "OriginalDoor": "D05Z01S17[W]", - "Logic": "D05Z01S05[NE] || blood" - }, - { - "Id": "D05Z01S06[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S24[E]", - "Logic": "D05Z01S06[W] || canSurvivePoison3" - }, - { - "Id": "D05Z01S06[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S20[W]", - "Logic": "D05Z01S06[E] || canSurvivePoison3" - }, - { - "Id": "D05Z01S07[SW]", - "Direction": 1, - "OriginalDoor": "D05Z01S08[NE]" - }, - { - "Id": "D05Z01S07[NW]", - "Direction": 1, - "OriginalDoor": "D05Z01S20[E]", - "Logic": "D05Z01S07[NW] || blood && (canClimbOnRoot || doubleJump) || (canClimbOnRoot && canCrossGap3) || canCrossGap7" - }, - { - "Id": "D05Z01S07[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S05[SW]" - }, - { - "Id": "D05Z01S08[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S10[E]" - }, - { - "Id": "D05Z01S08[NW]", - "Direction": 1, - "OriginalDoor": "D05Z01S12[E]" - }, - { - "Id": "D05Z01S08[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S09[W]" - }, - { - "Id": "D05Z01S08[Health]", - "Direction": 2, - "OriginalDoor": "D05Z01S14[W]" - }, - { - "Id": "D05Z01S08[NE]", - "Direction": 2, - "OriginalDoor": "D05Z01S07[SW]" - }, - { - "Id": "D05Z01S09[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S08[E]" - }, - { - "Id": "D05Z01S09[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S18[W]" - }, - { - "Id": "D05Z01S10[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S11[E]" - }, - { - "Id": "D05Z01S10[NW]", - "Direction": 1, - "OriginalDoor": "D05Z01S11[NE]" - }, - { - "Id": "D05Z01S10[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S08[W]" - }, - { - "Id": "D05Z01S11[SW]", - "Direction": 1, - "OriginalDoor": "D05Z01S19[E]", - "VisibilityFlags": 5, - "Logic": "canBreakTirana" - }, - { - "Id": "D05Z01S11[NW]", - "Direction": 1, - "OriginalDoor": "D05Z01S23[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D05Z01S11[NE]" ] - }, - { - "Id": "D05Z01S11[NE]", - "Direction": 2, - "OriginalDoor": "D05Z01S10[NW]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D05Z01S11[NW]" ] - }, - { - "Id": "D05Z01S11[SE]", - "Direction": 2, - "OriginalDoor": "D05Z02S01[W]", - "Type": 1 - }, - { - "Id": "D05Z01S11[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S10[W]" - }, - { - "Id": "D05Z01S12[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S08[NW]" - }, - { - "Id": "D05Z01S13[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S21[NW]" - }, - { - "Id": "D05Z01S14[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S08[Health]" - }, - { - "Id": "D05Z01S15[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S21[NE]" - }, - { - "Id": "D05Z01S15[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S02[W]" - }, - { - "Id": "D05Z01S16[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S01[E]" - }, - { - "Id": "D05Z01S17[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S05[NE]" - }, - { - "Id": "D05Z01S18[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S09[E]" - }, - { - "Id": "D05Z01S19[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S15[E]", - "Type": 1 - }, - { - "Id": "D05Z01S19[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S11[SW]" - }, - { - "Id": "D05Z01S20[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S06[E]" - }, - { - "Id": "D05Z01S20[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S07[NW]" - }, - { - "Id": "D05Z01S20[N]", - "Direction": 0, - "OriginalDoor": "D04Z01S03[S]", - "Type": 1 - }, - { - "Id": "D05Z01S21[SW]", - "Direction": 1, - "OriginalDoor": "D05Z02S14[E]", - "Type": 1 - }, - { - "Id": "D05Z01S21[NW]", - "Direction": 1, - "OriginalDoor": "D05Z01S13[E]" - }, - { - "Id": "D05Z01S21[NE]", - "Direction": 2, - "OriginalDoor": "D05Z01S15[W]" - }, - { - "Id": "D05Z01S21[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D05Z02S11[Cherubs]", - "Type": 1, - "Logic": "linen" - }, - { - "Id": "D05Z01S22[FrontalN]", - "Direction": 4, - "OriginalDoor": "D05BZ01S01[FrontalN]" - }, - { - "Id": "D05Z01S22[E]", - "Direction": 2, - "OriginalDoor": "D04Z03S02[W]", - "Type": 1 - }, - { - "Id": "D05Z01S23[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S11[NW]" - }, - { - "Id": "D05Z01S24[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S06[W]" - }, - { - "Id": "D05BZ01S01[FrontalS]", - "Direction": 7, - "OriginalDoor": "D05Z01S03[Frontal]" - }, - { - "Id": "D05BZ01S01[FrontalN]", - "Direction": 7, - "OriginalDoor": "D05Z01S22[FrontalN]" - }, - - { - "Id": "D05Z02S01[W]", - "Direction": 1, - "OriginalDoor": "D05Z01S11[SE]", - "Type": 1 - }, - { - "Id": "D05Z02S01[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S02[NW]" - }, - { - "Id": "D05Z02S02[SW]", - "Direction": 1, - "OriginalDoor": "D05Z02S03[E]" - }, - { - "Id": "D05Z02S02[NW]", - "Direction": 1, - "OriginalDoor": "D05Z02S01[E]" - }, - { - "Id": "D05Z02S02[SE]", - "Direction": 2, - "OriginalDoor": "D05Z02S09[W]" - }, - { - "Id": "D05Z02S02[NE]", - "Direction": 2, - "OriginalDoor": "D05Z02S05[W]" - }, - { - "Id": "D05Z02S03[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S04[E]" - }, - { - "Id": "D05Z02S03[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S02[SW]" - }, - { - "Id": "D05Z02S04[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S12[E]" - }, - { - "Id": "D05Z02S04[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S03[W]" - }, - { - "Id": "D05Z02S04[C]", - "Direction": 4, - "OriginalDoor": "D05BZ02S01[C]" - }, - { - "Id": "D05Z02S05[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S02[NE]" - }, - { - "Id": "D05Z02S05[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S06[SW]" - }, - { - "Id": "D05Z02S06[SW]", - "Direction": 1, - "OriginalDoor": "D05Z02S05[E]" - }, - { - "Id": "D05Z02S06[NW]", - "Direction": 1, - "OriginalDoor": "D05Z02S07[E]" - }, - { - "Id": "D05Z02S06[SE]", - "Direction": 2, - "OriginalDoor": "D05Z02S11[W]", - "Logic": "openedTSCGate" - }, - { - "Id": "D05Z02S06[NE]", - "Direction": 2, - "OriginalDoor": "D05Z02S14[W]" - }, - { - "Id": "D05Z02S07[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S10[E]" - }, - { - "Id": "D05Z02S07[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S06[NW]" - }, - { - "Id": "D05Z02S08[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S09[E]" - }, - { - "Id": "D05Z02S09[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S02[SE]" - }, - { - "Id": "D05Z02S09[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S08[W]", - "Logic": "redWax >= 3 && blueWax >= 3" - }, - { - "Id": "D05Z02S10[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S13[E]", - "Logic": "dash" - }, - { - "Id": "D05Z02S10[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S07[W]" - }, - { - "Id": "D05Z02S11[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S06[SE]" - }, - { - "Id": "D05Z02S11[Cherubs]", - "Direction": 5, - "Type": 1 - }, - { - "Id": "D05Z02S12[W]", - "Direction": 1, - "OriginalDoor": "D01Z04S16[E]", - "Type": 1 - }, - { - "Id": "D05Z02S12[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S04[W]" - }, - { - "Id": "D05Z02S12[N]", - "Direction": 0, - "OriginalDoor": "D05Z02S15[S]" - }, - { - "Id": "D05Z02S13[E]", - "Direction": 2, - "OriginalDoor": "D05Z02S10[W]", - "Logic": "dash" - }, - { - "Id": "D05Z02S14[W]", - "Direction": 1, - "OriginalDoor": "D05Z02S06[NE]", - "Logic": "D05Z02S14[W] || canBeatCanvasesBoss" - }, - { - "Id": "D05Z02S14[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S21[SW]", - "Type": 1, - "Logic": "D05Z02S14[E] || canBeatCanvasesBoss" - }, - { - "Id": "D05Z02S15[S]", - "Direction": 3, - "OriginalDoor": "D05Z02S12[N]" - }, - { - "Id": "D05Z02S15[E]", - "Direction": 2, - "OriginalDoor": "D05Z01S19[W]", - "Type": 1 - }, - { - "Id": "D05BZ02S01[C]", - "Direction": 7, - "OriginalDoor": "D05Z02S04[C]" - }, - - { - "Id": "D06Z01S01[SW]", - "Direction": 1, - "OriginalDoor": "D06Z01S14[E]", - "Logic": "(D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || linen && (D06Z01S01[NW] || D06Z01S01[NE])" - }, - { - "Id": "D06Z01S01[SE]", - "Direction": 2, - "OriginalDoor": "D06Z01S03[W]", - "Logic": "(D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || linen && (D06Z01S01[NW] || D06Z01S01[NE])" - }, - { - "Id": "D06Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S07[E]", - "Logic": "(D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || masks >= 1 && (D06Z01S01[SW] || D06Z01S01[SE]) || linen && (D06Z01S01[NW] || D06Z01S01[NE] && (canWalkOnRoot || canCrossGap1))" - }, - { - "Id": "D06Z01S01[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S06[WW]", - "Logic": "(D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || masks >= 1 && (D06Z01S01[SW] || D06Z01S01[SE]) || linen && (D06Z01S01[NE] || D06Z01S01[NW] && (canWalkOnRoot || canCrossGap1))" - }, - { - "Id": "D06Z01S01[NW]", - "Direction": 1, - "OriginalDoor": "D06Z01S16[E]", - "Logic": "D06Z01S01[NW] || D06Z01S01[NE] && (canWalkOnRoot || canCrossGap8) || linen && (D06Z01S01[NNW] || D06Z01S01[NNE] && (canWalkOnRoot || canCrossGap3))" - }, - { - "Id": "D06Z01S01[NE]", - "Direction": 2, - "OriginalDoor": "D06Z01S17[W]", - "Logic": "D06Z01S01[NE] || D06Z01S01[NW] && (canWalkOnRoot || canCrossGap8) || linen && (D06Z01S01[NNE] || D06Z01S01[NNW] && (canWalkOnRoot || canCrossGap3))" - }, - { - "Id": "D06Z01S01[NNW]", - "Direction": 1, - "OriginalDoor": "D06Z01S09[E]", - "Logic": "(D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || masks >= 2 && (D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || linen && (D06Z01S01[NW] || D06Z01S01[NE]))" - }, - { - "Id": "D06Z01S01[NNE]", - "Direction": 2, - "OriginalDoor": "D06Z01S10[W]", - "Logic": "(D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N]) || masks >= 2 && (D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || linen && (D06Z01S01[NW] || D06Z01S01[NE]))" - }, - { - "Id": "D06Z01S01[N]", - "Direction": 0, - "OriginalDoor": "D06Z01S19[S]", - "Logic": "masks >= 3 && (D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NNW] || D06Z01S01[NNE] || D06Z01S01[N] || linen && (D06Z01S01[NW] || D06Z01S01[NE]))", - "Type": 9 - }, - { - "Id": "D06Z01S01[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D06Z01S23[Cherubs]", - "Logic": "linen && (D06Z01S01[SW] || D06Z01S01[SE] || D06Z01S01[W] || D06Z01S01[E] || D06Z01S01[NW] || D06Z01S01[NE] || D06Z01S01[NNW] || D06Z01S01[NNE])" - }, - { - "Id": "D06Z01S02[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S18[E]" - }, - { - "Id": "D06Z01S02[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S08[W]" - }, - { - "Id": "D06Z01S02[S]", - "Direction": 3, - "OriginalDoor": "D04Z02S02[N]", - "Type": 1 - }, - { - "Id": "D06Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S01[SE]", - "Logic": "D06Z01S03[W] || canBeatLegionary" - }, - { - "Id": "D06Z01S03[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S04[W]", - "Logic": "D06Z01S03[E] || canBeatLegionary" - }, - { - "Id": "D06Z01S04[SW]", - "Direction": 1, - "OriginalDoor": "D06Z01S20[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S04[W]", "D06Z01S04[Health]" ] - }, - { - "Id": "D06Z01S04[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S03[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S04[SW]", "D06Z01S04[Health]" ] - }, - { - "Id": "D06Z01S04[Health]", - "Direction": 2, - "OriginalDoor": "D06Z01S24[W]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S04[SW]", "D06Z01S04[W]" ], - "Logic": "D06Z01S04[Health] || (wallClimb && canSurvivePoison2 && (doubleJump || blood && canClimbOnRoot))" - }, - { - "Id": "D06Z01S04[NW]", - "Direction": 1, - "OriginalDoor": "D06Z01S06[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S04[NE]", "D06Z01S04[Cherubs]" ], - "Logic": "D06Z01S04[NW] || D06Z01S04[Cherubs] || (D06Z01S04[SW] || D06Z01S04[W] || D06Z01S04[Health]) && wallClimb && canSurvivePoison2 && (dash || doubleJump && (canDawnJump || canClimbOnRoot))" - }, - { - "Id": "D06Z01S04[NE]", - "Direction": 2, - "OriginalDoor": "D06Z01S06[W]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S04[NW]", "D06Z01S04[Cherubs]" ], - "Logic": "D06Z01S04[NE] || (D06Z01S04[SW] || D06Z01S04[W] || D06Z01S04[Health]) && wallClimb && canSurvivePoison2 && (dash || doubleJump && (canDawnJump || canClimbOnRoot))" - }, - { - "Id": "D06Z01S04[Cherubs]", - "Direction": 5 - }, - { - "Id": "D06Z01S05[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S12[NW]" - }, - { - "Id": "D06Z01S06[WW]", - "Direction": 1, - "OriginalDoor": "D06Z01S01[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S06[E]" ], - "Logic": "D06Z01S06[WW] || canBeatLegionary" - }, - { - "Id": "D06Z01S06[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S04[NW]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S06[WW]" ], - "Logic": "D06Z01S06[E] || canBeatLegionary" - }, - { - "Id": "D06Z01S06[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S04[NE]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S06[EE]" ] - }, - { - "Id": "D06Z01S06[EE]", - "Direction": 2, - "OriginalDoor": "D06Z01S15[SW]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S06[W]" ] - }, - { - "Id": "D06Z01S07[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S12[E]" - }, - { - "Id": "D06Z01S07[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S01[W]" - }, - { - "Id": "D06Z01S07[CherubsL]", - "Direction": 5 - }, - { - "Id": "D06Z01S07[CherubsR]", - "Direction": 5 - }, - { - "Id": "D06Z01S08[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S02[E]" - }, - { - "Id": "D06Z01S08[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S14[W]", - "Logic": "D06Z01S08[N] || D06Z01S08[E] || wallClimb" - }, - { - "Id": "D06Z01S08[N]", - "Direction": 0, - "OriginalDoor": "D06Z01S13[S]", - "VisibilityFlags": 1 - }, - { - "Id": "D06Z01S09[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S12[NE]" - }, - { - "Id": "D06Z01S09[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S01[NNW]" - }, - { - "Id": "D06Z01S09[-CherubsL]", - "Direction": 6, - "OriginalDoor": "D06Z01S16[CherubsL]", - "Logic": "linen" - }, - { - "Id": "D06Z01S09[-CherubsR]", - "Direction": 6, - "OriginalDoor": "D06Z01S16[CherubsR]", - "Logic": "linen" - }, - { - "Id": "D06Z01S10[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S01[NNE]" - }, - { - "Id": "D06Z01S10[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S21[W]" - }, - { - "Id": "D06Z01S10[-CherubsL]", - "Direction": 6, - "OriginalDoor": "D06Z01S17[CherubsL]", - "Logic": "linen" - }, - { - "Id": "D06Z01S10[-CherubsR]", - "Direction": 6, - "OriginalDoor": "D06Z01S17[CherubsR]", - "Logic": "linen" - }, - { - "Id": "D06Z01S11[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S15[NE]" - }, - { - "Id": "D06Z01S12[S]", - "Direction": 3, - "OriginalDoor": "D06Z01S14[N]" - }, - { - "Id": "D06Z01S12[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S13[E]", - "Logic": "D06Z01S12[NW] || D06Z01S12[NE] || D06Z01S12[NE2] || D06Z01S12[W] || D06Z01S12[E] || wallClimb && doubleJump" - }, - { - "Id": "D06Z01S12[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S07[W]", - "Logic": "D06Z01S12[NW] || D06Z01S12[NE] || D06Z01S12[NE2] || D06Z01S12[W] || D06Z01S12[E] || wallClimb && doubleJump" - }, - { - "Id": "D06Z01S12[NW]", - "Direction": 1, - "OriginalDoor": "D06Z01S05[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S12[NE]", "D06Z01S12[NE2]" ], - "Logic": "D06Z01S12[NW] || D06Z01S12[NE] || wallClimb || doubleJump" - }, - { - "Id": "D06Z01S12[NE]", - "Direction": 2, - "OriginalDoor": "D06Z01S09[W]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S12[NW]", "D06Z01S12[NE2]" ], - "Logic": "D06Z01S12[NW] || D06Z01S12[NE] || wallClimb || doubleJump" - }, - { - "Id": "D06Z01S12[NE2]", - "Direction": 2, - "OriginalDoor": "D06Z01S16[W]", - "VisibilityFlags": 1 - }, - { - "Id": "D06Z01S13[W]", - "Direction": 1, - "OriginalDoor": "D09Z01S01[E]", - "Type": 1 - }, - { - "Id": "D06Z01S13[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S12[W]" - }, - { - "Id": "D06Z01S13[S]", - "Direction": 3, - "OriginalDoor": "D06Z01S08[N]" - }, - { - "Id": "D06Z01S14[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S08[E]" - }, - { - "Id": "D06Z01S14[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S01[SW]" - }, - { - "Id": "D06Z01S14[N]", - "Direction": 0, - "OriginalDoor": "D06Z01S12[S]" - }, - { - "Id": "D06Z01S15[SW]", - "Direction": 1, - "OriginalDoor": "D06Z01S06[EE]", - "VisibilityFlags": 1 - }, - { - "Id": "D06Z01S15[NW]", - "Direction": 1, - "OriginalDoor": "D06Z01S21[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S15[NE]" ], - "Logic": "D06Z01S15[NW] || D06Z01S15[SW] && wallClimb" - }, - { - "Id": "D06Z01S15[NE]", - "Direction": 2, - "OriginalDoor": "D06Z01S11[W]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D06Z01S15[NW]" ], - "Logic": "D06Z01S15[NE] || D06Z01S15[SW] && wallClimb" - }, - { - "Id": "D06Z01S16[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S12[NE2]", - "Logic": "D06Z01S16[W] || (D06Z01S16[CherubsL] && (doubleJump || wallClimb && (canWalkOnRoot || canAirStall))) || (D06Z01S16[CherubsR] && (doubleJump || canAirStall && (canWalkOnRoot || wheel) && (wallClimb || canDawnJump))) || (D06Z01S16[E] && (canWalkOnRoot || canCrossGap7) && (wallClimb || canCrossGap5))" - }, - { - "Id": "D06Z01S16[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S01[NW]", - "Logic": "D06Z01S16[E] || ((D06Z01S16[W] || D06Z01S16[CherubsL]) && (canWalkOnRoot || canCrossGap5)) || (D06Z01S16[CherubsR] && (doubleJump || canAirStall && (canWalkOnRoot || wheel)))" - }, - { - "Id": "D06Z01S16[-CherubsL]", - "Direction": 6, - "OriginalDoor": "D06Z01S07[CherubsL]", - "Logic": "linen && (D06Z01S16[W] || D06Z01S16[CherubsL] || (D06Z01S16[CherubsR] && (doubleJump || canAirStall && (canWalkOnRoot || wheel))) || (D06Z01S16[E] && (canWalkOnRoot || canCrossGap7)))" - }, - { - "Id": "D06Z01S16[-CherubsR]", - "Direction": 6, - "OriginalDoor": "D06Z01S07[CherubsR]", - "Logic": "linen && (D06Z01S16[E] || D06Z01S16[CherubsR] || (D06Z01S16[CherubsL] && (canAirStall || canWalkOnRoot || doubleJump)) || (D06Z01S16[W] && (canWalkOnRoot || canCrossGap1)))" - }, - { - "Id": "D06Z01S16[CherubsL]", - "Direction": 5 - }, - { - "Id": "D06Z01S16[CherubsR]", - "Direction": 5 - }, - { - "Id": "D06Z01S17[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S01[NE]", - "Logic": "D06Z01S17[W] || (D06Z01S17[E] || D06Z01S17[CherubsR]) && blood || D06Z01S17[CherubsL] && doubleJump" - }, - { - "Id": "D06Z01S17[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S26[W]", - "Logic": "D06Z01S17[E] || D06Z01S17[CherubsR] || blood && (D06Z01S17[W] || D06Z01S17[CherubsL] && doubleJump)" - }, - { - "Id": "D06Z01S17[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D06Z01S04[Cherubs]", - "Logic": "linen" - }, - { - "Id": "D06Z01S17[CherubsL]", - "Direction": 5 - }, - { - "Id": "D06Z01S17[CherubsR]", - "Direction": 5 - }, - { - "Id": "D06Z01S18[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S02[W]" - }, - { - "Id": "D06Z01S18[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D04Z01S04[Cherubs]", - "Type": 1, - "Logic": "linen" - }, - { - "Id": "D06Z01S19[S]", - "Direction": 3, - "OriginalDoor": "D06Z01S01[N]", - "Type": 9 - }, - { - "Id": "D06Z01S19[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S25[W]", - "Type": 9 - }, - { - "Id": "D06Z01S20[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S23[E]" - }, - { - "Id": "D06Z01S20[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S04[SW]" - }, - { - "Id": "D06Z01S21[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S10[E]", - "Logic": "D06Z01S21[W] || canBeatLegionary" - }, - { - "Id": "D06Z01S21[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S15[NW]", - "Logic": "D06Z01S21[E] || canBeatLegionary" - }, - { - "Id": "D06Z01S22[Sword]", - "Direction": 2, - "OriginalDoor": "D06Z01S23[Sword]" - }, - { - "Id": "D06Z01S23[Sword]", - "Direction": 1, - "OriginalDoor": "D06Z01S22[Sword]" - }, - { - "Id": "D06Z01S23[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S20[W]" - }, - { - "Id": "D06Z01S23[S]", - "Direction": 3, - "OriginalDoor": "D04Z02S06[N]", - "Type": 1 - }, - { - "Id": "D06Z01S23[Cherubs]", - "Direction": 5 - }, - { - "Id": "D06Z01S24[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S04[Health]" - }, - { - "Id": "D06Z01S25[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S19[E]", - "Logic": "D06Z01S25[W] || canBeatRooftopsBoss", - "Type": 9 - }, - { - "Id": "D06Z01S25[E]", - "Direction": 2, - "OriginalDoor": "D07Z01S01[W]", - "Logic": "D06Z01S25[E] || canBeatRooftopsBoss", - "Type": 9 - }, - { - "Id": "D06Z01S26[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S17[E]" - }, - - { - "Id": "D07Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D06Z01S25[E]", - "Type": 9 - }, - { - "Id": "D07Z01S01[E]", - "Direction": 2, - "OriginalDoor": "D07Z01S02[W]", - "Type": 9 - }, - { - "Id": "D07Z01S02[W]", - "Direction": 1, - "OriginalDoor": "D07Z01S01[E]", - "Type": 9 - }, - { - "Id": "D07Z01S02[E]", - "Direction": 2, - "OriginalDoor": "D07Z01S03[W]", - "Type": 9 - }, - { - "Id": "D07Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D07Z01S02[E]", - "Type": 9 - }, - - { - "Id": "D08Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D01Z03S06[E]", - "Type": 1, - "Logic": "D08Z01S01[W] || canBeatBridgeBoss" - }, - { - "Id": "D08Z01S01[E]", - "Direction": 2, - "OriginalDoor": "D08Z02S01[W]", - "Type": 1, - "Logic": "holyWounds >= 3 && (D08Z01S01[E] || D08Z01S01[Cherubs] || canBeatBridgeBoss)" - }, - { - "Id": "D08Z01S01[Cherubs]", - "Direction": 5 - }, - { - "Id": "D08Z01S02[NE]", - "Direction": 2, - "OriginalDoor": "D08Z03S03[W]", - "Type": 1, - "VisibilityFlags": 1 - }, - { - "Id": "D08Z01S02[SE]", - "Direction": 2, - "OriginalDoor": "D08Z02S03[W]", - "Type": 1 - }, - { - "Id": "D08Z01S02[-Cherubs]", - "Direction": 6, - "OriginalDoor": "D08Z01S01[Cherubs]", - "Logic": "linen" - }, - - { - "Id": "D08Z02S01[W]", - "Direction": 1, - "OriginalDoor": "D08Z01S01[E]", - "Type": 1 - }, - { - "Id": "D08Z02S01[SE]", - "Direction": 2, - "OriginalDoor": "D08Z02S02[W]" - }, - { - "Id": "D08Z02S01[E]", - "Direction": 2, - "OriginalDoor": "D04Z01S01[W]", - "Type": 1 - }, - { - "Id": "D08Z02S01[N]", - "Direction": 0, - "OriginalDoor": "D08Z02S03[S]" - }, - { - "Id": "D08Z02S02[W]", - "Direction": 1, - "OriginalDoor": "D08Z02S01[SE]" - }, - { - "Id": "D08Z02S03[W]", - "Direction": 1, - "OriginalDoor": "D08Z01S02[SE]", - "Type": 1, - "Logic": "brokeBotTCStatue" - }, - { - "Id": "D08Z02S03[E]", - "Direction": 2, - "OriginalDoor": "D08Z03S01[W]", - "Type": 1 - }, - { - "Id": "D08Z02S03[S]", - "Direction": 3, - "OriginalDoor": "D08Z02S01[N]" - }, - - { - "Id": "D08Z03S01[W]", - "Direction": 1, - "OriginalDoor": "D08Z02S03[E]", - "Type": 1 - }, - { - "Id": "D08Z03S01[E]", - "Direction": 2, - "OriginalDoor": "D08Z03S02[SW]", - "Logic": "verses >= 4" - }, - { - "Id": "D08Z03S02[SW]", - "Direction": 1, - "OriginalDoor": "D08Z03S01[E]" - }, - { - "Id": "D08Z03S02[NW]", - "Direction": 1, - "OriginalDoor": "D08Z03S03[E]", - "Logic": "D08Z03S02[NW] || wallClimb" - }, - { - "Id": "D08Z03S03[W]", - "Direction": 1, - "OriginalDoor": "D08Z01S02[NE]", - "Type": 1, - "Logic": "D08Z03S03[W] || canBeatHallBoss" - }, - { - "Id": "D08Z03S03[E]", - "Direction": 2, - "OriginalDoor": "D08Z03S02[NW]", - "Logic": "D08Z03S03[E] || canBeatHallBoss" - }, - - { - "Id": "D09Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D09Z01S11[E]" - }, - { - "Id": "D09Z01S01[E]", - "Direction": 2, - "OriginalDoor": "D06Z01S13[W]", - "Type": 1 - }, - { - "Id": "D09Z01S02[SW]", - "Direction": 1, - "OriginalDoor": "D09Z01S07[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[Cell2]" ] - }, - { - "Id": "D09Z01S02[NW]", - "Direction": 1, - "OriginalDoor": "D09Z01S07[NE]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ] - }, - { - "Id": "D09Z01S02[N]", - "Direction": 0, - "OriginalDoor": "D09Z01S11[S]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ] - }, - { - "Id": "D09Z01S02[Cell1]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell1]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ], - "Logic": "bronzeKey" - }, - { - "Id": "D09Z01S02[Cell6]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell6]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ], - "Logic": "silverKey" - }, - { - "Id": "D09Z01S02[Cell5]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell5]", - "VisibilityFlags": 1 - }, - { - "Id": "D09Z01S02[Cell4]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell4]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ], - "Logic": "goldKey" - }, - { - "Id": "D09Z01S02[Cell2]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell2]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[SW]" ] - }, - { - "Id": "D09Z01S02[Cell3]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell3]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ], - "Logic": "bronzeKey" - }, - { - "Id": "D09Z01S02[Cell22]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell22]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ] - }, - { - "Id": "D09Z01S02[Cell23]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell23]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S02[NW]", "D09Z01S02[N]", "D09Z01S02[Cell1]", "D09Z01S02[Cell6]", "D09Z01S02[Cell4]", "D09Z01S02[Cell3]", "D09Z01S02[Cell22]", "D09Z01S02[Cell23]" ], - "Logic": "bronzeKey" - }, - { - "Id": "D09Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D09Z01S05[SE]", - "Logic": "D09Z01S03[N] && canBeatPrisonBoss" - }, - { - "Id": "D09Z01S03[N]", - "Direction": 5 - }, - { - "Id": "D09Z01S04[W]", - "Direction": 1, - "OriginalDoor": "D09Z01S06[E]" - }, - { - "Id": "D09Z01S04[E]", - "Direction": 2, - "OriginalDoor": "D09Z01S11[W]" - }, - { - "Id": "D09Z01S04[S]", - "Direction": 3, - "OriginalDoor": "D09Z01S07[N]" - }, - { - "Id": "D09Z01S05[W]", - "Direction": 1, - "OriginalDoor": "D09Z01S13[E]" - }, - { - "Id": "D09Z01S05[SE]", - "Direction": 2, - "OriginalDoor": "D09Z01S03[W]" - }, - { - "Id": "D09Z01S05[NE]", - "Direction": 2, - "OriginalDoor": "D09Z01S08[W]" - }, - { - "Id": "D09Z01S06[-E]", - "Direction": 1, - "OriginalDoor": "D02Z03S10[-W]", - "Type": 1, - "Logic": "peaksKey" - }, - { - "Id": "D09Z01S06[E]", - "Direction": 2, - "OriginalDoor": "D09Z01S04[W]" - }, - { - "Id": "D09Z01S07[SW]", - "Direction": 1, - "OriginalDoor": "D09Z01S09[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ] - }, - { - "Id": "D09Z01S07[SE]", - "Direction": 2, - "OriginalDoor": "D09Z01S10[W]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ] - }, - { - "Id": "D09Z01S07[W]", - "Direction": 1, - "OriginalDoor": "D09Z01S08[SE]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ] - }, - { - "Id": "D09Z01S07[E]", - "Direction": 2, - "OriginalDoor": "D09Z01S02[SW]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ] - }, - { - "Id": "D09Z01S07[NW]", - "Direction": 1, - "OriginalDoor": "D09Z01S08[NE]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S07[N]" ] - }, - { - "Id": "D09Z01S07[N]", - "Direction": 0, - "OriginalDoor": "D09Z01S04[S]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S07[NW]" ] - }, - { - "Id": "D09Z01S07[NE]", - "Direction": 2, - "OriginalDoor": "D09Z01S02[NW]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]" ], - "Logic": "D09Z01S07[NE] || blood" - }, - { - "Id": "D09Z01S08[W]", - "Direction": 1, - "OriginalDoor": "D09Z01S05[NE]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S08[Cell14]" ], - "Logic": "openedWotHPGate" - }, - { - "Id": "D09Z01S08[S]", - "Direction": 6, - "OriginalDoor": "D09Z01S03[N]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S08[W]", "D09Z01S08[Cell14]" ] - }, - { - "Id": "D09Z01S08[SE]", - "Direction": 2, - "OriginalDoor": "D09Z01S07[W]", - "Logic": "D09Z01S08[SE] || D09Z01S08[Cell15] || D09Z01S08[Cell16] || D09Z01S08[Cell18] || D09Z01S08[Cell17] && dash" - }, - { - "Id": "D09Z01S08[NE]", - "Direction": 2, - "OriginalDoor": "D09Z01S07[NW]", - "Logic": "D09Z01S08[NE] || D09Z01S08[Cell7] || D09Z01S08[Cell17] && dash" - }, - { - "Id": "D09Z01S08[Cell14]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell14]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S08[W]" ] - }, - { - "Id": "D09Z01S08[Cell15]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell15]", - "Logic": "silverKey && (D09Z01S08[SE] || D09Z01S08[Cell15] || D09Z01S08[Cell16] || D09Z01S08[Cell18] || D09Z01S08[Cell17] && dash)" - }, - { - "Id": "D09Z01S08[Cell7]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell7]", - "Logic": "goldKey && (D09Z01S08[NE] || D09Z01S08[Cell7] || D09Z01S08[Cell17] && dash)" - }, - { - "Id": "D09Z01S08[Cell16]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell16]", - "Logic": "goldKey && (D09Z01S08[SE] || D09Z01S08[Cell15] || D09Z01S08[Cell16] || D09Z01S08[Cell18] || D09Z01S08[Cell17] && dash)" - }, - { - "Id": "D09Z01S08[Cell18]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell18]", - "Logic": "silverKey && (D09Z01S08[SE] || D09Z01S08[Cell15] || D09Z01S08[Cell16] || D09Z01S08[Cell18] || D09Z01S08[Cell17] && dash)" - }, - { - "Id": "D09Z01S08[Cell17]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell17]", - "VisibilityFlags": 1 - }, - { - "Id": "D09Z01S09[SW]", - "Direction": 1, - "OriginalDoor": "D04Z01S06[E]", - "Type": 1, - "Logic": "D09Z01S09[Cell21] || D09Z01S09[Cell20] || D09Z01S09[SW] || D09Z01S09[E] || dash" - }, - { - "Id": "D09Z01S09[NW]", - "Direction": 1, - "OriginalDoor": "D09Z01S12[E]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S09[Cell19]", "D09Z01S09[Cell24]" ], - "Logic": "D09Z01S09[NW] || D09Z01S09[Cell19] || dash" - }, - { - "Id": "D09Z01S09[E]", - "Direction": 2, - "OriginalDoor": "D09Z01S07[SW]", - "Logic": "D09Z01S09[Cell21] || D09Z01S09[Cell20] || D09Z01S09[SW] || D09Z01S09[E] || dash" - }, - { - "Id": "D09Z01S09[Cell24]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell24]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S09[NW]", "D09Z01S09[Cell19]" ], - "Logic": "D09Z01S09[Cell24] || dash" - }, - { - "Id": "D09Z01S09[Cell19]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell19]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S09[NW]", "D09Z01S09[Cell24]" ], - "Logic": "D09Z01S09[NW] || D09Z01S09[Cell19] || dash" - }, - { - "Id": "D09Z01S09[Cell20]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell20]", - "Logic": "silverKey && (D09Z01S09[Cell21] || D09Z01S09[Cell20] || D09Z01S09[SW] || D09Z01S09[E] || dash)" - }, - { - "Id": "D09Z01S09[Cell21]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell21]", - "Logic": "goldKey && (D09Z01S09[Cell21] || D09Z01S09[Cell20] || D09Z01S09[SW] || D09Z01S09[E] || dash)" - }, - { - "Id": "D09Z01S10[W]", - "Direction": 1, - "OriginalDoor": "D09Z01S07[SE]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S10[Cell12]", "D09Z01S10[Cell10]", "D09Z01S10[Cell11]" ] - }, - { - "Id": "D09Z01S10[Cell13]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell13]", - "VisibilityFlags": 1 - }, - { - "Id": "D09Z01S10[Cell12]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell12]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S10[W]", "D09Z01S10[Cell10]", "D09Z01S10[Cell11]" ], - "Logic": "bronzeKey" - }, - { - "Id": "D09Z01S10[Cell10]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell10]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S10[W]", "D09Z01S10[Cell12]", "D09Z01S10[Cell11]" ], - "Logic": "silverKey" - }, - { - "Id": "D09Z01S10[Cell11]", - "Direction": 4, - "OriginalDoor": "D09BZ01S01[Cell11]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09Z01S10[W]", "D09Z01S10[Cell12]", "D09Z01S10[Cell10]" ], - "Logic": "silverKey" - }, - { - "Id": "D09Z01S11[W]", - "Direction": 1, - "OriginalDoor": "D09Z01S04[E]", - "VisibilityFlags": 1 - }, - { - "Id": "D09Z01S11[E]", - "Direction": 2, - "OriginalDoor": "D09Z01S01[W]" - }, - { - "Id": "D09Z01S11[S]", - "Direction": 3, - "OriginalDoor": "D09Z01S02[N]" - }, - { - "Id": "D09Z01S12[E]", - "Direction": 2, - "OriginalDoor": "D09Z01S09[NW]" - }, - { - "Id": "D09Z01S13[E]", - "Direction": 2, - "OriginalDoor": "D09Z01S05[W]" - }, - { - "Id": "D09BZ01S01[Cell1]", - "Direction": 7, - "OriginalDoor": "D09Z01S02[Cell1]", - "VisibilityFlags": 1 - }, - { - "Id": "D09BZ01S01[Cell2]", - "Direction": 7, - "OriginalDoor": "D09Z01S02[Cell2]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell3]" ] - }, - { - "Id": "D09BZ01S01[Cell3]", - "Direction": 7, - "OriginalDoor": "D09Z01S02[Cell3]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell2]" ] - }, - { - "Id": "D09BZ01S01[Cell4]", - "Direction": 7, - "OriginalDoor": "D09Z01S02[Cell4]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell5]" ] - }, - { - "Id": "D09BZ01S01[Cell5]", - "Direction": 7, - "OriginalDoor": "D09Z01S02[Cell5]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell4]" ] - }, - { - "Id": "D09BZ01S01[Cell6]", - "Direction": 7, - "OriginalDoor": "D09Z01S02[Cell6]", - "VisibilityFlags": 1 - }, - { - "Id": "D09BZ01S01[Cell7]", - "Direction": 7, - "OriginalDoor": "D09Z01S08[Cell7]", - "VisibilityFlags": 1 - }, - { - "Id": "D09BZ01S01[Cell10]", - "Direction": 7, - "OriginalDoor": "D09Z01S10[Cell10]", - "VisibilityFlags": 1 - }, - { - "Id": "D09BZ01S01[Cell11]", - "Direction": 7, - "OriginalDoor": "D09Z01S10[Cell11]", - "VisibilityFlags": 1 - }, - { - "Id": "D09BZ01S01[Cell12]", - "Direction": 7, - "OriginalDoor": "D09Z01S10[Cell12]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell13]" ] - }, - { - "Id": "D09BZ01S01[Cell13]", - "Direction": 7, - "OriginalDoor": "D09Z01S10[Cell13]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell12]" ] - }, - { - "Id": "D09BZ01S01[Cell14]", - "Direction": 7, - "OriginalDoor": "D09Z01S08[Cell14]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell15]" ] - }, - { - "Id": "D09BZ01S01[Cell15]", - "Direction": 7, - "OriginalDoor": "D09Z01S08[Cell15]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell14]" ] - }, - { - "Id": "D09BZ01S01[Cell16]", - "Direction": 7, - "OriginalDoor": "D09Z01S08[Cell16]", - "VisibilityFlags": 1 - }, - { - "Id": "D09BZ01S01[Cell17]", - "Direction": 7, - "OriginalDoor": "D09Z01S08[Cell17]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell18]" ] - }, - { - "Id": "D09BZ01S01[Cell18]", - "Direction": 7, - "OriginalDoor": "D09Z01S08[Cell18]", - "VisibilityFlags": 1 - }, - { - "Id": "D09BZ01S01[Cell19]", - "Direction": 7, - "OriginalDoor": "D09Z01S09[Cell19]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell20]" ] - }, - { - "Id": "D09BZ01S01[Cell20]", - "Direction": 7, - "OriginalDoor": "D09Z01S09[Cell20]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell19]" ] - }, - { - "Id": "D09BZ01S01[Cell21]", - "Direction": 7, - "OriginalDoor": "D09Z01S09[Cell21]", - "VisibilityFlags": 1 - }, - { - "Id": "D09BZ01S01[Cell22]", - "Direction": 7, - "OriginalDoor": "D09Z01S02[Cell22]", - "VisibilityFlags": 1 - }, - { - "Id": "D09BZ01S01[Cell23]", - "Direction": 7, - "OriginalDoor": "D09Z01S02[Cell23]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D09BZ01S01[Cell22]" ], - "Logic": "bronzeKey" - }, - { - "Id": "D09BZ01S01[Cell24]", - "Direction": 7, - "OriginalDoor": "D09Z01S09[Cell24]", - "VisibilityFlags": 1 - }, - - { - "Id": "D17Z01S01[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S02[W]" - }, - { - "Id": "D17Z01S01[Cherubs1]", - "Direction": 5 - }, - { - "Id": "D17Z01S01[Cherubs2]", - "Direction": 5 - }, - { - "Id": "D17Z01S01[Cherubs3]", - "Direction": 5 - }, - { - "Id": "D17Z01S02[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S01[E]", - "Logic": "D17Z01S02[W] || dash" - }, - { - "Id": "D17Z01S02[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S05[W]", - "Logic": "D17Z01S02[N] || D17Z01S02[E] || dash" - }, - { - "Id": "D17Z01S02[N]", - "Direction": 0, - "OriginalDoor": "D17Z01S10[S]", - "Logic": "D17Z01S02[N] || blood && (D17Z01S02[E] || D17Z01S02[W] && dash)" - }, - { - "Id": "D17Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S11[E]" - }, - { - "Id": "D17Z01S03[E]", - "Direction": 2, - "OriginalDoor": "D01Z01S07[W]", - "Type": 1 - }, - { - "Id": "D17Z01S03[relic]", - "Direction": 4, - "OriginalDoor": "D17BZ01S01[relic]", - "Logic": "elderKey" - }, - { - "Id": "D17Z01S04[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S12[E]" - }, - { - "Id": "D17Z01S04[S]", - "Direction": 3, - "OriginalDoor": "D17Z01S07[N]" - }, - { - "Id": "D17Z01S04[FrontL]", - "Direction": 4, - "OriginalDoor": "D17BZ02S01[FrontL]" - }, - { - "Id": "D17Z01S04[N]", - "Direction": 0, - "OriginalDoor": "D17Z01S05[S]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D17Z01S04[FrontR]" ] - }, - { - "Id": "D17Z01S04[FrontR]", - "Direction": 4, - "OriginalDoor": "D17BZ02S01[FrontR]", - "VisibilityFlags": 3, - "RequiredDoors": [ "D17Z01S04[N]" ] - }, - { - "Id": "D17Z01S05[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S02[E]" - }, - { - "Id": "D17Z01S05[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S11[W]" - }, - { - "Id": "D17Z01S05[S]", - "Direction": 3, - "OriginalDoor": "D17Z01S04[N]", - "Logic": "openedBotSSLadder" - }, - { - "Id": "D17Z01S06[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S07[W]" - }, - { - "Id": "D17Z01S07[SW]", - "Direction": 1, - "OriginalDoor": "D17Z01S08[E]" - }, - { - "Id": "D17Z01S07[SE]", - "Direction": 2, - "OriginalDoor": "D03Z01S05[W]", - "Type": 1 - }, - { - "Id": "D17Z01S07[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S06[E]" - }, - { - "Id": "D17Z01S07[NW]", - "Direction": 1, - "OriginalDoor": "D17Z01S09[E]" - }, - { - "Id": "D17Z01S07[N]", - "Direction": 0, - "OriginalDoor": "D17Z01S04[S]" - }, - { - "Id": "D17Z01S08[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S07[SW]" - }, - { - "Id": "D17Z01S09[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S07[NW]" - }, - { - "Id": "D17Z01S10[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S13[E]", - "Logic": "D17Z01S10[W] || blood || doubleJump" - }, - { - "Id": "D17Z01S10[S]", - "Direction": 3, - "OriginalDoor": "D17Z01S02[N]" - }, - { - "Id": "D17Z01S11[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S05[E]", - "Logic": "D17Z01S11[W] || canBeatBrotherhoodBoss" - }, - { - "Id": "D17Z01S11[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S03[W]", - "Logic": "D17Z01S11[E] || canBeatBrotherhoodBoss" - }, - { - "Id": "D17Z01S12[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S04[W]" - }, - { - "Id": "D17Z01S13[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S14[E]" - }, - { - "Id": "D17Z01S13[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S10[W]" - }, - { - "Id": "D17Z01S14[W]", - "Direction": 1, - "OriginalDoor": "D17Z01S15[E]", - "Logic": "scapular && (D17Z01S14[W] || blood)" - }, - { - "Id": "D17Z01S14[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S13[W]", - "Logic": "D17Z01S14[E] || blood" - }, - { - "Id": "D17Z01S14[-Cherubs1]", - "Direction": 6, - "OriginalDoor": "D17Z01S01[Cherubs1]", - "Logic": "linen && (D17Z01S14[W] || blood || canCrossGap11)" - }, - { - "Id": "D17Z01S14[-Cherubs2]", - "Direction": 6, - "OriginalDoor": "D17Z01S01[Cherubs2]", - "Logic": "linen && (D17Z01S14[E] && canCrossGap8 || D17Z01S14[W] && canCrossGap10 || blood)" - }, - { - "Id": "D17Z01S14[-Cherubs3]", - "Direction": 6, - "OriginalDoor": "D17Z01S01[Cherubs3]", - "Logic": "linen && (D17Z01S14[E] || blood)" - }, - { - "Id": "D17Z01S15[E]", - "Direction": 2, - "OriginalDoor": "D17Z01S14[W]" - }, - { - "Id": "D17BZ01S01[relic]", - "Direction": 7, - "OriginalDoor": "D17Z01S03[relic]" - }, - { - "Id": "D17BZ02S01[FrontL]", - "Direction": 7, - "OriginalDoor": "D17Z01S04[FrontL]", - "VisibilityFlags": 1 - }, - { - "Id": "D17BZ02S01[FrontR]", - "Direction": 7, - "OriginalDoor": "D17Z01S04[FrontR]", - "Logic": "D17BZ02S01[FrontR] || dash && wallClimb" - }, - - { - "Id": "D20Z01S01[W]", - "Direction": 1, - "OriginalDoor": "D03Z02S15[E]", - "Type": 1 - }, - { - "Id": "D20Z01S01[E]", - "Direction": 2, - "OriginalDoor": "D20Z01S02[W]" - }, - { - "Id": "D20Z01S01[S]", - "Direction": 3, - "OriginalDoor": "D20Z01S04[N]" - }, - { - "Id": "D20Z01S01[Cherubs]", - "Direction": 5 - }, - { - "Id": "D20Z01S02[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S01[E]" - }, - { - "Id": "D20Z01S02[E]", - "Direction": 2, - "OriginalDoor": "D20Z01S03[W]" - }, - { - "Id": "D20Z01S03[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S02[E]" - }, - { - "Id": "D20Z01S03[N]", - "Direction": 0, - "OriginalDoor": "D03Z01S01[S]", - "Type": 1 - }, - { - "Id": "D20Z01S04[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S05[E]" - }, - { - "Id": "D20Z01S04[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S24[W]", - "Type": 1, - "Logic": "openedDCGateW" - }, - { - "Id": "D20Z01S04[N]", - "Direction": 0, - "OriginalDoor": "D20Z01S01[S]" - }, - { - "Id": "D20Z01S05[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S06[NE]" - }, - { - "Id": "D20Z01S05[E]", - "Direction": 2, - "OriginalDoor": "D20Z01S04[W]" - }, - { - "Id": "D20Z01S06[NE]", - "Direction": 2, - "OriginalDoor": "D20Z01S05[W]" - }, - { - "Id": "D20Z01S06[SE]", - "Direction": 2, - "OriginalDoor": "D20Z01S07[NW]" - }, - { - "Id": "D20Z01S07[NW]", - "Direction": 1, - "OriginalDoor": "D20Z01S06[SE]" - }, - { - "Id": "D20Z01S07[NE]", - "Direction": 2, - "OriginalDoor": "D20Z01S08[W]" - }, - { - "Id": "D20Z01S07[SE]", - "Direction": 2, - "OriginalDoor": "D20Z01S09[W]" - }, - { - "Id": "D20Z01S08[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S07[NE]" - }, - { - "Id": "D20Z01S09[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S07[SE]", - "Logic": "D20Z01S09[W] || dash" - }, - { - "Id": "D20Z01S09[E]", - "Direction": 2, - "OriginalDoor": "D01Z05S25[EchoesW]", - "Type": 1, - "Logic": "D20Z01S09[E] || blood && dash" - }, - { - "Id": "D20Z01S10[W]", - "Direction": 1, - "OriginalDoor": "D01Z05S25[EchoesE]", - "Type": 1, - "Logic": "D20Z01S10[W] || blood && dash" - }, - { - "Id": "D20Z01S10[E]", - "Direction": 2, - "OriginalDoor": "D20Z01S11[W]", - "Logic": "D20Z01S10[E] || blood && dash" - }, - { - "Id": "D20Z01S11[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S10[E]" - }, - { - "Id": "D20Z01S11[NW]", - "Direction": 1, - "OriginalDoor": "D20Z01S12[E]" - }, - { - "Id": "D20Z01S11[NE]", - "Direction": 2, - "OriginalDoor": "D20Z01S13[W]" - }, - { - "Id": "D20Z01S11[SE]", - "Direction": 2, - "OriginalDoor": "D20Z02S12[W]", - "Type": 1 - }, - { - "Id": "D20Z01S12[E]", - "Direction": 2, - "OriginalDoor": "D20Z01S11[NW]" - }, - { - "Id": "D20Z01S13[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S11[NE]" - }, - { - "Id": "D20Z01S13[E]", - "Direction": 2, - "OriginalDoor": "D20Z02S11[NW]", - "Type": 1 - }, - { - "Id": "D20Z01S13[N]", - "Direction": 0, - "OriginalDoor": "D20Z01S14[S]" - }, - { - "Id": "D20Z01S14[S]", - "Direction": 3, - "OriginalDoor": "D20Z01S13[N]" - }, - { - "Id": "D20Z01S14[E]", - "Direction": 2, - "OriginalDoor": "D20Z03S01[W]", - "Type": 1 - }, - - { - "Id": "D20Z02S01[W]", - "Direction": 1, - "OriginalDoor": "D20Z02S03[SE]" - }, - { - "Id": "D20Z02S01[E]", - "Direction": 2, - "OriginalDoor": "D04Z02S24[SW]", - "Type": 1 - }, - { - "Id": "D20Z02S02[W]", - "Direction": 1, - "OriginalDoor": "D20Z02S03[NE]" - }, - { - "Id": "D20Z02S03[W]", - "Direction": 1, - "OriginalDoor": "D20Z02S04[E]" - }, - { - "Id": "D20Z02S03[NE]", - "Direction": 2, - "OriginalDoor": "D20Z02S02[W]", - "Logic": "D20Z02S03[NE] || canWalkOnRoot || canCrossGap5" - }, - { - "Id": "D20Z02S03[SE]", - "Direction": 2, - "OriginalDoor": "D20Z02S01[W]" - }, - { - "Id": "D20Z02S04[W]", - "Direction": 1, - "OriginalDoor": "D20Z02S05[E]", - "Logic": "D20Z02S04[W] || dash" - }, - { - "Id": "D20Z02S04[E]", - "Direction": 2, - "OriginalDoor": "D20Z02S03[W]", - "Logic": "D20Z02S04[E] || dash" - }, - { - "Id": "D20Z02S05[SW]", - "Direction": 1, - "OriginalDoor": "D20Z02S06[SE]" - }, - { - "Id": "D20Z02S05[NW]", - "Direction": 1, - "OriginalDoor": "D20Z02S06[NE]", - "Logic": "D20Z02S05[NW] || nail || canCrossGap3" - }, - { - "Id": "D20Z02S05[E]", - "Direction": 2, - "OriginalDoor": "D20Z02S04[W]" - }, - { - "Id": "D20Z02S06[SW]", - "Direction": 1, - "OriginalDoor": "D20Z02S09[E]" - }, - { - "Id": "D20Z02S06[SE]", - "Direction": 2, - "OriginalDoor": "D20Z02S05[SW]" - }, - { - "Id": "D20Z02S06[NW]", - "Direction": 1, - "OriginalDoor": "D20Z02S07[E]", - "Logic": "D20Z02S06[NW] || D20Z02S06[NE] || doubleJump || canClimbOnRoot || canDiveLaser" - }, - { - "Id": "D20Z02S06[NE]", - "Direction": 2, - "OriginalDoor": "D20Z02S05[NW]", - "Logic": "D20Z02S06[NW] || D20Z02S06[NE] || doubleJump || canClimbOnRoot || canDiveLaser" - }, - { - "Id": "D20Z02S07[W]", - "Direction": 1, - "OriginalDoor": "D20Z02S08[E]" - }, - { - "Id": "D20Z02S07[E]", - "Direction": 2, - "OriginalDoor": "D20Z02S06[NW]" - }, - { - "Id": "D20Z02S08[E]", - "Direction": 2, - "OriginalDoor": "D20Z02S07[W]" - }, - { - "Id": "D20Z02S09[W]", - "Direction": 1, - "OriginalDoor": "D20Z02S10[E]" - }, - { - "Id": "D20Z02S09[E]", - "Direction": 2, - "OriginalDoor": "D20Z02S06[SW]" - }, - { - "Id": "D20Z02S10[W]", - "Direction": 1, - "OriginalDoor": "D20Z02S11[E]" - }, - { - "Id": "D20Z02S10[E]", - "Direction": 2, - "OriginalDoor": "D20Z02S09[W]" - }, - { - "Id": "D20Z02S11[SW]", - "Direction": 1, - "OriginalDoor": "D20Z02S12[E]" - }, - { - "Id": "D20Z02S11[NW]", - "Direction": 1, - "OriginalDoor": "D20Z01S13[E]", - "Type": 1, - "VisibilityFlags": 5, - "RequiredDoors": [ "D20Z02S11[E]" ], - "Logic": "D20Z02S11[NW] || mourningSkipAllowed && (doubleJump || canBreakTirana || D20Z02S11[E])" - }, - { - "Id": "D20Z02S11[E]", - "Direction": 2, - "OriginalDoor": "D20Z02S10[W]", - "VisibilityFlags": 5, - "Logic": "D20Z02S11[E] || mourningSkipAllowed && (doubleJump || canBreakTirana || D20Z02S11[NW] && canCrossGap5)" - }, - { - "Id": "D20Z02S12[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S11[SE]", - "Type": 1 - }, - { - "Id": "D20Z02S12[E]", - "Direction": 2, - "OriginalDoor": "D20Z02S11[SW]" - }, - - { - "Id": "D20Z03S01[W]", - "Direction": 1, - "OriginalDoor": "D20Z01S14[E]", - "Type": 1 - }, -] \ No newline at end of file diff --git a/worlds/blasphemous/Rules.py b/worlds/blasphemous/Rules.py index 5d8829213163..119e618dc22f 100644 --- a/worlds/blasphemous/Rules.py +++ b/worlds/blasphemous/Rules.py @@ -1,4458 +1,1388 @@ -from typing import Dict, List, Set -from worlds.generic.Rules import set_rule, add_rule +from typing import Dict, List, Tuple, Any, Callable, TYPE_CHECKING from BaseClasses import CollectionState +if TYPE_CHECKING: + from . import BlasphemousWorld +else: + BlasphemousWorld = object + + +class BlasRules: + player: int + world: BlasphemousWorld + string_rules: Dict[str, Callable[[CollectionState], bool]] + + def __init__(self, world: "BlasphemousWorld") -> None: + self.player = world.player + self.world = world + self.multiworld = world.multiworld + self.indirect_conditions: List[Tuple[str, str]] = [] + + # BrandenEK/Blasphemous.Randomizer/ItemRando/BlasphemousInventory.cs + self.string_rules = { + # Visibility flags + "DoubleJump": lambda state: bool(self.world.options.purified_hand), + "NormalLogic": lambda state: self.world.options.difficulty >= 1, + "NormalLogicAndDoubleJump": lambda state: self.world.options.difficulty >= 1 \ + and bool(self.world.options.purified_hand), + "HardLogic": lambda state: self.world.options.difficulty >= 2, + "HardLogicAndDoubleJump": lambda state: self.world.options.difficulty >= 2 \ + and bool(self.world.options.purified_hand), + "EnemySkips": self.enemy_skips_allowed, + "EnemySkipsAndDoubleJump": lambda state: self.enemy_skips_allowed(state) \ + and bool(self.world.options.purified_hand), + + # Relics + "blood": self.blood, + # skip "root" + "linen": self.linen, + "nail": self.nail, + "shroud": self.shroud, + # skip "lung" + + # Keys + "bronzeKey": self.bronze_key, + "silverKey": self.silver_key, + "goldKey": self.gold_key, + "peaksKey": self.peaks_key, + "elderKey": self.elder_key, + "woodKey": self.wood_key, + + # Collections + "cherubs20": lambda state: self.cherubs(state) >= 20, + "cherubs38": lambda state: self.cherubs(state) >= 38, + + "bones4": lambda state: self.bones(state) >= 4, + "bones8": lambda state: self.bones(state) >= 8, + "bones12": lambda state: self.bones(state) >= 12, + "bones16": lambda state: self.bones(state) >= 16, + "bones20": lambda state: self.bones(state) >= 20, + "bones24": lambda state: self.bones(state) >= 24, + "bones28": lambda state: self.bones(state) >= 28, + "bones30": lambda state: self.bones(state) >= 30, + "bones32": lambda state: self.bones(state) >= 32, + "bones36": lambda state: self.bones(state) >= 36, + "bones40": lambda state: self.bones(state) >= 40, + "bones44": lambda state: self.bones(state) >= 44, + + "tears0": lambda state: True, + + # Special items + "dash": self.dash, + "wallClimb": self.wall_climb, + # skip "airImpulse" + "boots": self.boots, + "doubleJump": self.double_jump, + + # Speed boosts + "wheel": self.wheel, + # skip "dawnHeart" + + # Health boosts + # skip "flasks" + # skip "quicksilver" + + # Puzzles + "redWax1": lambda state: self.red_wax(state) >= 1, + "redWax3": lambda state: self.red_wax(state) >= 3, + "blueWax1": lambda state: self.blue_wax(state) >= 1, + "blueWax3": lambda state: self.blue_wax(state) >= 3, + "chalice": self.chalice, + + # Cherubs + "debla": self.debla, + "lorquiana": self.lorquiana, + "zarabanda": self.zarabanda, + "taranto": self.taranto, + "verdiales": self.verdiales, + "cante": self.cante, + "cantina": self.cantina, + + "aubade": self.aubade, + "tirana": self.tirana, + + "ruby": self.ruby, + "tiento": self.tiento, + # skip "anyPrayer" + "pillar": self.pillar, + + # Stats + # skip "healthLevel" + # skip "fervourLevel" + # skip "swordLevel" + + # Skills + # skip "combo" + # skip "charged" + # skip "ranged" + # skip "dive" + # skip "lunge" + "chargeBeam": self.charge_beam, + "rangedAttack": lambda state: self.ranged(state) > 0, + + # Main quest + "holyWounds3": lambda state: self.holy_wounds(state) >= 3, + "masks1": lambda state: self.masks(state) >= 1, + "masks2": lambda state: self.masks(state) >= 2, + "masks3": lambda state: self.masks(state) >= 3, + "guiltBead": self.guilt_bead, + + # LOTL quest + "cloth": self.cloth, + "hand": self.hand, + "hatchedEgg": self.hatched_egg, + + # Tirso quest + "herbs1": lambda state: self.herbs(state) >= 1, + "herbs2": lambda state: self.herbs(state) >= 2, + "herbs3": lambda state: self.herbs(state) >= 3, + "herbs4": lambda state: self.herbs(state) >= 4, + "herbs5": lambda state: self.herbs(state) >= 5, + "herbs6": lambda state: self.herbs(state) >= 6, + + # Tentudia quest + "tentudiaRemains1": lambda state: self.tentudia_remains(state) >= 1, + "tentudiaRemains2": lambda state: self.tentudia_remains(state) >= 2, + "tentudiaRemains3": lambda state: self.tentudia_remains(state) >= 3, + + # Gemino quest + "emptyThimble": self.empty_thimble, + "fullThimble": self.full_thimble, + "driedFlowers": self.dried_flowers, + + # Altasgracias quest + "ceremonyItems3": lambda state: self.ceremony_items(state) >= 3, + "egg": self.egg, + + # Redento quest + # skip "limestones", not actually used + # skip "knots", not actually used + + # Cleofas quest + "marksOfRefuge3": lambda state: self.marks_of_refuge(state) >= 3, + "cord": self.cord, + + # Crisanta quest + "scapular": self.scapular, + "trueHeart": self.true_heart, + "traitorEyes2": lambda state: self.traitor_eyes(state) >= 2, + + # Jibrael quest + "bell": self.bell, + "verses4": lambda state: self.verses(state) >= 4, + + # Movement tech + "canAirStall": self.can_air_stall, + "canDawnJump": self.can_dawn_jump, + "canWaterJump": self.can_water_jump, + + # Breakable tech + "canBreakHoles": self.can_break_holes, + "canDiveLaser": self.can_dive_laser, + + # Root tech + "canWalkOnRoot": self.can_walk_on_root, + "canClimbOnRoot": self.can_climb_on_root, + + # Lung tech + "canSurvivePoison1": self.can_survive_poison_1, + "canSurvivePoison2": self.can_survive_poison_2, + "canSurvivePoison3": self.can_survive_poison_3, + + # Enemy tech + "canEnemyBounce": self.can_enemy_bounce, + "canEnemyUpslash": self.can_enemy_upslash, + + # Reaching rooms + "guiltRooms1": lambda state: self.guilt_rooms(state) >= 1, + "guiltRooms2": lambda state: self.guilt_rooms(state) >= 2, + "guiltRooms3": lambda state: self.guilt_rooms(state) >= 3, + "guiltRooms4": lambda state: self.guilt_rooms(state) >= 4, + "guiltRooms5": lambda state: self.guilt_rooms(state) >= 5, + "guiltRooms6": lambda state: self.guilt_rooms(state) >= 6, + "guiltRooms7": lambda state: self.guilt_rooms(state) >= 7, + + "swordRooms1": lambda state: self.sword_rooms(state) >= 1, + "swordRooms2": lambda state: self.sword_rooms(state) >= 2, + "swordRooms3": lambda state: self.sword_rooms(state) >= 3, + "swordRooms4": lambda state: self.sword_rooms(state) >= 4, + "swordRooms5": lambda state: self.sword_rooms(state) >= 5, + "swordRooms6": lambda state: self.sword_rooms(state) >= 6, + "swordRooms7": lambda state: self.sword_rooms(state) >= 7, + + "redentoRooms2": lambda state: self.redento_rooms(state) >= 2, + "redentoRooms3": lambda state: self.redento_rooms(state) >= 3, + "redentoRooms4": lambda state: self.redento_rooms(state) >= 4, + "redentoRooms5": lambda state: self.redento_rooms(state) >= 5, + + "miriamRooms5": lambda state: self.miriam_rooms(state) >= 5, + + "amanecidaRooms1": lambda state: self.amanecida_rooms(state) >= 1, + "amanecidaRooms2": lambda state: self.amanecida_rooms(state) >= 2, + "amanecidaRooms3": lambda state: self.amanecida_rooms(state) >= 3, + "amanecidaRooms4": lambda state: self.amanecida_rooms(state) >= 4, + + "chaliceRooms3": lambda state: self.chalice_rooms(state) >= 3, + + # Crossing gaps + "canCrossGap1": self.can_cross_gap_1, + "canCrossGap2": self.can_cross_gap_2, + "canCrossGap3": self.can_cross_gap_3, + "canCrossGap4": self.can_cross_gap_4, + "canCrossGap5": self.can_cross_gap_5, + "canCrossGap6": self.can_cross_gap_6, + "canCrossGap7": self.can_cross_gap_7, + "canCrossGap8": self.can_cross_gap_8, + "canCrossGap9": self.can_cross_gap_9, + "canCrossGap10": self.can_cross_gap_10, + "canCrossGap11": self.can_cross_gap_11, + + # Events in different scenes + "openedDCGateW": self.opened_dc_gate_w, + "openedDCGateE": self.opened_dc_gate_e, + "openedDCLadder": self.opened_dc_ladder, + "openedWOTWCave": self.opened_wotw_cave, + "rodeGotPElevator": self.rode_gotp_elevator, + "openedConventLadder": self.opened_convent_ladder, + "brokeJondoBellW": self.broke_jondo_bell_w, + "brokeJondoBellE": self.broke_jondo_bell_e, + "openedMoMLadder": self.opened_mom_ladder, + "openedTSCGate": self.opened_tsc_gate, + "openedARLadder": self.opened_ar_ladder, + "brokeBotTCStatue": self.broke_bottc_statue, + "openedWotHPGate": self.opened_wothp_gate, + "openedBotSSLadder": self.opened_botss_ladder, + + # Special skips + "upwarpSkipsAllowed": self.upwarp_skips_allowed, + "mourningSkipAllowed": self.mourning_skip_allowed, + "enemySkipsAllowed": self.enemy_skips_allowed, + "obscureSkipsAllowed": self.obscure_skips_allowed, + "preciseSkipsAllowed": self.precise_skips_allowed, + + # Bosses + "canBeatBrotherhoodBoss": self.can_beat_brotherhood_boss, + "canBeatMercyBoss": self.can_beat_mercy_boss, + "canBeatConventBoss": self.can_beat_convent_boss, + "canBeatGrievanceBoss": self.can_beat_grievance_boss, + "canBeatBridgeBoss": self.can_beat_bridge_boss, + "canBeatMothersBoss": self.can_beat_mothers_boss, + "canBeatCanvasesBoss": self.can_beat_canvases_boss, + "canBeatPrisonBoss": self.can_beat_prison_boss, + "canBeatRooftopsBoss": self.can_beat_rooftops_boss, + "canBeatOssuaryBoss": self.can_beat_ossuary_boss, + "canBeatMourningBoss": self.can_beat_mourning_boss, + "canBeatGraveyardBoss": self.can_beat_graveyard_boss, + "canBeatJondoBoss": self.can_beat_jondo_boss, + "canBeatPatioBoss": self.can_beat_patio_boss, + "canBeatWallBoss": self.can_beat_wall_boss, + "canBeatHallBoss": self.can_beat_hall_boss, + "canBeatPerpetua": self.can_beat_perpetua, + "canBeatLegionary": self.can_beat_legionary + } -def total_fervour(state: CollectionState, player: int) -> int: - totalFervour: int = 60 + (20 * state.count("Fervour Upgrade", player)) + (10 * state.count("Bead of Blue Wax", player)) - - return totalFervour - - -def aubade(state: CollectionState, player: int) -> bool: - return state.has("Aubade of the Nameless Guardian", player) if total_fervour(state, player) >= 90 else False - - -def tirana(state: CollectionState, player: int) -> bool: - return state.has("Tirana of the Celestial Bastion", player) if total_fervour(state, player) >= 90 else False - - -def pillar(state: CollectionState, player: int) -> bool: - return state.has_any({"Debla of the Lights", "Taranto to my Sister", "Cloistered Ruby"}, player) + boss_strength_indirect_regions: List[str] = [ + # flasks + "D01Z05S05[SW]", + "D02Z02S04[W]", + "D03Z02S08[W]", + "D03Z03S04[SW]", + "D04Z02S13[W]", + "D05Z01S08[NW]", + "D20Z01S07[NE]", + # quicksilver + "D01Z05S01[W]" + ] + + guilt_indirect_regions: List[str] = [ + "D01Z04S01[NE]", + "D02Z02S11[W]", + "D03Z03S02[NE]", + "D04Z02S02[SE]", + "D05Z01S05[NE]", + "D09Z01S05[W]", + "D17Z01S04[W]" + ] + + sword_indirect_regions: List[str] = [ + "D01Z02S07[E]", + "D01Z02S02[SW]", + "D20Z01S04[E]", + "D01Z05S23[W]", + "D02Z03S02[NE]", + "D04Z02S21[NE]", + "D05Z01S21[NW]", + "D06Z01S15[NE]", + "D17Z01S07[SW]" + ] + + redento_indirect_regions: List[str] = [ + "D03Z01S04[E]", + "D03Z02S10[N]", + "D17Z01S05[S]", + "D17BZ02S01[FrontR]", + "D01Z03S04[E]", + "D08Z01S01[W]", + "D04Z01S03[E]", + "D04Z02S01[W]", + "D06Z01S18[-Cherubs]", + "D04Z02S08[E]", + "D04BZ02S01[Redento]", + "D17Z01S07[NW]" + ] + + miriam_indirect_regions: List[str] = [ + "D02Z03S07[NWW]", + "D03Z03S07[NW]", + "D04Z04S01[E]", + "D05Z01S06[W]", + "D06Z01S17[E]" + ] + + chalice_indirect_regions: List[str] = [ + "D03Z01S02[E]", + "D01Z05S02[W]", + "D20Z01S03[N]", + "D05Z01S11[SE]", + "D05Z02S02[NW]", + "D09Z01S09[E]", + "D09Z01S10[W]", + "D09Z01S08[SE]", + "D09Z01S02[SW]" + ] + + self.indirect_regions: Dict[str, List[str]] = { + "openedDCGateW": ["D20Z01S04[E]", + "D01Z05S23[W]"], + "openedDCGateE": ["D01Z05S10[SE]", + "D01Z04S09[W]"], + "openedDCLadder": ["D01Z05S25[NE]", + "D01Z05S02[S]"], + "openedWOTWCave": ["D02Z01S01[SW]", + "D02Z01S08[E]", + "D02Z01S02[]"], + "rodeGotPElevator": ["D02Z03S14[E]", + "D02Z02S13[W]", + "D02Z02S06[E]", + "D02Z02S12[W]", + "D02Z02S08[W]"], + "openedConventLadder": ["D02Z03S02[N]", + "D02Z03S15[E]", + "D02Z03S19[E]", + "D02Z03S10[W]", + "D02Z03S22[W]"], + "brokeJondoBellW": ["D03Z02S08[N]", + "D03Z02S12[E]", + "D03Z02S10[S]", + "D03Z02S10[-Cherubs]"], + "brokeJondoBellE": ["D03Z02S04[NE]", + "D03Z02S11[W]", + "D03Z02S03[E]"], + "openedMoMLadder": ["D04Z02S11[E]", + "D04Z02S09[W]", + "D06Z01S23[S]", + "D04Z02S04[N]"], + "openedTSCGate": ["D05Z02S06[SE]", + "D05Z01S21[-Cherubs]"], + "openedARLadder": ["D06Z01S22[Sword]", + "D06Z01S20[W]", + "D04Z02S06[N]", + "D06Z01S01[-Cherubs]"], + "brokeBotTCStatue": ["D08Z03S03[W]", + "D08Z02S03[W]"], + "openedWotHPGate": ["D09Z01S13[E]", + "D09Z01S03[W]", + "D09Z01S08[W]"], + "openedBotSSLadder": ["D17Z01S05[S]", + "D17BZ02S01[FrontR]"], + "canBeatBrotherhoodBoss": [*boss_strength_indirect_regions, + "D17Z01S05[E]", + "D17Z01S03[W]"], + "canBeatMercyBoss": [*boss_strength_indirect_regions, + "D01Z04S19[E]", + "D01Z04S12[W]"], + "canBeatConventBoss": [*boss_strength_indirect_regions, + "D02Z03S09[E]", + "D02Z03S21[W]"], + "canBeatGrievanceBoss": [*boss_strength_indirect_regions, + "D03Z03S11[E]", + "D03Z03S16[W]"], + "canBeatBridgeBoss": [*boss_strength_indirect_regions, + "D01Z03S06[E]", + "D08Z02S01[W]"], + "canBeatMothersBoss": [*boss_strength_indirect_regions, + "D04Z02S15[E]", + "D04Z02S21[W]"], + "canBeatCanvasesBoss": [*boss_strength_indirect_regions, + "D05Z02S06[NE]", + "D05Z01S21[SW]"], + "canBeatPrisonBoss": [*boss_strength_indirect_regions, + "D09Z01S05[SE]", + "D09Z01S08[S]"], + "canBeatRooftopsBoss": [*boss_strength_indirect_regions, + "D06Z01S19[E]", + "D07Z01S01[W]"], + "canBeatOssuaryBoss": [*boss_strength_indirect_regions, + "D01BZ06S01[E]"], + "canBeatMourningBoss": [*boss_strength_indirect_regions, + "D20Z02S07[W]"], + "canBeatGraveyardBoss": [*boss_strength_indirect_regions, + "D01Z06S01[Santos]", + "D02Z03S18[NW]", + "D02Z02S03[NE]"], + "canBeatJondoBoss": [*boss_strength_indirect_regions, + "D01Z06S01[Santos]", + "D20Z01S06[NE]", + "D20Z01S04[W]", + "D03Z01S04[E]", + "D03Z02S10[N]"], + "canBeatPatioBoss": [*boss_strength_indirect_regions, + "D01Z06S01[Santos]", + "D06Z01S02[W]", + "D04Z01S03[E]", + "D04Z01S01[W]", + "D06Z01S18[-Cherubs]"], + "canBeatWallBoss": [*boss_strength_indirect_regions, + "D01Z06S01[Santos]", + "D09Z01S09[Cell24]", + "D09Z01S11[E]", + "D06Z01S13[W]"], + "canBeatHallBoss": [*boss_strength_indirect_regions, + "D08Z01S02[NE]", + "D08Z03S02[NW]"], + "canBeatPerpetua": boss_strength_indirect_regions, + "canBeatLegionary": boss_strength_indirect_regions, + "guiltRooms1": guilt_indirect_regions, + "guiltRooms2": guilt_indirect_regions, + "guiltRooms3": guilt_indirect_regions, + "guiltRooms4": guilt_indirect_regions, + "guiltRooms5": guilt_indirect_regions, + "guiltRooms6": guilt_indirect_regions, + "guiltRooms7": guilt_indirect_regions, + "swordRooms1": sword_indirect_regions, + "swordRooms2": sword_indirect_regions, + "swordRooms3": sword_indirect_regions, + "swordRooms4": sword_indirect_regions, + "swordRooms5": sword_indirect_regions, + "swordRooms6": sword_indirect_regions, + "swordRooms7": sword_indirect_regions, + "redentoRooms2": redento_indirect_regions, + "redentoRooms3": redento_indirect_regions, + "redentoRooms4": redento_indirect_regions, + "redentoRooms5": redento_indirect_regions, + "miriamRooms5": miriam_indirect_regions, + "chaliceRooms3": chalice_indirect_regions + } + self.indirect_regions["amanecidaRooms1"] = [*self.indirect_regions["canBeatGraveyardBoss"], + *self.indirect_regions["canBeatJondoBoss"], + *self.indirect_regions["canBeatPatioBoss"], + *self.indirect_regions["canBeatWallBoss"]] + self.indirect_regions["amanecidaRooms2"] = [*self.indirect_regions["canBeatGraveyardBoss"], + *self.indirect_regions["canBeatJondoBoss"], + *self.indirect_regions["canBeatPatioBoss"], + *self.indirect_regions["canBeatWallBoss"]] + self.indirect_regions["amanecidaRooms3"] = [*self.indirect_regions["canBeatGraveyardBoss"], + *self.indirect_regions["canBeatJondoBoss"], + *self.indirect_regions["canBeatPatioBoss"], + *self.indirect_regions["canBeatWallBoss"]] + self.indirect_regions["amanecidaRooms4"] = [*self.indirect_regions["canBeatGraveyardBoss"], + *self.indirect_regions["canBeatJondoBoss"], + *self.indirect_regions["canBeatPatioBoss"], + *self.indirect_regions["canBeatWallBoss"]] + + + def req_is_region(self, string: str) -> bool: + return (string[0] == "D" and string[3] == "Z" and string[6] == "S")\ + or (string[0] == "D" and string[3] == "B" and string[4] == "Z" and string[7] == "S") + + def load_rule(self, obj_is_region: bool, name: str, obj: Dict[str, Any]) -> Callable[[CollectionState], bool]: + clauses = [] + for clause in obj["logic"]: + reqs = [] + for req in clause["item_requirements"]: + if self.req_is_region(req): + if obj_is_region: + # add to indirect conditions if object and requirement are doors + self.indirect_conditions.append((req, f"{name} -> {obj['target']}")) + reqs.append(lambda state, req=req: state.can_reach_region(req, self.player)) + else: + if obj_is_region and req in self.indirect_regions: + # add to indirect conditions if object is door and requirement has list of regions + for region in self.indirect_regions[req]: + self.indirect_conditions.append((region, f"{name} -> {obj['target']}")) + reqs.append(self.string_rules[req]) + if len(reqs) == 1: + clauses.append(reqs[0]) + else: + clauses.append(lambda state, reqs=reqs: all(req(state) for req in reqs)) + if not clauses: + return lambda state: True + elif len(clauses) == 1: + return clauses[0] + else: + return lambda state: any(clause(state) for clause in clauses) -def charge_beam(state: CollectionState, player: int) -> bool: - return state.has("Charged Skill", player, 3) + # Relics + def blood(self, state: CollectionState) -> bool: + return state.has("Blood Perpetuated in Sand", self.player) + + def root(self, state: CollectionState) -> bool: + return state.has("Three Gnarled Tongues", self.player) + def linen(self, state: CollectionState) -> bool: + return state.has("Linen of Golden Thread", self.player) + + def nail(self, state: CollectionState) -> bool: + return state.has("Nail Uprooted from Dirt", self.player) + + def shroud(self, state: CollectionState) -> bool: + return state.has("Shroud of Dreamt Sins", self.player) -def can_air_stall(state: CollectionState, logic: int, player: int) -> bool: - return state.has("Ranged Skill", player) if logic >= 1 else False + def lung(self, state: CollectionState) -> bool: + return state.has("Silvered Lung of Dolphos", self.player) + + # Keys + def bronze_key(self, state: CollectionState) -> bool: + return state.has("Key of the Secular", self.player) + + def silver_key(self, state: CollectionState) -> bool: + return state.has("Key of the Scribe", self.player) + + def gold_key(self, state: CollectionState) -> bool: + return state.has("Key of the Inquisitor", self.player) + def peaks_key(self, state: CollectionState) -> bool: + return state.has("Key of the High Peaks", self.player) + + def elder_key(self, state: CollectionState) -> bool: + return state.has("Key to the Chamber of the Eldest Brother", self.player) + + def wood_key(self, state: CollectionState) -> bool: + return state.has("Key Grown from Twisted Wood", self.player) + + # Collections + def cherubs(self, state: CollectionState) -> int: + return state.count("Child of Moonlight", self.player) + + def bones(self, state: CollectionState) -> int: + return state.count_group_unique("bones", self.player) + + # def tears(): -def can_dawn_jump(state: CollectionState, logic: int, player: int) -> bool: - return state.has_all({"Brilliant Heart of Dawn", "Dash Ability"}, player) if logic >= 1 else False + # Special items + def dash(self, state: CollectionState) -> bool: + return state.has("Dash Ability", self.player) + def wall_climb(self, state: CollectionState) -> bool: + return state.has("Wall Climb Ability", self.player) + + #def air_impulse(): -def can_water_jump(state: CollectionState, player: int) -> bool: - return state.has_any({"Nail Uprooted from Dirt", "Purified Hand of the Nun"}, player) + def boots(self, state: CollectionState) -> bool: + return state.has("Boots of Pleading", self.player) + + def double_jump(self, state: CollectionState) -> bool: + return state.has("Purified Hand of the Nun", self.player) + + # Speed boosts + def wheel(self, state: CollectionState) -> bool: + return state.has("The Young Mason's Wheel", self.player) + + def dawn_heart(self, state: CollectionState) -> bool: + return state.has("Brilliant Heart of Dawn", self.player) + + # Health boosts + def flasks(self, state: CollectionState) -> int: + doors = { + "D01Z05S05[SW]", + "D02Z02S04[W]", + "D03Z02S08[W]", + "D03Z03S04[SW]", + "D04Z02S13[W]", + "D05Z01S08[NW]", + "D20Z01S07[NE]" + } + return state.count("Empty Bile Vessel", self.player) \ + if sum(state.can_reach_region(door, self.player) for door in doors) >= 1 else 0 + + def quicksilver(self, state: CollectionState) -> int: + return state.count("Quicksilver", self.player) if state.can_reach_region("D01Z05S01[W]", self.player) else 0 + + # Puzzles + def red_wax(self, state: CollectionState) -> int: + return state.count("Bead of Red Wax", self.player) + + def blue_wax(self, state: CollectionState) -> int: + return state.count("Bead of Blue Wax", self.player) + + def chalice(self, state: CollectionState) -> bool: + return state.has("Chalice of Inverted Verses", self.player) + + # Cherubs + def debla(self, state: CollectionState) -> bool: + return state.has("Debla of the Lights", self.player) + + def lorquiana(self, state: CollectionState) -> bool: + return state.has("Lorquiana", self.player) + + def zarabanda(self, state: CollectionState) -> bool: + return state.has("Zarabanda of the Safe Haven", self.player) + + def taranto(self, state: CollectionState) -> bool: + return state.has("Taranto to my Sister", self.player) + + def verdiales(self, state: CollectionState) -> bool: + return state.has("Verdiales of the Forsaken Hamlet", self.player) + + def cante(self, state: CollectionState) -> bool: + return state.has("Cante Jondo of the Three Sisters", self.player) + + def cantina(self, state: CollectionState) -> bool: + return state.has("Cantina of the Blue Rose", self.player) -def can_break_holes(state: CollectionState, player: int) -> bool: - return ( - state.has_any({"Charged Skill", "Dive Skill"}, player) - or ( - state.has("Lunge Skill", player, 3) - and state.has("Dash Ability", player) + def aubade(self, state: CollectionState) -> bool: + return ( + state.has("Aubade of the Nameless Guardian", self.player) + and self.total_fervour(state) >= 90 + ) + + def tirana(self, state: CollectionState) -> bool: + return ( + state.has("Tirana of the Celestial Bastion", self.player) + and self.total_fervour(state) >= 90 ) - or state.has_group("prayer", player) - or aubade(state, player) - or tirana(state, player) - ) - - -def can_break_tirana(state: CollectionState, logic: int, player: int) -> bool: - return tirana(state, player) if logic >= 2 else False - - -def can_dive_laser(state: CollectionState, logic: int, player: int) -> bool: - return state.has("Dive Skill", player, 3) if logic >= 2 else False - - -def can_walk_on_root(state: CollectionState, player: int) -> bool: - return state.has("Three Gnarled Tongues", player) - - -def can_climb_on_root(state: CollectionState, player: int) -> bool: - return state.has_all({"Three Gnarled Tongues", "Wall Climb Ability"}, player) - - -def can_survive_poison(state: CollectionState, logic: int, player: int, number: int) -> bool: - if number == 1: - if logic >= 2: - return True - elif logic == 1: - return state.has_any({"Silvered Lung of Dolphos", "Tiento to your Thorned Hairs"}, player) - elif logic == 0: - return state.has("Silvered Lung of Dolphos", player) - elif number == 2: - if logic >= 1: - return state.has_any({"Silvered Lung of Dolphos", "Tiento to your Thorned Hairs"}, player) - else: - return state.has("Silvered Lung of Dolphos", player) - elif number == 3: - if logic >= 2 and total_fervour(state, player) >= 120: - return state.has_any({"Silvered Lung of Dolphos", "Tiento to your Thorned Hairs"}, player) - else: - return state.has("Silvered Lung of Dolphos", player) + def ruby(self, state: CollectionState) -> bool: + return state.has("Cloistered Ruby", self.player) + + def tiento(self, state: CollectionState) -> bool: + return state.has("Tiento to my Sister", self.player) + + def any_small_prayer(self, state: CollectionState) -> bool: + return ( + self.debla(state) + or self.lorquiana(state) + or self.zarabanda(state) + or self.taranto(state) + or self.verdiales(state) + or self.cante(state) + or self.cantina(state) + or self.tiento(state) + or state.has_any({ + "Campanillero to the Sons of the Aurora", + "Mirabras of the Return to Port", + "Romance to the Crimson Mist", + "Saeta Dolorosa", + "Seguiriya to your Eyes like Stars", + "Verdiales of the Forsaken Hamlet", + "Zambra to the Resplendent Crown" + }, self.player) + ) + + def pillar(self, state: CollectionState) -> bool: + return ( + self.debla(state) + or self.taranto(state) + or self.ruby(state) + ) + + def can_use_any_prayer(self, state: CollectionState) -> bool: + return ( + self.any_small_prayer(state) + or self.tirana(state) + or self.aubade(state) + ) -def can_enemy_bounce(logic: int, enemy: int) -> bool: # TODO - return enemy_skips_allowed(logic, enemy) + # Stats + def total_fervour(self, state: CollectionState) -> int: + return ( + 60 + + (20 * min(6, state.count("Fervour Upgrade", self.player))) + + (10 * min(3, state.count("Bead of Blue Wax", self.player))) + ) + # Skills + def combo(self, state: CollectionState) -> int: + return state.count("Combo Skill", self.player) -def can_enemy_upslash(state: CollectionState, logic: int, enemy: int, player: int) -> bool: - return state.has("Combo Skill", player, 2) and \ - enemy_skips_allowed(logic, enemy) + def charged(self, state: CollectionState) -> int: + return state.count("Charged Skill", self.player) + def ranged(self, state: CollectionState) -> int: + return state.count("Ranged Skill", self.player) + + def dive(self, state: CollectionState) -> int: + return state.count("Dive Skill", self.player) + + def lunge(self, state: CollectionState) -> int: + return state.count("Lunge Skill", self.player) + + def charge_beam(self, state: CollectionState) -> bool: + return self.charged(state) >= 3 + + # Main quest + def holy_wounds(self, state: CollectionState) -> int: + return state.count_group_unique("wounds", self.player) + + def masks(self, state: CollectionState) -> int: + return state.count_group_unique("masks", self.player) + + def guilt_bead(self, state: CollectionState) -> bool: + return state.has("Weight of True Guilt", self.player) + + # LOTL quest + def cloth(self, state: CollectionState) -> bool: + return state.has("Linen Cloth", self.player) + + def hand(self, state: CollectionState) -> bool: + return state.has("Severed Hand", self.player) -def can_cross_gap(state: CollectionState, logic: int, player: int, number: int) -> bool: - if number == 1: + def hatched_egg(self, state: CollectionState) -> bool: + return state.has("Hatched Egg of Deformity", self.player) + + # Tirso quest + def herbs(self, state: CollectionState) -> int: + return state.count_group_unique("tirso", self.player) + + # Tentudia quest + def tentudia_remains(self, state: CollectionState) -> int: + return state.count_group_unique("tentudia", self.player) + + # Gemino quest + def empty_thimble(self, state: CollectionState) -> bool: + return state.has("Empty Golden Thimble", self.player) + + def full_thimble(self, state: CollectionState) -> bool: + return state.has("Golden Thimble Filled with Burning Oil", self.player) + + def dried_flowers(self, state: CollectionState) -> bool: + return state.has("Dried Flowers bathed in Tears", self.player) + + # Altasgracias quest + def ceremony_items(self, state: CollectionState) -> int: + return state.count_group_unique("egg", self.player) + + def egg(self, state: CollectionState) -> bool: + return state.has("Egg of Deformity", self.player) + + # Redento quest + def limestones(self, state: CollectionState) -> int: + return state.count_group_unique("toe", self.player) + + def knots(self, state: CollectionState) -> int: + return state.count("Knot of Rosary Rope", self.player) if state.can_reach_region("D17Z01S07[NW]", self.player)\ + else 0 + + # Cleofas quest + def marks_of_refuge(self, state: CollectionState) -> int: + return state.count_group_unique("marks", self.player) + + def cord(self, state: CollectionState) -> bool: + return state.has("Cord of the True Burying", self.player) + + # Crisanta quest + def scapular(self, state: CollectionState) -> bool: + return state.has("Incomplete Scapular", self.player) + + def true_heart(self, state: CollectionState) -> bool: + return state.has("Apodictic Heart of Mea Culpa", self.player) + + def traitor_eyes(self, state: CollectionState) -> int: + return state.count_group_unique("eye", self.player) + + # Jibrael quest + def bell(self, state: CollectionState) -> bool: + return state.has("Petrified Bell", self.player) + + def verses(self, state: CollectionState) -> int: + return state.count("Verses Spun from Gold", self.player) + + # Movement tech + def can_air_stall(self, state: CollectionState) -> bool: return ( - state.has_any({"Purified Hand of the Nun", "The Young Mason's Wheel"}, player) - or can_dawn_jump(state, logic, player) - or can_air_stall(state, logic, player) + self.ranged(state) > 0 + and self.world.options.difficulty >= 1 ) - elif number == 2: + + def can_dawn_jump(self, state: CollectionState) -> bool: return ( - state.has_any({"Purified Hand of the Nun", "The Young Mason's Wheel"}, player) - or can_dawn_jump(state, logic, player) + self.dawn_heart(state) + and self.dash(state) + and self.world.options.difficulty >= 1 ) - elif number == 3: + + def can_water_jump(self, state: CollectionState) -> bool: return ( - state.has("Purified Hand of the Nun", player) - or can_dawn_jump(state, logic, player) - or ( - state.has("The Young Mason's Wheel", player) - and can_air_stall(state, logic, player) - ) + self.nail(state) + or self.double_jump(state) + ) + + # Breakable tech + def can_break_holes(self, state: CollectionState) -> bool: + return ( + self.charged(state) > 0 + or self.dive(state) > 0 + or self.lunge(state) >= 3 and self.dash(state) + or self.can_use_any_prayer(state) + ) + + def can_dive_laser(self, state: CollectionState) -> bool: + return ( + self.dive(state) >= 3 + and self.world.options.difficulty >= 2 + ) + + # Root tech + def can_walk_on_root(self, state: CollectionState) -> bool: + return self.root(state) + + def can_climb_on_root(self, state: CollectionState) -> bool: + return ( + self.root(state) + and self.wall_climb(state) + ) + + # Lung tech + def can_survive_poison_1(self, state: CollectionState) -> bool: + return ( + self.lung(state) + or self.world.options.difficulty >= 1 + and self.tiento(state) + or self.world.options.difficulty >= 2 + ) + + def can_survive_poison_2(self, state: CollectionState) -> bool: + return ( + self.lung(state) + or self.world.options.difficulty >= 1 + and self.tiento(state) + ) + + def can_survive_poison_3(self, state: CollectionState) -> bool: + return ( + self.lung(state) + or self.world.options.difficulty >= 2 + and self.tiento(state) + and self.total_fervour(state) >= 120 + ) + + # Enemy tech + def can_enemy_bounce(self, state: CollectionState) -> bool: + return self.enemy_skips_allowed(state) + + def can_enemy_upslash(self, state: CollectionState) -> bool: + return ( + self.combo(state) >= 2 + and self.enemy_skips_allowed(state) + ) + + # Crossing gaps + def can_cross_gap_1(self, state: CollectionState) -> bool: + return ( + self.double_jump(state) + or self.can_dawn_jump(state) + or self.wheel(state) + or self.can_air_stall(state) + ) + + def can_cross_gap_2(self, state: CollectionState) -> bool: + return ( + self.double_jump(state) + or self.can_dawn_jump(state) + or self.wheel(state) ) - elif number == 4: + + def can_cross_gap_3(self, state: CollectionState) -> bool: + return ( + self.double_jump(state) + or self.can_dawn_jump(state) + or self.wheel(state) + and self.can_air_stall(state) + ) + + def can_cross_gap_4(self, state: CollectionState) -> bool: return ( - state.has("Purified Hand of the Nun", player) - or can_dawn_jump(state, logic, player) + self.double_jump(state) + or self.can_dawn_jump(state) ) - elif number == 5: + + def can_cross_gap_5(self, state: CollectionState) -> bool: return ( - state.has("Purified Hand of the Nun", player) - or ( - can_dawn_jump(state, logic, player) - and can_air_stall(state, logic, player)) + self.double_jump(state) + or self.can_dawn_jump(state) + and self.can_air_stall(state) ) - elif number == 6: - return state.has("Purified Hand of the Nun", player) - elif number == 7: + + def can_cross_gap_6(self, state: CollectionState) -> bool: + return self.double_jump(state) + + def can_cross_gap_7(self, state: CollectionState) -> bool: return ( - state.has("Purified Hand of the Nun", player) + self.double_jump(state) and ( - can_dawn_jump(state, logic, player) - or state.has("The Young Mason's Wheel", player) - or can_air_stall(state, logic, player) + self.can_dawn_jump(state) + or self.wheel(state) + or self.can_air_stall(state) ) ) - elif number == 8: + + def can_cross_gap_8(self, state: CollectionState) -> bool: return ( - state.has("Purified Hand of the Nun", player) + self.double_jump(state) and ( - can_dawn_jump(state, logic, player) - or state.has("The Young Mason's Wheel", player) + self.can_dawn_jump(state) + or self.wheel(state) ) ) - elif number == 9: + + def can_cross_gap_9(self, state: CollectionState) -> bool: return ( - state.has("Purified Hand of the Nun", player) + self.double_jump(state) and ( - can_dawn_jump(state, logic, player) - or state.has("The Young Mason's Wheel", player) - and can_air_stall(state, logic, player) + self.can_dawn_jump(state) + or self.wheel(state) + and self.can_air_stall(state) ) ) - elif number == 10: + + def can_cross_gap_10(self, state: CollectionState) -> bool: return ( - state.has("Purified Hand of the Nun", player) - and can_dawn_jump(state, logic, player) + self.double_jump(state) + and self.can_dawn_jump(state) ) - elif number == 11: + + def can_cross_gap_11(self, state: CollectionState) -> bool: return ( - state.has("Purified Hand of the Nun", player) - and can_dawn_jump(state, logic, player) - and can_air_stall(state, logic, player) + self.double_jump(state) + and self.can_dawn_jump(state) + and self.can_air_stall(state) ) - -def can_ride_albero_elevator(state: CollectionState, player: int) -> bool: - return state.has_any({"D02Z02S11[NW]", "D02Z02S11[NE]", "D02Z02S11[W]", "D02Z02S11[E]", \ - "D02Z02S11[SE]"}, player) - - -def opened_dc_gate_w(state: CollectionState, player: int) -> bool: - return state.has_any({"D01Z05S24[W]", "D01Z05S24[E]"}, player) - - -def opened_dc_gate_e(state: CollectionState, player: int) -> bool: - return state.has_any({"D01Z05S12[W]", "D01Z05S12[E]"}, player) - - -def opened_dc_ladder(state: CollectionState, player: int) -> bool: - return state.has_any({"D01Z05S20[W]", "D01Z05S20[N]"}, player) - - -def opened_wotw_cave(state: CollectionState, player: int) -> bool: - return ( - state.has("D02Z01S06[E]", player) - or state.has("Wall Climb Ability", player) - and ( - state.has("D02Z01S06[W]", player) - or state.has("D02Z01S06[Cherubs]", player) + # Events that trigger in different scenes + def opened_dc_gate_w(self, state: CollectionState) -> bool: + return ( + state.can_reach_region("D20Z01S04[E]", self.player) + or state.can_reach_region("D01Z05S23[W]", self.player) ) - ) - - -def rode_gotp_elevator(state: CollectionState, player: int) -> bool: - return state.has_any({"D02Z02S11[NW]", "D02Z02S11[NE]", "D02Z02S11[W]", "D02Z02S11[E]", \ - "D02Z02S11[SE]"}, player) - - -def opened_convent_ladder(state: CollectionState, player: int) -> bool: - return state.has_any({"D02Z03S11[S]", "D02Z03S11[W]", "D02Z03S11[NW]", "D02Z03S11[E]", \ - "D02Z03S11[NE]"}, player) - - -def broke_jondo_bell_w(state: CollectionState, player: int) -> bool: - return ( - state.has("D03Z02S09[S]", player) - or state.has("D03Z02S09[W]", player) - and state.has("Dash Ability", player) - or state.has("D03Z02S09[N]", player) - or state.has("D03Z02S09[Cherubs]", player) - ) - - -def broke_jondo_bell_e(state: CollectionState, logic: int, enemy: int, player: int) -> bool: - return ( - state.has("D03Z02S05[S]", player) - or state.has("D03Z02S05[E]", player) - or state.has("D03Z02S05[W]", player) - and ( - can_cross_gap(state, logic, player, 5) - or can_enemy_bounce(logic, enemy) - and can_cross_gap(state, logic, player, 3) + + def opened_dc_gate_e(self, state: CollectionState) -> bool: + return ( + state.can_reach_region("D01Z05S10[SE]", self.player) + or state.can_reach_region("D01Z04S09[W]", self.player) ) - ) - - -def opened_mom_ladder(state: CollectionState, player: int) -> bool: - return state.has_any({"D04Z02S06[NW]", "D04Z02S06[NE]", "D04Z02S06[N]", "D04Z02S06[S]"}, player) - - -def opened_tsc_gate(state: CollectionState, player: int) -> bool: - return state.has_any({"D05Z02S11[W]", "D05Z02S11[Cherubs]"}, player) - - -def opened_ar_ladder(state: CollectionState, player: int) -> bool: - return state.has_any({"D06Z01S23[Sword]", "D06Z01S23[E]", "D06Z01S23[S]", "D06Z01S23[Cherubs]"}, player) - - -def broke_bottc_statue(state: CollectionState, player: int) -> bool: - return state.has_any({"D08Z01S02[NE]", "D08Z01S02[SE]"}, player) - - -def opened_wothp_gate(state: CollectionState, player: int) -> bool: - return state.has_any({"D09Z01S05[W]", "D09Z01S05[SE]", "D09Z01S05[NE]"}, player) - - -def opened_botss_ladder(state: CollectionState, player: int) -> bool: - return state.has_any({"D17Z01S04[N]", "D17Z01S04[FrontR]"}, player) - - -def upwarp_skips_allowed(logic: int) -> bool: - return logic >= 2 - - -def mourning_skips_allowed(logic: int) -> bool: - return logic >= 2 - - -def enemy_skips_allowed(logic: int, enemy: int) -> bool: - return logic >= 2 and enemy == 0 - - -def obscure_skips_allowed(logic): - return logic >= 2 - - -def precise_skips_allowed(logic): - return logic >= 2 - - -def can_beat_boss(state: CollectionState, boss: str, logic: int, player: int) -> bool: - def has_boss_strength(name: str) -> bool: - silver: int = state.count("Quicksilver", player) if state.has("D01Z05S27[E]", player) else 0 - flasks: int = state.count("Empty Bile Flask", player) if \ - state.has_any({"D01Z05S18[E]", "D02Z02S09[E]", "D03Z02S14[E]", "D03Z03S03[SE]", "D04Z02S13[W]", \ - "D05Z01S12[E]", "D20Z01S08[W]"}, player) else 0 - - - playerStrength: float = state.count("Life Upgrade", player) * 0.25 / 6 + \ - state.count("Mea Culpa Upgrade", player) * 0.25 / 7 + state.count("Fervour Upgrade", player) * 0.20 \ - / 6 + flasks * 0.15 / 8 + silver * 0.15 / 5 - - bosses: Dict[str, int] = { - "warden": -0.10, - "ten-piedad": 0.05, - "charred-visage": 0.20, - "tres-angustias": 0.15, - "esdras": 0.25, - "melquiades": 0.25, - "exposito": 0.30, - "quirce": 0.35, - "crisanta": 0.50, - "isidora": 0.70, - "sierpes": 0.70, - "amanecida": 0.60, - "laudes": 0.60, - "perpetua": -0.05, - "legionary": 0.20 - } - - bossStrength: int = bosses[name] - - return playerStrength >= (bossStrength - 0.10 if logic >= 2 else (bossStrength if logic >= 1 else bossStrength + 0.10)) - if boss == "Brotherhood": + def opened_dc_ladder(self, state: CollectionState) -> bool: return ( - has_boss_strength("warden") - and state.has_any({"D17Z01S11[W]", "D17Z01S11[E]"}, player) + state.can_reach_region("D01Z05S25[NE]", self.player) + or state.can_reach_region("D01Z05S02[S]", self.player) ) - elif boss == "Mercy": + + def opened_wotw_cave(self, state: CollectionState) -> bool: return ( - has_boss_strength("ten-piedad") - and state.has_any({"D01Z04S18[W]", "D01Z04S18[E]"}, player) + state.can_reach_region("D02Z01S01[SW]", self.player) + or self.wall_climb(state) + and state.can_reach_region("D02Z01S08[E]", self.player) + or state.can_reach_region("D02Z01S02[]", self.player) ) - elif boss == "Convent": + + def rode_gotp_elevator(self, state: CollectionState) -> bool: return ( - has_boss_strength("charred-visage") - and state.has_any({"D02Z03S20[W]", "D02Z03S20[E]"}, player) + state.can_reach_region("D02Z03S14[E]", self.player) + or state.can_reach_region("D02Z02S13[W]", self.player) + or state.can_reach_region("D02Z02S06[E]", self.player) + or state.can_reach_region("D02Z02S12[W]", self.player) + or state.can_reach_region("D02Z02S08[W]", self.player) ) - elif boss == "Grievance": + + def opened_convent_ladder(self, state: CollectionState) -> bool: return ( - has_boss_strength("tres-angustias") - and state.has_any({"Wall Climb Ability", "Purified Hand of the Nun"}, player) - and state.has_any({"D03Z03S15[W]", "D03Z03S15[E]"}, player) + state.can_reach_region("D02Z03S02[N]", self.player) + or state.can_reach_region("D02Z03S15[E]", self.player) + or state.can_reach_region("D02Z03S19[E]", self.player) + or state.can_reach_region("D02Z03S10[W]", self.player) + or state.can_reach_region("D02Z03S22[W]", self.player) ) - elif boss == "Bridge": + + def broke_jondo_bell_w(self, state: CollectionState) -> bool: return ( - has_boss_strength("esdras") - and state.has_any({"D08Z01S01[W]", "D08Z01S01[E]"}, player) + state.can_reach_region("D03Z02S08[N]", self.player) + or state.can_reach_region("D03Z02S12[E]", self.player) + and self.dash(state) + or state.can_reach_region("D03Z02S10[S]", self.player) + or state.can_reach_region("D03Z02S10[-Cherubs]", self.player) ) - elif boss == "Mothers": + + def broke_jondo_bell_e(self, state: CollectionState) -> bool: return ( - has_boss_strength("melquiades") - and state.has_any({"D04Z02S22[W]", "D04Z02S22[E]"}, player) + state.can_reach_region("D03Z02S04[NE]", self.player) + or state.can_reach_region("D03Z02S11[W]", self.player) + or state.can_reach_region("D03Z02S03[E]", self.player) + and ( + self.can_cross_gap_5(state) + or self.can_enemy_bounce(state) + and self.can_cross_gap_3(state) + ) ) - elif boss == "Canvases": + + def opened_mom_ladder(self, state: CollectionState) -> bool: return ( - has_boss_strength("exposito") - and state.has_any({"D05Z02S14[W]", "D05Z02S14[E]"}, player) + state.can_reach_region("D04Z02S11[E]", self.player) + or state.can_reach_region("D04Z02S09[W]", self.player) + or state.can_reach_region("D06Z01S23[S]", self.player) + or state.can_reach_region("D04Z02S04[N]", self.player) ) - elif boss == "Prison": + + def opened_tsc_gate(self, state: CollectionState) -> bool: return ( - has_boss_strength("quirce") - and state.has_any({"D09Z01S03[W]", "D09Z01S03[N]"}, player) + state.can_reach_region("D05Z02S06[SE]", self.player) + or state.can_reach_region("D05Z01S21[-Cherubs]", self.player) ) - elif boss == "Rooftops": + + def opened_ar_ladder(self, state: CollectionState) -> bool: return ( - has_boss_strength("crisanta") - and state.has_any({"D06Z01S25[W]", "D06Z01S25[E]"}, player) + state.can_reach_region("D06Z01S22[Sword]", self.player) + or state.can_reach_region("D06Z01S20[W]", self.player) + or state.can_reach_region("D04Z02S06[N]", self.player) + or state.can_reach_region("D06Z01S01[-Cherubs]", self.player) ) - elif boss == "Ossuary": + + def broke_bottc_statue(self, state: CollectionState) -> bool: return ( - has_boss_strength("isidora") - and state.has("D01BZ08S01[W]", player) + state.can_reach_region("D08Z03S03[W]", self.player) + or state.can_reach_region("D08Z02S03[W]", self.player) ) - elif boss == "Mourning": + + def opened_wothp_gate(self, state: CollectionState) -> bool: return ( - has_boss_strength("sierpes") - and state.has("D20Z02S08[E]", player) + state.can_reach_region("D09Z01S13[E]", self.player) + or state.can_reach_region("D09Z01S03[W]", self.player) + or state.can_reach_region("D09Z01S08[W]", self.player) ) - elif boss == "Graveyard": + + def opened_botss_ladder(self, state: CollectionState) -> bool: return ( - has_boss_strength("amanecida") - and state.has_all({"D01Z06S01[Santos]", "D02Z03S23[E]", "D02Z02S14[W]", "Wall Climb Ability"}, player) + state.can_reach_region("D17Z01S05[S]", self.player) + or state.can_reach_region("D17BZ02S01[FrontR]", self.player) ) - elif boss == "Jondo": + + # Special skips + def upwarp_skips_allowed(self, state: CollectionState) -> bool: + return self.world.options.difficulty >= 2 + + def mourning_skip_allowed(self, state: CollectionState) -> bool: + return self.world.options.difficulty >= 2 + + def enemy_skips_allowed(self, state: CollectionState) -> bool: return ( - has_boss_strength("amanecida") - and state.has("D01Z06S01[Santos]", player) - and state.has_any({"D20Z01S05[W]", "D20Z01S05[E]"}, player) - and state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player) + self.world.options.difficulty >= 2 + and not self.world.options.enemy_randomizer ) - elif boss == "Patio": + + def obscure_skips_allowed(self, state: CollectionState) -> bool: + return self.world.options.difficulty >= 2 + + def precise_skips_allowed(self, state: CollectionState) -> bool: + return self.world.options.difficulty >= 2 + + # Bosses + def can_beat_brotherhood_boss(self, state: CollectionState) -> bool: return ( - has_boss_strength("amanecida") - and state.has_all({"D01Z06S01[Santos]", "D06Z01S18[E]"}, player) - and state.has_any({"D04Z01S04[W]", "D04Z01S04[E]", "D04Z01S04[Cherubs]"}, player) + self.has_boss_strength(state, "warden") + and ( + state.can_reach_region("D17Z01S05[E]", self.player) + or state.can_reach_region("D17Z01S03[W]", self.player) + ) ) - elif boss == "Wall": + + def can_beat_mercy_boss(self, state: CollectionState) -> bool: return ( - has_boss_strength("amanecida") - and state.has_all({"D01Z06S01[Santos]", "D09BZ01S01[Cell24]"}, player) - and state.has_any({"D09Z01S01[W]", "D09Z01S01[E]"}, player) + self.has_boss_strength(state, "ten-piedad") + and ( + state.can_reach_region("D01Z04S19[E]", self.player) + or state.can_reach_region("D01Z04S12[W]", self.player) + ) ) - elif boss == "Hall": + + def can_beat_convent_boss(self, state: CollectionState) -> bool: return ( - has_boss_strength("laudes") - and state.has_any({"D08Z03S03[W]", "D08Z03S03[E]"}, player) + self.has_boss_strength(state, "charred-visage") + and ( + state.can_reach_region("D02Z03S09[E]", self.player) + or state.can_reach_region("D02Z03S21[W]", self.player) + ) ) - elif boss == "Perpetua": - return has_boss_strength("perpetua") - elif boss == "Legionary": - return has_boss_strength("legionary") - - -def guilt_rooms(state: CollectionState, player: int, number: int) -> bool: - doors: List[str] = [ - "D01Z04S17[W]", - "D02Z02S06[E]", - "D03Z03S14[W]", - "D04Z02S17[W]", - "D05Z01S17[W]", - "D09Z01S13[E]", - "D17Z01S12[E]" - ] - - total: int = sum(state.has(item, player) for item in doors) - - return total >= number - - -def sword_rooms(state: CollectionState, player: int, number: int) -> bool: - doors: List[Set[str]] = [ - {"D01Z02S06[W]", "D01Z02S06[E]"}, - {"D01Z05S24[W]", "D01Z05S24[E]"}, - {"D02Z03S13[W]"}, - {"D04Z02S12[W]"}, - {"D05Z01S13[E]"}, - {"D06Z01S11[W]"}, - {"D17Z01S08[E]"} - ] - - total: int = sum(state.has_any(items, player) for items in doors) - - return total >= number - - -def redento(state: CollectionState, world, player: int, number: int) -> bool: - if number == 1: - return state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player) - elif number == 2: + + def can_beat_grievance_boss(self, state: CollectionState) -> bool: return ( - state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player) - and state.has("OpenedBOTSSLadder", player) + self.has_boss_strength(state, "tres-angustias") + and ( + self.wall_climb(state) + or self.double_jump(state) + ) and ( + state.can_reach_region("D03Z03S11[E]", self.player) + or state.can_reach_region("D03Z03S16[W]", self.player) + ) ) - elif number == 3: + + def can_beat_bridge_boss(self, state: CollectionState) -> bool: return ( - state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player) - and state.has("OpenedBOTSSLadder", player) - and state.can_reach(world.multiworld.get_region("D01Z03S06", player)) + self.has_boss_strength(state, "esdras") + and ( + state.can_reach_region("D01Z03S06[E]", self.player) + or state.can_reach_region("D08Z02S01[W]", self.player) + ) ) - elif number == 4: + + def can_beat_mothers_boss(self, state: CollectionState) -> bool: return ( - state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player) - and state.has("OpenedBOTSSLadder", player) - and state.can_reach(world.multiworld.get_region("D01Z03S06", player)) - and state.can_reach(world.multiworld.get_region("D04Z01S04", player)) + self.has_boss_strength(state, "melquiades") + and ( + state.can_reach_region("D04Z02S15[E]", self.player) + or state.can_reach_region("D04Z02S21[W]", self.player) + ) ) - elif number == 5: + + def can_beat_canvases_boss(self, state: CollectionState) -> bool: return ( - state.has_any({"D03Z01S03[W]", "D03Z01S03[SW]"}, player) - and state.has("OpenedBOTSSLadder", player) - and state.can_reach(world.multiworld.get_region("D01Z03S06", player)) - and state.can_reach(world.multiworld.get_region("D04Z01S04", player)) - and state.can_reach(world.multiworld.get_region("D04Z02S20", player)) - and state.has_all({"Little Toe made of Limestone", "Big Toe made of Limestone", \ - "Fourth Toe made of Limestone", "D17Z01S09[E]"}, player) - and state.has("Knot of Rosary Rope", player) + self.has_boss_strength(state, "exposito") + and ( + state.can_reach_region("D05Z02S06[NE]", self.player) + or state.can_reach_region("D05Z01S21[SW]", self.player) + ) ) - - -def miriam(state: CollectionState, player: int) -> bool: - return state.has_all({"D02Z03S24[E]", "D03Z03S19[E]", "D04Z04S02[W]", "D05Z01S24[E]", "D06Z01S26[W]"}, player) - - -def amanecida_rooms(state: CollectionState, logic: int, player: int, number: int) -> bool: - bosses: List[str] = [ - "Graveyard", - "Jondo", - "Patio", - "Wall" - ] - - total = sum(can_beat_boss(state, boss, logic, player) for boss in bosses) - - return total >= number - - -def chalice_rooms(state: CollectionState, player: int, number: int) -> bool: - doors: List[Set[str]] = [ - {"D03Z01S01[W]", "D03Z01S01[NE]", "D03Z01S01[S]"}, - {"D05Z02S01[W]", "D05Z02S01[E]"}, - {"D09Z01S07[SW]", "D09Z01S07[SE]", "D09Z01S07[W]", "D09Z01S07[E]"} - ] - - total: int = sum(state.has_any(items, player) for items in doors) - - return total >= number - - -def rules(blasphemousworld): - world = blasphemousworld.multiworld - player = blasphemousworld.player - logic = world.difficulty[player].value - enemy = world.enemy_randomizer[player].value - - - # D01Z01S01 (The Holy Line) - # No items - # Doors - set_rule(world.get_entrance("D01Z01S01[S]", player), - lambda state: ( - can_break_holes(state, player) - or state.has("Purified Hand of the Nun", player) - )) - - - # D01Z01S02 (The Holy Line) - # Items - set_rule(world.get_location("THL: Across blood platforms", player), - lambda state: ( - state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player) - )) - # No doors - - - # D01Z01S03 (The Holy Line) - # Items - set_rule(world.get_location("THL: Underground chest", player), - lambda state: ( - state.has_all({"Blood Perpetuated in Sand", "Dash Ability"}, player) - and can_water_jump(state, player) - )) - # No doors - - - # D01Z02S01 (Albero) - # Items - set_rule(world.get_location("Albero: Bless Linen Cloth", player), - lambda state: state.has("Linen Cloth", player)) - set_rule(world.get_location("Albero: Bless Hatched Egg", player), - lambda state: state.has("Hatched Egg of Deformity", player)) - set_rule(world.get_location("Albero: Bless Severed Hand", player), - lambda state: state.has("Severed Hand", player)) - # No doors - - - # D01Z02S02 (Albero) - # Items - set_rule(world.get_location("Albero: Tirso's 1st reward", player), - lambda state: state.has_group("tirso", player, 1)) - set_rule(world.get_location("Albero: Tirso's 2nd reward", player), - lambda state: state.has_group("tirso", player, 2)) - set_rule(world.get_location("Albero: Tirso's 3rd reward", player), - lambda state: state.has_group("tirso", player, 3)) - set_rule(world.get_location("Albero: Tirso's 4th reward", player), - lambda state: state.has_group("tirso", player, 4)) - set_rule(world.get_location("Albero: Tirso's 5th reward", player), - lambda state: state.has_group("tirso", player, 5)) - set_rule(world.get_location("Albero: Tirso's 6th reward", player), - lambda state: state.has_group("tirso", player, 6)) - set_rule(world.get_location("Albero: Tirso's final reward", player), - lambda state: ( - state.has_group("tirso", player, 6) - and can_beat_boss(state, "Mercy", logic, player) - and can_beat_boss(state, "Convent", logic, player) - and can_beat_boss(state, "Grievance", logic, player) - and can_beat_boss(state, "Mothers", logic, player) - and can_beat_boss(state, "Canvases", logic, player) - and can_beat_boss(state, "Prison", logic, player) - )) - # No doors - - - # D01Z02S03 (Albero) - # Items - set_rule(world.get_location("Albero: Child of Moonlight", player), - lambda state: ( - state.has("RodeGOTPElevator", player) - or pillar(state, player) - or state.has("Cante Jondo of the Three Sisters", player) - or state.has("Purified Hand of the Nun", player) - or state.has("D01Z02S03[NW]", player) - and ( - can_cross_gap(state, logic, player, 2) - or state.has("Lorquiana", player) - or aubade(state, player) - or state.has("Cantina of the Blue Rose", player) - or charge_beam(state, player) - or state.has("Ranged Skill", player) - ) - )) - set_rule(world.get_location("Albero: Lvdovico's 1st reward", player), - lambda state: state.has_group("tentudia", player, 1)) - set_rule(world.get_location("Albero: Lvdovico's 2nd reward", player), - lambda state: state.has_group("tentudia", player, 2)) - set_rule(world.get_location("Albero: Lvdovico's 3rd reward", player), - lambda state: state.has_group("tentudia", player, 3)) - set_rule(world.get_location("Albero: First gift for Cleofas", player), - lambda state: state.has("D04Z02S10[W]", player)) - # Doors - set_rule(world.get_entrance("D01Z02S03[NW]", player), - lambda state: ( - state.has("D02Z02S11[NW]", player) - or state.has("D02Z02S11[NE]", player) - or state.has("D02Z02S11[W]", player) - or state.has("D02Z02S11[E]", player) - or state.has("D02Z02S11[SE]", player) - )) - set_rule(world.get_entrance("D01Z02S03[church]", player), - lambda state: ( - can_beat_boss(state, "Mercy", logic, player) - or can_beat_boss(state, "Convent", logic, player) - or can_beat_boss(state, "Grievance", logic, player) - )) - - - # D01BZ04S01 (Albero: Inside church) - # Items - set_rule(world.get_location("Albero: Final gift for Cleofas", player), - lambda state: ( - state.has_group("marks", player, 3) - and state.has("Cord of the True Burying", player) - and state.has("D04Z02S10[W]", player) - and state.has("D06Z01S18[E]", player) - )) - # No doors - - - # D01BZ06S01 (Ossuary) - # Items - set_rule(world.get_location("Ossuary: 1st reward", player), - lambda state: state.has_group("bones", player, 4)) - set_rule(world.get_location("Ossuary: 2nd reward", player), - lambda state: state.has_group("bones", player, 8)) - set_rule(world.get_location("Ossuary: 3rd reward", player), - lambda state: state.has_group("bones", player, 12)) - set_rule(world.get_location("Ossuary: 4th reward", player), - lambda state: state.has_group("bones", player, 16)) - set_rule(world.get_location("Ossuary: 5th reward", player), - lambda state: state.has_group("bones", player, 20)) - set_rule(world.get_location("Ossuary: 6th reward", player), - lambda state: state.has_group("bones", player, 24)) - set_rule(world.get_location("Ossuary: 7th reward", player), - lambda state: state.has_group("bones", player, 28)) - set_rule(world.get_location("Ossuary: 8th reward", player), - lambda state: state.has_group("bones", player, 32)) - set_rule(world.get_location("Ossuary: 9th reward", player), - lambda state: state.has_group("bones", player, 36)) - set_rule(world.get_location("Ossuary: 10th reward", player), - lambda state: state.has_group("bones", player, 40)) - set_rule(world.get_location("Ossuary: 11th reward", player), - lambda state: state.has_group("bones", player, 44)) - # Doors - set_rule(world.get_entrance("D01BZ06S01[E]", player), - lambda state: state.has_group("bones", player, 30)) - - - # D01BZ08S01 (Isidora) - # Items - set_rule(world.get_location("Ossuary: Isidora, Voice of the Dead", player), - lambda state: can_beat_boss(state, "Ossuary", logic, player)) - # No doors - - - # D01Z03S01 (Wasteland of the Buried Churches) - # Items - set_rule(world.get_location("WotBC: Lower log path", player), - lambda state: state.has("D01Z03S01[SE]", player)) - # No doors - - - # D01Z03S02 (Wasteland of the Buried Churches) - # Items - set_rule(world.get_location("WotBC: Hidden alcove", player), - lambda state: state.has("Dash Ability", player)) - # No doors - - - # D01Z03S03 (Wasteland of the Buried Churches) - # No items - # Doors - set_rule(world.get_entrance("D01Z03S03[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D01Z03S05 (Wasteland of the Buried Churches) - # Items - set_rule(world.get_location("WotBC: Under broken bridge", player), - lambda state: ( - state.has_any({"Blood Perpetuated in Sand", "Boots of Pleading"}, player) - or can_cross_gap(state, logic, player, 3) - )) - # Doors - set_rule(world.get_entrance("D01Z03S05[Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D01Z03S06 (Wasteland of the Buried Churches) - # Items - set_rule(world.get_location("WotBC: 3rd meeting with Redento", player), - lambda state: redento(state, blasphemousworld, player, 3)) - # No doors - - - # D01Z03S07 (Wasteland of the Buried Churches) - # Items - set_rule(world.get_location("WotBC: Cliffside Child of Moonlight", player), - lambda state: ( - can_cross_gap(state, logic, player, 2) - or aubade(state, player) - or charge_beam(state, player) - or state.has_any({"Lorquiana", "Cante Jondo of the Three Sisters", "Cantina of the Blue Rose", \ - "Cloistered Ruby", "Ranged Skill"}, player) - or precise_skips_allowed(logic) - )) - # Doors - set_rule(world.get_entrance("D01Z03S07[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D01Z04S01 (Mercy Dreams) - # No items - # Doors - set_rule(world.get_entrance("D01Z04S01[SE]", player), - lambda state: state.has("D01Z04S01[S]", player)) - set_rule(world.get_entrance("D01Z04S01[S]", player), - lambda state: state.has("D01Z04S01[SE]", player)) - - - # D01Z04S09 (Mercy Dreams) - # No items - # Doors - set_rule(world.get_entrance("D01Z04S09[W]", player), - lambda state: state.has("OpenedDCGateE", player)) - - - # D01Z04S13 (Mercy Dreams) - # Items - set_rule(world.get_location("MD: Behind gate to TSC", player), - lambda state: ( - state.has("D01Z04S13[SE]", player) - or can_dive_laser(state, logic, player) and ( - can_air_stall(state, logic, player) - or state.has_any({"The Young Mason's Wheel", "Purified Hand of the Nun"}, player) - or can_enemy_bounce(logic, enemy) - ) - )) - # Doors - set_rule(world.get_entrance("D01Z04S13[SE]", player), - lambda state: ( - can_dive_laser(state, logic, player) and ( - can_air_stall(state, logic, player) - or state.has_any({"The Young Mason's Wheel", "Purified Hand of the Nun"}, player) - or can_enemy_bounce(logic, enemy) - ) - )) - - - # D01Z04S14 (Mercy Dreams) - # Items - set_rule(world.get_location("MD: Sliding challenge", player), - lambda state: state.has("Dash Ability", player)) - # No doors - - - # D01Z04S15 (Mercy Dreams) - # No items - # Doors - set_rule(world.get_entrance("D01Z04S15[W]", player), - lambda state: ( - state.has("D01Z04S15[E]", player) - or state.has("D01Z04S15[SW]", player) - or state.has("D01Z04S15[SE]", player) - )) - set_rule(world.get_entrance("D01Z04S15[E]", player), - lambda state: ( - state.has("D01Z04S15[W]", player) - or state.has("D01Z04S15[SW]", player) - or state.has("D01Z04S15[SE]", player) - )) - set_rule(world.get_entrance("D01Z04S15[SW]", player), - lambda state: ( - state.has("D01Z04S15[W]", player) - or state.has("D01Z04S15[E]", player) - or state.has("D01Z04S15[SE]", player) - )) - set_rule(world.get_entrance("D01Z04S15[SE]", player), - lambda state: ( - state.has("D01Z04S15[W]", player) - or state.has("D01Z04S15[E]", player) - or state.has("D01Z04S15[SW]", player) - )) - - - # D01Z04S16 (Mercy Dreams) - # Items - set_rule(world.get_location("MD: Cave Child of Moonlight", player), - lambda state: ( - state.has_any({"Purified Hand of the Nun", "Cante Jondo of the Three Sisters"}, player) - or pillar(state, player) - or tirana(state, player) - )) - # No doors - - - # D01Z04S18 (Ten Piedad) - # Items - set_rule(world.get_location("MD: Ten Piedad", player), - lambda state: can_beat_boss(state, "Mercy", logic, player)) - # Doors - set_rule(world.get_entrance("D01Z04S18[W]", player), - lambda state: can_beat_boss(state, "Mercy", logic, player)) - set_rule(world.get_entrance("D01Z04S18[E]", player), - lambda state: can_beat_boss(state, "Mercy", logic, player)) - - - # D01Z05S02 (Desecrated Cistern) - # No items - # Doors - set_rule(world.get_entrance("D01Z05S02[S]", player), - lambda state: state.has("OpenedDCLadder", player)) - - - # D01Z05S05 (Desecrated Cistern) - # Items - set_rule(world.get_location("DC: Hidden alcove near fountain", player), - lambda state: ( - state.has("Dash Ability", player) - and can_water_jump(state, player) - )) - # No doors - - - # D01Z05S06 (Desecrated Cistern) - # Items - set_rule(world.get_location("DC: Upper east tunnel chest", player), - lambda state: ( - state.has("D01Z05S06[Cherubs]", player) - or can_water_jump(state, player) - )) - set_rule(world.get_location("DC: Upper east Child of Moonlight", player), - lambda state: ( - state.has("D01Z05S06[Cherubs]", player) - or can_water_jump(state, player) - or pillar(state, player) - or state.has("Cante Jondo of the Three Sisters", player) - or aubade(state, player) - or tirana(state, player) - or can_air_stall(state, logic, player) - )) - # No doors - - - # D01Z05S12 (Desecrated Cistern) - # Event - set_rule(world.get_location("OpenedDCGateE", player), - lambda state: opened_dc_gate_e(state, player)) - - - # D01Z05S13 (Desecrated Cistern) - # Items - set_rule(world.get_location("DC: Child of Moonlight, behind pillar", player), - lambda state: ( - state.has("D01Z05S13[SW]", player) - or state.has("D01Z05S13[E]", player) - and can_survive_poison(state, logic, player, 3) - and can_water_jump(state, player) - )) - # Doors - set_rule(world.get_entrance("D01Z05S13[SW]", player), - lambda state: state.has("D01Z05S13[E]", player)) - add_rule(world.get_entrance("D01Z05S13[SW]", player), - lambda state: ( - can_survive_poison(state, logic, player, 3) - and can_water_jump(state, player) - )) - set_rule(world.get_entrance("D01Z05S13[N]", player), - lambda state: state.has("D01Z05S13[E]", player)) - add_rule(world.get_entrance("D01Z05S13[N]", player), - lambda state: ( - can_survive_poison(state, logic, player, 3) - and can_water_jump(state, player) - )) - - - # D01Z05S17 (Desecrated Cistern) - # Items - set_rule(world.get_location("DC: High ledge near elevator shaft", player), - lambda state: ( - state.has("D01Z05S17[E]", player) - or can_water_jump(state, player) - or can_cross_gap(state, logic, player, 5) - )) - # Doors - set_rule(world.get_entrance("D01Z05S17[E]", player), - lambda state: ( - state.has("Dash Ability", player) and ( - can_water_jump(state, player) - or can_cross_gap(state, logic, player, 5) - ) - )) - - - # D01Z05S20 (Desecrated Cistern) - # Event - set_rule(world.get_location("OpenedDCLadder", player), - lambda state: opened_dc_ladder(state, player)) - - - # D01Z05S21 (Desecrated Cistern) - # No items - # Doors - set_rule(world.get_entrance("D01Z05S21[Reward]", player), - lambda state: state.has("Shroud of Dreamt Sins", player)) - - - # D01Z05S23 (Desecrated Cistern) - # No items - # Doors - set_rule(world.get_entrance("D01Z05S23[W]", player), - lambda state: ( - chalice_rooms(state, player, 3) - and state.has("Chalice of Inverted Verses", player) - )) - - - # D01Z05S24 (Desecrated Cistern) - # Event - set_rule(world.get_location("OpenedDCGateW", player), - lambda state: opened_dc_gate_w(state, player)) - - - # D01Z05S25 (Desecrated Cistern) - # Items - set_rule(world.get_location("DC: Elevator shaft ledge", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - or ( - state.has("Purified Hand of the Nun", player) - and state.has_any({"D01Z05S25[SW]", "D01Z05S25[SE]", "D01Z05S25[NE]"}, player) - ) - )) - set_rule(world.get_location("DC: Elevator shaft Child of Moonlight", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - or ( - obscure_skips_allowed(logic) - and state.has_any({"D01Z05S25[SW]", "D01Z05S25[SE]", "D01Z05S25[NE]"}, player) - and ( - aubade(state, player) - or state.has("Cantina of the Blue Rose", player) - ) - ) - or ( - pillar(state, player) - and ( - state.has("D01Z05S25[E]", player) - or state.has("D01Z05S25[W]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 3) - ) - ) - ) - )) - # Doors - set_rule(world.get_entrance("D01Z05S25[NE]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - or state.has("D01Z05S25[SW]", player) - or state.has("D01Z05S25[SE]", player) - )) - set_rule(world.get_entrance("D01Z05S25[W]", player), - lambda state: ( - ( - state.has("Linen of Golden Thread", player) - and ( - can_walk_on_root(state, player) - or state.has("Purified Hand of the Nun", player) - or can_air_stall(state, logic, player) - ) - ) - or ( - state.has("D01Z05S25[E]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 3) - ) - ) - )) - set_rule(world.get_entrance("D01Z05S25[E]", player), - lambda state: ( - can_break_tirana(state, logic, player) - and ( - state.has("Linen of Golden Thread", player) - or state.has("D01Z05S25[W]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 3) - ) - ) - )) - set_rule(world.get_entrance("D01Z05S25[SW]", player), - lambda state: ( - state.has("D01Z05S25[SE]", player) - or state.has("D01Z05S25[NE]", player) - or state.has("Linen of Golden Thread", player) - )) - set_rule(world.get_entrance("D01Z05S25[SE]", player), - lambda state: ( - state.has("D01Z05S25[SW]", player) - or state.has("D01Z05S25[NE]", player) - or state.has("Linen of Golden Thread", player) - )) - set_rule(world.get_entrance("D01Z05S25[EchoesW]", player), - lambda state: state.has("D01Z05S25[EchoesE]", player)) - add_rule(world.get_entrance("D01Z05S25[EchoesW]", player), - lambda state: ( - state.has("D01Z05S25[EchoesE]", player) - and ( - state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 8) - ) - or state.has("Linen of Golden Thread", player) - and ( - can_cross_gap(state, logic, player, 5) - or can_air_stall(state, logic, player) - and state.has("Blood Perpetuated in Sand", player) - ) - )) - set_rule(world.get_entrance("D01Z05S25[EchoesE]", player), - lambda state: state.has("D01Z05S25[EchoesW]", player)) - add_rule(world.get_entrance("D01Z05S25[EchoesE]", player), - lambda state: ( - state.has("D01Z05S25[EchoesW]", player) - and ( - state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 8) - ) - or state.has("Linen of Golden Thread", player) - and ( - can_cross_gap(state, logic, player, 5) - or can_air_stall(state, logic, player) - and state.has("Blood Perpetuated in Sand", player) - ) - )) - - - # D01Z06S01 (Petrous) - # No items - # Doors - set_rule(world.get_entrance("D01Z06S01[Santos]", player), - lambda state: state.has("Petrified Bell", player)) - - - # D02Z01S01 (Where Olive Trees Wither) - # Items - set_rule(world.get_location("WOTW: Below Prie Dieu", player), - lambda state: ( - state.has("D02Z01S01[W]", player) - or state.has("D02Z01S01[CherubsL]", player) - or state.has("D02Z01S01[SW]", player) - or state.has("D02Z01S01[CherubsR]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_location("WOTW: Gemino's gift", player), - lambda state: ( - state.has("D02Z01S01[W]", player) - or state.has("D02Z01S01[CherubsL]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - or ( - ( - state.has("D02Z01S01[SW]", player) - or state.has("D02Z01S01[CherubsR]", player) - ) - and can_dawn_jump(state, logic, player) - ) - )) - set_rule(world.get_location("WOTW: Gemino's reward", player), - lambda state: ( - state.has("Golden Thimble Filled with Burning Oil", player) - and ( - state.has("D02Z01S01[W]", player) - or state.has("D02Z01S01[CherubsL]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - or ( - ( - state.has("D02Z01S01[SW]", player) - or state.has("D02Z01S01[CherubsR]", player) - ) - and can_dawn_jump(state, logic, player) - ) - ) - )) - # Doors - set_rule(world.get_entrance("D02Z01S01[SW]", player), - lambda state: ( - state.has("OpenedWOTWCave", player) - and ( - state.has("D02Z01S01[W]", player) - or state.has("D02Z01S01[CherubsL]", player) - or state.has("D02Z01S01[CherubsR]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - ) - )) - set_rule(world.get_entrance("D02Z01S01[W]", player), - lambda state: ( - state.has("D02Z01S01[CherubsL]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - or ( - ( - state.has("D02Z01S01[SW]", player) - or state.has("D02Z01S01[CherubsR]", player) - ) - and can_dawn_jump(state, logic, player) - ) - )) - - - # D02Z01S02 (Where Olive Trees Wither) - # Items - set_rule(world.get_location("WOTW: Upper east Child of Moonlight", player), - lambda state: ( - state.has("D02Z01S02[NE]", player) - or ( - state.has("D02Z01S02[NW]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - ) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 4) - or pillar(state, player) - ) - )) - # Doors - set_rule(world.get_entrance("D02Z01S02[NW]", player), - lambda state: ( - state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - or ( - state.has("D02Z01S02[NE]", player) - and can_walk_on_root(state, player) - and can_cross_gap(state, logic, player, 5) - ) - )) - set_rule(world.get_entrance("D02Z01S02[NE]", player), - lambda state: ( - ( - state.has("Purified Hand of the Nun", player) - and can_enemy_bounce(logic, enemy) - ) - or ( - state.has("D02Z01S02[NW]", player) - or state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - ) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 10) - ) - )) - set_rule(world.get_entrance("D02Z01S02[]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D02Z01S03 (Where Olive Trees Wither) - # No items - # Doors - set_rule(world.get_entrance("D02Z01S03[W]", player), - lambda state: ( - state.has("D02Z01S03[SE]", player) - or state.has("D02Z01S03[Cherubs]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D02Z01S03[SE]", player), - lambda state: ( - state.has("D02Z01S03[W]", player) - or state.has("D02Z01S03[Cherubs]", player) - or state.has("Wall Climb Ability", player) - )) - - - # D02Z01S04 (Where Olive Trees Wither) - # Items - set_rule(world.get_location("WOTW: Gift for the tomb", player), - lambda state: ( - state.has("Golden Thimble Filled with Burning Oil", player) - and ( - state.has("D02Z01S01[W]", player) - or state.has("D02Z01S01[CherubsL]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - or ( - ( - state.has("D02Z01S01[SW]", player) - or state.has("D02Z01S01[CherubsR]", player) - ) - and can_dawn_jump(state, logic, player) - ) - ) - )) - # Doors - set_rule(world.get_entrance("D02Z01S04[-N]", player), - lambda state: ( - state.has("Golden Thimble Filled with Burning Oil", player) - and ( - state.has("D02Z01S01[W]", player) - or state.has("D02Z01S01[CherubsL]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - or ( - ( - state.has("D02Z01S01[SW]", player) - or state.has("D02Z01S01[CherubsR]", player) - ) - and can_dawn_jump(state, logic, player) - ) - ) - )) - - - # D02Z01S06 (Where Olive Trees Wither) - # Items - set_rule(world.get_location("WOTW: Underground ledge", player), - lambda state: ( - state.has("Wall Climb Ability", player) - and ( - state.has("Purified Hand of the Nun", player) - or state.has("Blood Perpetuated in Sand", player) - and ( - state.has("Dash Ability", player) - or state.has("D02Z01S06[Cherubs]", player) - ) - ) - )) - set_rule(world.get_location("WOTW: Underground Child of Moonlight", player), - lambda state: ( - ( - state.has("D02Z01S06[W]", player) - or state.has("Dash Ability", player) - or state.has("Purified Hand of the Nun", player) - and state.has("Wall Climb Ability", player) - ) - and ( - pillar(state, player) - or state.has("Cante Jondo of the Three Sisters", player) - or can_dive_laser(state, logic, player) - ) - or ( - state.has("Wall Climb Ability", player) - and ( - state.has("D02Z01S06[W]", player) - or state.has("Purified Hand of the Nun", player) - or state.has("Dash Ability", player) - ) - ) - and ( - state.has("Lorquiana", player) - or aubade(state, player) - or state.has("Cantina of the Blue Rose", player) - or can_air_stall(state, logic, player) - ) - )) - # Doors - set_rule(world.get_entrance("D02Z01S06[W]", player), - lambda state: ( - state.has("Dash Ability", player) - or state.has_all({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D02Z01S06[E]", player), - lambda state: state.has("Wall Climb Ability", player)) - # Event - set_rule(world.get_location("OpenedWOTWCave", player), - lambda state: opened_wotw_cave(state, player)) - - - # D02Z01S08 (Where Olive Trees Wither) - # Items - set_rule(world.get_location("WOTW: Underground tomb", player), - lambda state: state.has("Dried Flowers bathed in Tears", player)) - # No doors - - - # D02Z01S09 (Where Olive Trees Wither) - # Items - set_rule(world.get_location("WOTW: Upper east statue", player), - lambda state: ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 11) - or state.has("Purified Hand of the Nun", player) - and can_enemy_bounce(logic, enemy) - )) - # Doors - set_rule(world.get_entrance("D02Z01S09[-CherubsL]", player), - lambda state: state.has("Linen of Golden Thread", player)) - set_rule(world.get_entrance("D02Z01S09[-CherubsR]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 2) - or can_enemy_bounce(logic, enemy) - and can_air_stall(state, logic, player) - ) - )) - - - # D02Z02S01 (Graveyard of the Peaks) - # No items - # Doors - set_rule(world.get_entrance("D02Z02S01[W]", player), - lambda state: ( - state.has("D02Z02S01[NW]", player) - or state.has("D02Z02S01[Cherubs]", player) - or state.has("Dash Ability", player) - )) - set_rule(world.get_entrance("D02Z02S01[NW]", player), - lambda state: ( - state.has("D02Z02S01[Cherubs]", player) - or state.has("Wall Climb Ability", player) - and ( - state.has("D02Z02S01[W]", player) - or state.has("Dash Ability", player) - ) - )) - set_rule(world.get_entrance("D02Z02S01[E]", player), - lambda state: ( - state.has("D02Z02S01[NW]", player) - or state.has("D02Z02S01[Cherubs]", player) - or state.has_any({"Wall Climb Ability", "Dash Ability"}, player) - )) - - - # D02Z02S02 (Graveyard of the Peaks) - # Items - set_rule(world.get_location("GotP: Center shaft Child of Moonlight", player), - lambda state: ( - state.has("D02Z02S02[CherubsL]", player) - or state.has("D02Z02S02[CherubsR]", player) - or ( - ( - state.has("D02Z02S02[NW]", player) - or state.has("D02Z02S02[NE]", player) - or state.has("Wall Climb Ability", player) - ) - and ( - state.has_any({"Purified Hand of the Nun", "Cante Jondo of the Three Sisters"}, player) - or pillar(state, player) - or tirana(state, player) - or can_dive_laser(state, logic, player) - ) - ) - )) - # Doors - set_rule(world.get_entrance("D02Z02S02[NW]", player), - lambda state: ( - state.has("D02Z02S02[NE]", player) - or state.has("D02Z02S02[CherubsL]", player) - or state.has("D02Z02S02[CherubsR]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D02Z02S02[NE]", player), - lambda state: ( - state.has("D02Z02S02[NW]", player) - or state.has("D02Z02S02[CherubsL]", player) - or state.has("D02Z02S02[CherubsR]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D02Z02S02[-CherubsR]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D02Z02S03 (Graveyard of the Peaks) - # Items - set_rule(world.get_location("GotP: Lower east shaft", player), - lambda state: ( - state.has("D02Z02S03[NW]", player) - or state.has("D02Z02S03[NE]", player) - or state.has("Wall Climb Ability", player) - or can_cross_gap(state, logic, player, 2) - )) - set_rule(world.get_location("GotP: Center east shaft", player), - lambda state: ( - state.has("D02Z02S03[NW]", player) - or state.has("D02Z02S03[NE]", player) - or state.has_any({"Wall Climb Ability", "Purified Hand of the Nun"}, player) - )) - set_rule(world.get_location("GotP: Upper east shaft", player), - lambda state: ( - can_climb_on_root(state, player) - and ( - state.has("D02Z02S03[NE]", player) - or state.has("Purified Hand of the Nun", player) - or state.has("Blood Perpetuated in Sand", player) - ) - or state.has_all({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player) - )) - # Doors - set_rule(world.get_entrance("D02Z02S03[NW]", player), - lambda state: ( - state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - or state.has("D02Z02S03[NE]", player) - and can_walk_on_root(state, player) - )) - set_rule(world.get_entrance("D02Z02S03[NE]", player), - lambda state: ( - state.has("Wall Climb Ability", player) - and ( - can_cross_gap(state, logic, player, 11) - or ( - state.has("Blood Perpetuated in Sand", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 7) - ) - ) - or ( - can_walk_on_root(state, player) - and ( - state.has("Purified Hand of the Nun", player) - or can_air_stall(state, logic, player) - ) - ) - ) - )) - set_rule(world.get_entrance("D02Z02S03[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D02Z02S04 (Graveyard of the Peaks) - # Items - set_rule(world.get_location("GotP: Lower west shaft", player), - lambda state: state.has("D02Z02S04[E]", player)) - set_rule(world.get_location("GotP: Upper west shaft", player), - lambda state: - ( - state.has("D02Z02S04[NE]", player) - or ( - ( - state.has("D02Z02S04[W]", player) - or state.has("D02Z02S04[E]", player) - and state.has("Dash Ability", player) - ) - and ( - state.has("Purified Hand of the Nun", player) - or state.has("Wall Climb Ability", player) - ) - ) - or ( - state.has("D02Z02S04[SE]", player) - and ( - state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - and can_enemy_upslash(state, logic, enemy, player) - ) - ) - )) - set_rule(world.get_location("GotP: West shaft Child of Moonlight", player), - lambda state: - ( - ( - state.has("D02Z02S04[NE]", player) - or state.has("D02Z02S04[W]", player) - or state.has("D02Z02S04[E]", player) - and state.has("Dash Ability", player) - or state.has("D02Z02S04[SE]", player) - and ( - state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - and can_enemy_upslash(state, logic, enemy, player) - ) - ) - and ( - state.has("Blood Perpetuated in Sand", player) - and state.has("Dash Ability", player) - or state.has("Purified Hand of the Nun", player) - and can_enemy_bounce(logic, enemy) - or state.has_any({"Lorquiana", "Cante Jondo of the Three Sisters", "Verdiales of the Forsaken Hamlet", "Cantina of the Blue Rose"}, player) - or aubade(state, player) - ) - or ( - state.has("D02Z02S04[NE]", player) - or state.has("D02Z02S04[W]", player) - or state.has("D02Z02S04[E]", player) - and state.has("Dash Ability", player) - or state.has("D02Z02S04[SE]", player) - ) - and pillar(state, player) - )) - # Doors - set_rule(world.get_entrance("D02Z02S04[W]", player), - lambda state: ( - state.has("D02Z02S04[NE]", player) - or state.has("D02Z02S04[E]", player) - and state.has("Dash Ability", player) - or state.has("D02Z02S04[SE]", player) - and ( - state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - and can_enemy_upslash(state, logic, enemy, player) - ) - )) - set_rule(world.get_entrance("D02Z02S04[SE]", player), - lambda state: ( - state.has("D02Z02S04[NE]", player) - or state.has("D02Z02S04[W]", player) - or state.has("Dash Ability", player) - )) - set_rule(world.get_entrance("D02Z02S04[NE]", player), - lambda state: ( - ( - ( - state.has("D02Z02S04[W]", player) - or state.has("D02Z02S04[E]", player) - and state.has("Dash Ability", player) - ) - and state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - ) - or ( - state.has("D02Z02S04[SE]", player) - and ( - state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - and can_enemy_upslash(state, logic, enemy, player) - ) - ) - )) - set_rule(world.get_entrance("D02Z02S04[-CherubsL]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - and ( - state.has("D02Z02S04[NE]", player) - or state.has("D02Z02S04[W]", player) - or state.has("D02Z02S04[SE]", player) - or state.has("Dash Ability", player) - ) - )) - - - # D02Z02S05 (Graveyard of the Peaks) - # Items - set_rule(world.get_location("GotP: Center shaft ledge", player), - lambda state: ( - state.has("D02Z02S05[NW]", player) - or state.has("Wall Climb Ability", player) - )) - # Doors - set_rule(world.get_entrance("D02Z02S05[W]", player), - lambda state: ( - state.has("Purified Hand of the Nun", player) - and can_enemy_bounce(logic, enemy) - )) - set_rule(world.get_entrance("D02Z02S05[E]", player), - lambda state: ( - state.has("D02Z02S05[NW]", player) - or state.has("D02Z02S05[E]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D02Z02S05[NW]", player), - lambda state: ( - state.has("D02Z02S05[NW]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D02Z02S05[-CherubsL]", player), - lambda state: state.has("Linen of Golden Thread", player)) - set_rule(world.get_entrance("D02Z02S05[-CherubsR]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D02Z02S08 (Graveyard of the Peaks) - # Items - set_rule(world.get_location("GotP: Shop cave hidden hole", player), - lambda state: ( - state.has("D02Z02S08[CherubsR]", player) - or state.has("Blood Perpetuated in Sand", player) - or can_break_holes(state, player) - or can_cross_gap(state, logic, player, 8) - )) - set_rule(world.get_location("GotP: Shop cave Child of Moonlight", player), - lambda state: ( - state.has("D02Z02S08[CherubsR]", player) - or can_dive_laser(state, logic, player) - or state.has("Blood Perpetuated in Sand", player) - or pillar(state, player) - or can_cross_gap(state, logic, player, 8) - )) - # No doors - - - # D02Z02S11 (Graveyard of the Peaks) - # No items - # Doors - set_rule(world.get_entrance("D02Z02S11[E]", player), - lambda state: ( - state.has("D02Z02S11[NW]", player) - or state.has("D02Z02S11[NE]", player) - or can_cross_gap(state, logic, player, 6) - )) - set_rule(world.get_entrance("D02Z02S11[NW]", player), - lambda state: state.has("D02Z02S11[NE]", player)) - set_rule(world.get_entrance("D02Z02S11[NE]", player), - lambda state: state.has("D02Z02S11[NW]", player)) - set_rule(world.get_entrance("D02Z02S11[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D02Z02S14 (Graveyard of the Peaks) - # Items - set_rule(world.get_location("GotP: Amanecida of the Bejeweled Arrow", player), - lambda state: can_beat_boss(state, "Graveyard", logic, player)) - # Doors - set_rule(world.get_entrance("D02Z02S14[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D02Z03S02 (Convent of Our Lady of the Charred Visage) - # No items - # Doors - set_rule(world.get_entrance("D02Z03S02[W]", player), - lambda state: ( - state.has("D02Z03S02[NW]", player) - or state.has("D02Z03S02[NE]", player) - or state.has("D02Z03S02[N]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D02Z03S02[NW]", player), - lambda state: ( - state.has("D02Z03S02[NE]", player) - or state.has("D02Z03S02[N]", player) - )) - set_rule(world.get_entrance("D02Z03S02[NE]", player), - lambda state: ( - state.has("D02Z03S02[NW]", player) - or state.has("D02Z03S02[N]", player) - )) - set_rule(world.get_entrance("D02Z03S02[N]", player), - lambda state: ( - state.has("D02Z03S02[NW]", player) - or state.has("D02Z03S02[NE]", player) - )) - add_rule(world.get_entrance("D02Z03S02[N]", player), - lambda state: state.has("OpenedConventLadder", player)) - - - # D02Z03S03 (Convent of Our Lady of the Charred Visage) - # Items - set_rule(world.get_location("CoOLotCV: Snowy window ledge", player), - lambda state: ( - state.has("D02Z03S03[NW]", player) - or state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 3) - )) - # Doors - set_rule(world.get_entrance("D02Z03S03[NW]", player), - lambda state: ( - state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 3) - )) - - - # D02Z03S05 (Convent of Our Lady of the Charred Visage) - # Items - set_rule(world.get_location("CoOLotCV: Center miasma room", player), - lambda state: ( - state.has("Dash Ability", player) - and ( - state.has("D02Z03S05[S]", player) - or state.has("D02Z03S05[NE]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - ) - )) - # Doors - set_rule(world.get_entrance("D02Z03S05[S]", player), - lambda state: ( - state.has("D02Z03S05[NE]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D02Z03S05[NE]", player), - lambda state: ( - state.has("D02Z03S05[S]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - - - # D02Z03S10 (Convent of Our Lady of the Charred Visage) - # No items - # Doors - set_rule(world.get_entrance("D02Z03S10[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D02Z03S11 (Convent of Our Lady of the Charred Visage) - # Event - set_rule(world.get_location("OpenedConventLadder", player), - lambda state: opened_convent_ladder(state, player)) - - - # D02Z03S12 (Convent of Our Lady of the Charred Visage) - # Items - set_rule(world.get_location("CoOLotCV: Lower west statue", player), - lambda state: ( - can_survive_poison(state, logic, player, 1) - and state.has("Dash Ability", player) - )) - # No doors - - - # D02Z03S18 (Convent of Our Lady of the Charred Visage) - # No items - # Doors - set_rule(world.get_entrance("D02Z03S18[NW]", player), - lambda state: ( - state.has("D02Z03S18[NE]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D02Z03S18[NE]", player), - lambda state: ( - state.has("D02Z03S18[NW]", player) - or state.has("Wall Climb Ability", player) - )) - - - # D02Z03S20 (Convent of Our Lady of the Charred Visage) - # Items - set_rule(world.get_location("CoOLotCV: Our Lady of the Charred Visage", player), - lambda state: can_beat_boss(state, "Convent", logic, player)) - # Doors - set_rule(world.get_entrance("D02Z03S20[W]", player), - lambda state: can_beat_boss(state, "Convent", logic, player)) - set_rule(world.get_entrance("D02Z03S20[E]", player), - lambda state: can_beat_boss(state, "Convent", logic, player)) - - - # D02Z03S21 (Convent of Our Lady of the Charred Visage) - # Items - set_rule(world.get_location("CoOLotCV: Fountain of burning oil", player), - lambda state: state.has("Empty Golden Thimble", player)) - # No doors - - - # D03Z01S01 (Mountains of the Endless Dusk) - # No items - # Doors - set_rule(world.get_entrance("D03Z01S01[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D03Z01S02 (Mountains of the Endless Dusk) - # No items - # Doors - set_rule(world.get_entrance("D03Z01S02[W]", player), - lambda state: ( - state.has("Wall Climb Ability", player) - or can_cross_gap(state, logic, player, 3) - )) - set_rule(world.get_entrance("D03Z01S02[E]", player), - lambda state: ( - state.has("Wall Climb Ability", player) - or can_cross_gap(state, logic, player, 7) - )) - - - # D03Z01S03 (Mountains of the Endless Dusk) - # Items - set_rule(world.get_location("MotED: Platform above chasm", player), - lambda state: ( - state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player) - and ( - state.has("D03Z01S03[W]", player) - or state.has("D03Z01S03[SW]", player) - or can_cross_gap(state, logic, player, 9) - ) - )) - set_rule(world.get_location("MotED: 1st meeting with Redento", player), - lambda state: ( - state.has("D03Z01S03[W]", player) - or state.has("D03Z01S03[SW]", player) - or can_cross_gap(state, logic, player, 9) - )) - set_rule(world.get_location("MotED: Child of Moonlight, above chasm", player), - lambda state: ( - state.has("D03Z01S03[W]", player) - or state.has("D03Z01S03[SW]", player) - or can_cross_gap(state, logic, player, 9) - )) - set_rule(world.get_location("MotED: Amanecida of the Golden Blades", player), - lambda state: ( - can_beat_boss(state, "Jondo", logic, player) - and ( - state.has("D03Z01S03[W]", player) - or state.has("D03Z01S03[SW]", player) - or can_cross_gap(state, logic, player, 9) - ) - )) - # Doors - set_rule(world.get_entrance("D03Z01S03[W]", player), - lambda state: ( - state.has("Wall Climb Ability", player) - and ( - state.has("D03Z01S03[SW]", player) - or can_cross_gap(state, logic, player, 9) - ) - )) - set_rule(world.get_entrance("D03Z01S03[E]", player), - lambda state: state.has("Wall Climb Ability", player)) - set_rule(world.get_entrance("D03Z01S03[SW]", player), - lambda state: ( - state.has("D03Z01S03[W]", player) - or can_cross_gap(state, logic, player, 9) - )) - set_rule(world.get_entrance("D03Z01S03[-WestL]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - and ( - state.has("D03Z01S03[W]", player) - or state.has("D03Z01S03[SW]", player) - or can_cross_gap(state, logic, player, 9) - ) - )) - set_rule(world.get_entrance("D03Z01S03[-WestR]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - and ( - state.has("D03Z01S03[W]", player) - or state.has("D03Z01S03[SW]", player) - or can_cross_gap(state, logic, player, 9) - ) - )) - set_rule(world.get_entrance("D03Z01S03[-EastL]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - and ( - state.has("D03Z01S03[W]", player) - or state.has("D03Z01S03[SW]", player) - or can_cross_gap(state, logic, player, 5) - ) - )) - set_rule(world.get_entrance("D03Z01S03[-EastR]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D03Z01S04 (Mountains of the Endless Dusk) - # Items - set_rule(world.get_location("MotED: Blood platform alcove", player), - lambda state: ( - state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player) - or upwarp_skips_allowed(logic) - )) - # No doors - - - # D03Z01S06 (Mountains of the Endless Dusk) - # Items - set_rule(world.get_location("MotED: Perpetva", player), - lambda state: can_beat_boss(state, "Perpetua", logic, player)) - set_rule(world.get_location("MotED: Egg hatching", player), - lambda state: can_beat_boss(state, "Perpetua", logic, player) and \ - state.has("Egg of Deformity", player)) - # Doors - set_rule(world.get_entrance("D03Z01S06[W]", player), - lambda state: can_beat_boss(state, "Perpetua", logic, player)) - set_rule(world.get_entrance("D03Z01S06[E]", player), - lambda state: can_beat_boss(state, "Perpetua", logic, player)) - - - # D03Z02S01 (Jondo) - # Items - set_rule(world.get_location("Jondo: Upper east chest", player), - lambda state: ( - state.has("D03Z02S01[Cherubs]", player) - or can_climb_on_root(state, player) - or can_cross_gap(state, logic, player, 8) - or state.has("Purified Hand of the Nun", player) - and can_enemy_bounce(logic, enemy) - )) - # Doors - set_rule(world.get_entrance("D03Z02S01[W]", player), - lambda state: ( - state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - and can_enemy_bounce(logic, enemy) - )) - set_rule(world.get_entrance("D03Z02S01[N]", player), - lambda state: ( - state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - )) - - - # D03Z02S02 (Jondo) - # No items - # Doors - set_rule(world.get_entrance("D03Z02S02[W]", player), - lambda state: ( - state.has("D03Z02S02[CherubsL]", player) - or state.has("Purified Hand of the Nun", player) - and ( - state.has("D03Z02S02[E]", player) - or state.has("D03Z02S02[CherubsR]", player) - or state.has("Wall Climb Ability", player) - or can_enemy_bounce(logic, enemy) - ) - )) - set_rule(world.get_entrance("D03Z02S02[E]", player), - lambda state: ( - state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - and can_enemy_bounce(logic, enemy) - )) - - # D03Z02S03 (Jondo) - # No items - # Doors - set_rule(world.get_entrance("D03Z02S03[W]", player), - lambda state: ( - state.has("Dash Ability", player) - and ( - state.has("D03Z02S03[E]", player) - or state.has("D03Z02S03[N]", player) - or state.has("D03Z02S03[SE2]", player) - ) - )) - set_rule(world.get_entrance("D03Z02S03[E]", player), - lambda state: ( - ( - can_air_stall(state, logic, player) - or state.has_any({"Purified Hand of the Nun", "Boots of Pleading"}, player) - ) - and ( - state.has("Dash Ability", player) - or state.has("D03Z02S03[N]", player) - or state.has("D03Z02S03[SE2]", player) - ) - )) - set_rule(world.get_entrance("D03Z02S03[N]", player), - lambda state: ( - state.has("D03Z02S03[W]", player) - and state.has("Dash Ability", player) - or state.has("D03Z02S03[E]", player) - or state.has("D03Z02S03[SE2]", player) - )) - set_rule(world.get_entrance("D03Z02S03[SE2]", player), - lambda state: ( - state.has("D03Z02S03[W]", player) - and state.has("Dash Ability", player) - or state.has("D03Z02S03[E]", player) - or state.has("D03Z02S03[N]", player) - )) - set_rule(world.get_entrance("D03Z02S03[SW]", player), - lambda state: ( - state.has("D03Z02S03[SE]", player) - or state.has("D03Z02S03[SSL]", player) - or state.has("D03Z02S03[SSR]", player) - or state.has("BrokeJondoBellW", player) - and state.has("BrokeJondoBellE", player) - and ( - state.has("D03Z02S03[W]", player) - and state.has("Dash Ability", player) - or state.has("D03Z02S03[E]", player) - or state.has("D03Z02S03[N]", player) - or state.has("D03Z02S03[SE2]", player) - ) - )) - set_rule(world.get_entrance("D03Z02S03[SE]", player), - lambda state: ( - state.has("D03Z02S03[SW]", player) - or state.has("D03Z02S03[SSL]", player) - or state.has("D03Z02S03[SSR]", player) - or state.has("BrokeJondoBellW", player) - and state.has("BrokeJondoBellE", player) - and ( - state.has("D03Z02S03[W]", player) - and state.has("Dash Ability", player) - or state.has("D03Z02S03[E]", player) - or state.has("D03Z02S03[N]", player) - or state.has("D03Z02S03[SE2]", player) - ) - )) - set_rule(world.get_entrance("D03Z02S03[SSL]", player), - lambda state: ( - state.has("D03Z02S03[SW]", player) - or state.has("D03Z02S03[SE]", player) - or state.has("D03Z02S03[SSR]", player) - or state.has("BrokeJondoBellW", player) - and state.has("BrokeJondoBellE", player) - and ( - state.has("D03Z02S03[W]", player) - and state.has("Dash Ability", player) - or state.has("D03Z02S03[E]", player) - or state.has("D03Z02S03[N]", player) - or state.has("D03Z02S03[SE2]", player) - ) - )) - set_rule(world.get_entrance("D03Z02S03[SSC]", player), - lambda state: ( - state.has("D03Z02S03[SW]", player) - or state.has("D03Z02S03[SE]", player) - or state.has("D03Z02S03[SSL]", player) - or state.has("D03Z02S03[SSR]", player) - or state.has("BrokeJondoBellW", player) - and state.has("BrokeJondoBellE", player) - and ( - state.has("D03Z02S03[W]", player) - and state.has("Dash Ability", player) - or state.has("D03Z02S03[E]", player) - or state.has("D03Z02S03[N]", player) - or state.has("D03Z02S03[SE2]", player) - ) - )) - set_rule(world.get_entrance("D03Z02S03[SSR]", player), - lambda state: ( - state.has("D03Z02S03[SW]", player) - or state.has("D03Z02S03[SE]", player) - or state.has("D03Z02S03[SSL]", player) - or state.has("BrokeJondoBellW", player) - and state.has("BrokeJondoBellE", player) - and ( - state.has("D03Z02S03[W]", player) - and state.has("Dash Ability", player) - or state.has("D03Z02S03[E]", player) - or state.has("D03Z02S03[N]", player) - or state.has("D03Z02S03[SE2]", player) - ) - )) - - - # D03Z02S04 (Jondo) - # Items - set_rule(world.get_location("Jondo: Lower east under chargers", player), - lambda state: ( - state.has("D03Z02S04[NE]", player) - or state.has("D03Z02S04[S]", player) - or state.has("Wall Climb Ability", player) - )) - # Doors - set_rule(world.get_entrance("D03Z02S04[NW]", player), - lambda state: state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)) - set_rule(world.get_entrance("D03Z02S04[NE]", player), - lambda state: ( - state.has("Wall Climb Ability", player) - or ( - state.has("D03Z02S04[S]", player) - and state.has("Purified Hand of the Nun", player) - ) - )) - set_rule(world.get_entrance("D03Z02S04[S]", player), - lambda state: ( - state.has("D03Z02S04[NE]", player) - or state.has("Wall Climb Ability", player) - )) - - - # D03Z02S05 (Jondo) - # Items - set_rule(world.get_location("Jondo: Upper east Child of Moonlight", player), - lambda state: ( - state.has("D03Z02S05[E]", player) - or state.has("D03Z02S05[S]", player) - or can_cross_gap(state, logic, player, 5) - or ( - can_enemy_bounce(logic, enemy) - and can_cross_gap(state, logic, player, 3) - ) - )) - # Doors - set_rule(world.get_entrance("D03Z02S05[E]", player), - lambda state: ( - state.has("D03Z02S05[S]", player) - or can_cross_gap(state, logic, player, 5) - or ( - can_enemy_bounce(logic, enemy) - and can_cross_gap(state, logic, player, 3) - ) - )) - set_rule(world.get_entrance("D03Z02S05[S]", player), - lambda state: ( - state.has("D03Z02S05[E]", player) - or can_cross_gap(state, logic, player, 5) - or ( - can_enemy_bounce(logic, enemy) - and can_cross_gap(state, logic, player, 3) - ) - )) - # Event - set_rule(world.get_location("BrokeJondoBellE", player), - lambda state: broke_jondo_bell_e(state, logic, enemy, player)) - - - # D03Z02S08 (Jondo) - # Items - set_rule(world.get_location("Jondo: Lower west bell alcove", player), - lambda state: ( - state.has("D03Z02S08[N]", player) - or state.has("D03Z02S08[W]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - # Doors - set_rule(world.get_entrance("D03Z02S08[W]", player), - lambda state: ( - state.has("D03Z02S08[N]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D03Z02S08[N]", player), - lambda state: ( - state.has("D03Z02S08[W]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - - - # D03Z02S09 (Jondo) - # No items - # Doors - set_rule(world.get_entrance("D03Z02S09[W]", player), - lambda state: state.has("Dash Ability", player)) - set_rule(world.get_entrance("D03Z02S09[N]", player), - lambda state: ( - state.has("D03Z02S09[S]", player) - or state.has("D03Z02S09[Cherubs]", player) - or state.has("Dash Ability", player) - )) - set_rule(world.get_entrance("D03Z02S09[S]", player), - lambda state: ( - state.has("D03Z02S09[N]", player) - or state.has("D03Z02S09[Cherubs]", player) - or state.has("Dash Ability", player) - )) - # Event - set_rule(world.get_location("BrokeJondoBellW", player), - lambda state: broke_jondo_bell_w(state, player)) - - - # D03Z02S10 (Jondo) - # No items - # Doors - set_rule(world.get_entrance("D03Z02S10[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D03Z02S11 (Jondo) - # Items - set_rule(world.get_location("Jondo: Spike tunnel statue", player), - lambda state: ( - state.has("D03Z02S11[W]", player) - and state.has("Purified Hand of the Nun", player) - or state.has("D03Z02S11[E]", player) - and state.has("Dash Ability", player) - and ( - state.has("Wall Climb Ability", player) - or can_cross_gap(state, logic, player, 2) - or precise_skips_allowed(logic) - and can_cross_gap(state, logic, player, 1) - ) - )) - set_rule(world.get_location("Jondo: Spike tunnel Child of Moonlight", player), - lambda state: ( - state.has("D03Z02S11[W]", player) - and ( - state.has("Purified Hand of the Nun", player) - or state.has("Dash Ability", player) - and ( - state.has("Wall Climb Ability", player) - or can_cross_gap(state, logic, player, 2) - and can_enemy_bounce(logic, enemy) - or can_cross_gap(state, logic, player, 3) - ) - ) - or state.has("D03Z02S11[E]", player) - and state.has("Dash Ability", player) - and ( - can_cross_gap(state, logic, player, 1) - or state.has("Wall Climb Ability", player) - or can_enemy_bounce(logic, enemy) - ) - )) - # Doors - set_rule(world.get_entrance("D03Z02S11[W]", player), - lambda state: ( - state.has("Dash Ability", player) - and ( - state.has("Wall Climb Ability", player) - or can_cross_gap(state, logic, player, 2) - or precise_skips_allowed(logic) - and can_cross_gap(state, logic, player, 1) - ) - )) - set_rule(world.get_entrance("D03Z02S11[E]", player), - lambda state: ( - state.has("Dash Ability", player) - and ( - state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - or can_cross_gap(state, logic, player, 2) - and can_enemy_bounce(logic, enemy) - ) - )) - - # D03Z02S13 (Jondo) - # Items - set_rule(world.get_location("Jondo: Upper west tree root", player), - lambda state: ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 3) - )) - # Doors - set_rule(world.get_entrance("D03Z02S13[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D03Z03S01 (Grievance Ascends) - # No items - # Doors - set_rule(world.get_entrance("D03Z03S01[NL]", player), - lambda state: ( - state.has("D03Z03S01[NR]", player) - or state.has("D03Z03S01[NC]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D03Z03S01[NR]", player), - lambda state: ( - state.has("D03Z03S01[NL]", player) - or state.has("D03Z03S01[NC]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - - - # D03Z03S02 (Grievance Ascends) - # Items - set_rule(world.get_location("GA: Lower west ledge", player), - lambda state: can_survive_poison(state, logic, player, 1)) - # Doors - set_rule(world.get_entrance("D03Z03S02[W]", player), - lambda state: ( - state.has("D03Z03S02[NE]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D03Z03S02[NE]", player), - lambda state: state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)) - - - # D03Z03S03 (Grievance Ascends) - # No items - # Doors - set_rule(world.get_entrance("D03Z03S03[W]", player), - lambda state: state.has("D03Z03S03[NE]", player)) - set_rule(world.get_entrance("D03Z03S03[NE]", player), - lambda state: state.has("D03Z03S03[W]", player)) - - - # D03Z03S04 (Grievance Ascends) - # No items - # Doors - set_rule(world.get_entrance("D03Z03S04[NW]", player), - lambda state: ( - state.has("D03Z03S04[NE]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - and ( - state.has("D03Z03S04[E]", player) - or state.has("D03Z03S04[SW]", player) - or state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 10) - ) - )) - set_rule(world.get_entrance("D03Z03S04[NE]", player), - lambda state: ( - ( - state.has("Wall Climb Ability", player) - or state.has("Purified Hand of the Nun", player) - and can_enemy_bounce(logic, enemy) - ) - and ( - state.has("D03Z03S04[NW]", player) - or state.has("D03Z03S04[E]", player) - or state.has("D03Z03S04[SW]", player) - or state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 10) - ) - )) - set_rule(world.get_entrance("D03Z03S04[E]", player), - lambda state: ( - state.has("D03Z03S04[NW]", player) - or state.has("D03Z03S04[NE]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - and ( - state.has("D03Z03S04[SW]", player) - or state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 10) - ) - )) - set_rule(world.get_entrance("D03Z03S04[SW]", player), - lambda state: ( - state.has("D03Z03S04[NW]", player) - or state.has("D03Z03S04[NE]", player) - or state.has("D03Z03S04[E]", player) - or state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 10) - )) - set_rule(world.get_entrance("D03Z03S04[SE]", player), - lambda state: state.has("Blood Perpetuated in Sand", player)) - set_rule(world.get_entrance("D03Z03S04[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D03Z03S05 (Grievance Ascends) - # No items - # Doors - set_rule(world.get_entrance("D03Z03S05[NW]", player), - lambda state: state.has("D03Z03S05[NE]", player)) - set_rule(world.get_entrance("D03Z03S05[NE]", player), - lambda state: state.has("D03Z03S05[NW]", player)) - set_rule(world.get_entrance("D03Z03S05[SW]", player), - lambda state: state.has("D03Z03S05[SE]", player) or \ - state.has("Linen of Golden Thread", player)) - set_rule(world.get_entrance("D03Z03S05[SE]", player), - lambda state: state.has("D03Z03S05[SW]", player) or \ - state.has("Linen of Golden Thread", player)) - - - # D03Z03S06 (Grievance Ascends) - # Items - set_rule(world.get_location("GA: Miasma room floor", player), - lambda state: can_survive_poison(state, logic, player, 1)) - set_rule(world.get_location("GA: Miasma room treasure", player), - lambda state: state.has("Wall Climb Ability", player)) - set_rule(world.get_location("GA: Miasma room Child of Moonlight", player), - lambda state: ( - state.has("Wall Climb Ability", player) - or can_cross_gap(state, logic, player, 11) - and state.has("Taranto to my Sister", player) - and obscure_skips_allowed(logic) - )) - # No doors - - - # D03Z03S07 (Grievance Ascends) - # No items - # Doors - set_rule(world.get_entrance("D03Z03S07[NW]", player), - lambda state: ( - state.has("D03Z03S07[NE]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D03Z03S07[NE]", player), - lambda state: ( - state.has("D03Z03S07[NE]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - - - # D03Z03S08 (Grievance Ascends) - # Items - set_rule(world.get_location("GA: End of blood bridge", player), - lambda state: ( - state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 11) - )) - set_rule(world.get_location("GA: Blood bridge Child of Moonlight", player), - lambda state: ( - ( - state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 11) - ) - and ( - state.has_any({"Purified Hand of the Nun", "Cante Jondo of the Three Sisters", "Verdiales of the Forsaken Hamlet"}, player) - or pillar(state, player) - or tirana(state, player) - or aubade(state, player) - and can_air_stall(state, logic, player) - ) - )) - # Doors - set_rule(world.get_entrance("D03Z03S08[-CherubsL]", player), - lambda state: state.has("Linen of Golden Thread", player)) - set_rule(world.get_entrance("D03Z03S08[-CherubsR]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D03Z03S09 (Grievance Ascends) - # Items - set_rule(world.get_location("GA: Lower east Child of Moonlight", player), - lambda state: ( - can_climb_on_root(state, player) - or state.has_any({"Purified Hand of the Nun", "Lorquiana", "Zarabanda of the Safe Haven", "Cante Jondo of the Three Sisters"}, player) - or pillar(state, player) - or aubade(state, player) - or tirana(state, player) - )) - # No doors - - - # D03Z03S10 (Grievance Ascends) - # Items - set_rule(world.get_location("GA: Altasgracias' gift", player), - lambda state: state.has_group("egg", player, 3)) - set_rule(world.get_location("GA: Empty giant egg", player), - lambda state: ( - state.has_group("egg", player, 3) - and state.has("Hatched Egg of Deformity", player) - and ( - state.has("D01Z02S01[W]", player) - or state.has("D01Z02S01[E]", player) - ) - )) - # No doors - - - # D03Z03S15 (Grievance Ascends) - # Items - set_rule(world.get_location("GA: Tres Angustias", player), - lambda state: can_beat_boss(state, "Grievance", logic, player)) - # Doors - set_rule(world.get_entrance("D03Z03S15[W]", player), - lambda state: can_beat_boss(state, "Grievance", logic, player)) - set_rule(world.get_entrance("D03Z03S15[E]", player), - lambda state: can_beat_boss(state, "Grievance", logic, player)) - - - # D04Z01S01 (Patio of the Silent Steps) - # Items - set_rule(world.get_location("PotSS: First area ledge", player), - lambda state: ( - state.has("D04Z01S01[NE]", player) - or state.has("D04Z01S01[N]", player) - or can_cross_gap(state, logic, player, 3) - )) - # Doors - set_rule(world.get_entrance("D04Z01S01[NE]", player), - lambda state: ( - state.has("D04Z01S01[N]", player) - or can_cross_gap(state, logic, player, 3) - )) - set_rule(world.get_entrance("D04Z01S01[N]", player), - lambda state: ( - state.has("D04Z01S01[NE]", player) - or can_cross_gap(state, logic, player, 3) - )) - - - # D04Z01S02 (Patio of the Silent Steps) - # Items - set_rule(world.get_location("PotSS: Second area ledge", player), - lambda state: ( - can_climb_on_root(state, player) - or can_cross_gap(state, logic, player, 3) - )) - # No doors - - - # D04Z01S03 (Patio of the Silent Steps) - # Items - set_rule(world.get_location("PotSS: Third area upper ledge", player), - lambda state: ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 3) - )) - # No doors - - - # D04Z01S04 (Patio of the Silent Steps) - # Items - set_rule(world.get_location("PotSS: 4th meeting with Redento", player), - lambda state: redento(state, blasphemousworld, player, 4)) - set_rule(world.get_location("PotSS: Amanecida of the Chiselled Steel", player), - lambda state: can_beat_boss(state, "Patio", logic, player)) - # No doors - - - # D04Z01S05 (Patio of the Silent Steps) - # No items - # Doors - set_rule(world.get_entrance("D04Z01S05[N]", player), - lambda state: ( - ( - state.has("Blood Perpetuated in Sand", player) - and can_climb_on_root(state, player) - ) - or state.has("Purified Hand of the Nun", player) - and ( - state.has("Blood Perpetuated in Sand", player) - or can_climb_on_root(state, player) - ) - )) - set_rule(world.get_entrance("D04Z01S05[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D04Z01S06 (Patio of the Silent Steps) - # No items - # Doors - set_rule(world.get_entrance("D04Z01S06[E]", player), - lambda state: state.has("Purified Hand of the Nun", player)) - set_rule(world.get_entrance("D04Z01S06[Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D04Z02S01 (Mother of Mothers) - # Items - if world.purified_hand[player]: - set_rule(world.get_location("MoM: Western room ledge", player), - lambda state: ( - state.has("D04Z02S01[N]", player) - or state.has("D04Z02S01[NE]", player) - and state.has("Dash Ability", player) - and state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_location("MoM: Lower west Child of Moonlight", player), - lambda state: ( - state.has("D04Z02S01[N]", player) - or pillar(state, player) - or state.has("D04Z02S01[NE]", player) - and state.has("Dash Ability", player) - and ( - state.has("Wall Climb Ability", player) - or can_cross_gap(state, logic, player, 1) - ) - )) - # Doors - set_rule(world.get_entrance("D04Z02S01[N]", player), - lambda state: ( - state.has("D04Z02S04[NE]", player) - and state.has("Dash Ability", player) - and state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D04Z02S01[NE]", player), - lambda state: ( - state.has("D04Z02S01[N]", player) - or state.has("Dash Ability", player) - and can_cross_gap(state, logic, player, 1) - )) - - - # D04Z02S02 (Mother of Mothers) - # No items - # Doors - set_rule(world.get_entrance("D04Z02S02[NE]", player), - lambda state: ( - ( - state.has("Purified Hand of the Nun", player) - and upwarp_skips_allowed(logic) - ) - or ( - state.has("Purified Hand of the Nun", player) - and can_enemy_upslash(state, logic, enemy, player) - ) - or ( - can_enemy_upslash(state, logic, enemy, player) - and upwarp_skips_allowed(logic) - and ( - state.has("Wall Climb Ability", player) - or state.has("D04Z02S02[N]", player) - ) - ) - )) - set_rule(world.get_entrance("D04Z02S02[N]", player), - lambda state: ( - state.has("D04Z02S02[NE]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - - - # D04Z02S04 (Mother of Mothers) - # No items - # Doors - set_rule(world.get_entrance("D04Z02S04[NW]", player), - lambda state: ( - state.has("D04Z02S04[NE]", player) - or state.has("D04Z02S04[N]", player) - or state.has("D04Z02S04[Cherubs]", player) - or state.has_all({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D04Z02S04[NE]", player), - lambda state: ( - state.has("D04Z02S04[NW]", player) - or state.has("D04Z02S04[N]", player) - or state.has("D04Z02S04[Cherubs]", player) - or state.has_all({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D04Z02S04[N]", player), - lambda state: ( - ( - state.has("D04Z02S04[NW]", player) - or state.has("D04Z02S04[NE]", player) - or state.has("D04Z02S04[Cherubs]", player) - or state.has_all({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - ) - and state.has("OpenedMOMLadder", player) - )) - - - # D04Z02S06 (Mother of Mothers) - # Items - set_rule(world.get_location("MoM: Outside Cleofas' room", player), - lambda state: ( - state.has("D04Z02S06[NW]", player) - or state.has("D04Z02S06[N]", player) - or state.has("D04Z02S06[NE]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - # Doors - set_rule(world.get_entrance("D04Z02S06[NW]", player), - lambda state: ( - state.has("D04Z02S06[N]", player) - or state.has("D04Z02S06[NE]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D04Z02S06[N]", player), - lambda state: ( - ( - state.has("D04Z02S06[NW]", player) - or state.has("D04Z02S06[NE]", player) - or state.has("Wall Climb Ability", player) - ) - and state.has("OpenedARLadder", player) - )) - set_rule(world.get_entrance("D04Z02S06[NE]", player), - lambda state: ( - state.has("D04Z02S06[NW]", player) - or state.has("D04Z02S06[N]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D04Z02S06[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - # Event - set_rule(world.get_location("OpenedMOMLadder", player), - lambda state: opened_mom_ladder(state, player)) - - - # D04Z02S07 (Mother of Mothers) - # Items - set_rule(world.get_location("MoM: East chandelier platform", player), - lambda state: ( - state.has("Dash Ability", player) - and ( - state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 3) - ) - )) - # No doors - - - # D04Z02S09 (Mother of Mothers) - # No items - # Doors - set_rule(world.get_entrance("D04Z02S09[NE]", player), - lambda state: state.has("Blood Perpetuated in Sand", player)) - - - # D04Z02S16 (Mother of Mothers) - # Items - set_rule(world.get_location("MoM: Giant chandelier statue", player), - lambda state: ( - state.has("Wall Climb Ability", player) - and state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player) - )) - # Doors - set_rule(world.get_entrance("D04Z02S16[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D04Z02S20 (Mother of Mothers) - # No items - # Doors - set_rule(world.get_entrance("D04Z02S20[Redento]", player), - lambda state: redento(state, blasphemousworld, player, 5)) - - - # D04Z02S21 (Mother of Mothers) - # No items - # Doors - set_rule(world.get_entrance("D04Z02S21[W]", player), - lambda state: ( - state.has("D04Z02S21[NE]", player) - or state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player) - )) - set_rule(world.get_entrance("D04Z02S21[NE]", player), - lambda state: state.has_any({"Purified Hand of the Nun", "Wall Climb Ability"}, player)) - - - # D04Z02S22 (Mother of Mothers) - # Items - set_rule(world.get_location("MoM: Melquiades, The Exhumed Archbishop", player), - lambda state: can_beat_boss(state, "Mothers", logic, player)) - # Doors - set_rule(world.get_entrance("D04Z02S22[W]", player), - lambda state: can_beat_boss(state, "Mothers", logic, player)) - set_rule(world.get_entrance("D04Z02S22[E]", player), - lambda state: can_beat_boss(state, "Mothers", logic, player)) - - - # D04BZ02S01 (Mother of Mothers - Redento) - # Items - set_rule(world.get_location("MoM: Final meeting with Redento", player), - lambda state: redento(state, blasphemousworld, player, 5)) - # No doors - - - # D04Z03S02 (Knot of the Three Words) - # Items - set_rule(world.get_location("KotTW: Gift from the Traitor", player), - lambda state: state.has_all({"Severed Right Eye of the Traitor", "Broken Left Eye of the Traitor"}, player)) - # No doors - - - # D04Z04S01 (All the Tears of the Sea) - # Items - set_rule(world.get_location("AtTotS: Miriam's gift", player), - lambda state: ( - miriam(state, player) - and state.has("Dash Ability", player) - and state.has("Wall Climb Ability", player) - )) - # No doors - - - # D05Z01S03 (Library of the Negated Words) - # No items - # Doors - set_rule(world.get_entrance("D05Z01S03[Frontal]", player), - lambda state: ( - state.has("Key Grown from Twisted Wood", player) - and state.has("D05Z01S23[E]", player) - and ( - state.has("D05Z01S11[NW]", player) - or state.has("D05Z01S11[NE]", player) - ) - )) - - - # D05Z01S05 (Library of the Negated Words) - # Items - set_rule(world.get_location("LotNW: Hidden floor", player), - lambda state: can_break_holes(state, player)) - set_rule(world.get_location("LotNW: Root ceiling platform", player), - lambda state: ( - ( - can_climb_on_root(state, player) - or state.has("Purified Hand of the Nun", player) - ) - and ( - state.has("D05Z01S05[NE]", player) - or state.has("Blood Perpetuated in Sand", player) - ) - )) - # Doors - set_rule(world.get_entrance("D05Z01S05[NE]", player), - lambda state: state.has("Blood Perpetuated in Sand", player)) - - - # D05Z01S06 (Library of the Negated Words) - # Items - set_rule(world.get_location("LotNW: Miasma hallway chest", player), - lambda state: ( - state.has("D05Z01S06[W]", player) - or can_survive_poison(state, logic, player, 3) - )) - # Doors - set_rule(world.get_entrance("D05Z01S06[W]", player), - lambda state: can_survive_poison(state, logic, player, 3)) - set_rule(world.get_entrance("D05Z01S06[E]", player), - lambda state: can_survive_poison(state, logic, player, 3)) - - - # D05Z01S07 (Library of the Negated Words) - # No items - # Doors - set_rule(world.get_entrance("D05Z01S07[NW]", player), - lambda state: ( - state.has("Blood Perpetuated in Sand", player) - and ( - can_climb_on_root(state, player) - or state.has("Purified Hand of the Nun", player) - ) - or ( - can_climb_on_root(state, player) - and can_cross_gap(state, logic, player, 3) - ) - or can_cross_gap(state, logic, player, 7) - )) - - - # D05Z01S10 (Library of the Negated Words) - # Items - set_rule(world.get_location("LotNW: Platform puzzle chest", player), - lambda state: ( - state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player) - or can_enemy_bounce(logic, enemy) - and can_cross_gap(state, logic, player, 2) - )) - # No doors - - - # D05Z01S11 (Library of the Negated Words) - # Items - set_rule(world.get_location("LotNW: Silence for Diosdado", player), - lambda state: ( - ( - state.has("D05Z01S11[NW]", player) - or state.has("D05Z01S11[NE]", player) - ) - and state.has("D05Z01S23[E]", player) - )) - set_rule(world.get_location("LotNW: Lowest west upper ledge", player), - lambda state: ( - state.has("D05Z01S11[NW]", player) - or state.has("D05Z01S11[NE]", player) - )) - # Doors - set_rule(world.get_entrance("D05Z01S11[SW]", player), - lambda state: can_break_tirana(state, logic, player)) - set_rule(world.get_entrance("D05Z01S11[NW]", player), - lambda state: state.has("D05Z01S11[NE]", player)) - set_rule(world.get_entrance("D05Z01S11[NE]", player), - lambda state: state.has("D05Z01S11[NW]", player)) - - - # D05Z01S21 (Library of the Negated Words) - # Items - set_rule(world.get_location("LotNW: Elevator Child of Moonlight", player), - lambda state: ( - state.has("Blood Perpetuated in Sand", player) - and ( - can_walk_on_root(state, player) - or state.has("Purified Hand of the Nun", player) - or can_cross_gap(state, logic, player, 5) - and pillar(state, player) - ) - or obscure_skips_allowed(logic) - and ( - state.has("Zarabanda of the Safe Haven", player) - or aubade(state, player) - or state.has("Cantina of the Blue Rose", player) - ) - )) - # Doors - set_rule(world.get_entrance("D05Z01S21[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D05Z02S06 (The Sleeping Canvases) - # No items - # Doors - set_rule(world.get_entrance("D05Z02S06[SE]", player), - lambda state: state.has("OpenedTSCGate", player)) - - - # D05Z02S09 (The Sleeping Canvases) - # No items - # Doors - set_rule(world.get_entrance("D05Z02S09[E]", player), - lambda state: ( - state.has("Bead of Red Wax", player, 3) - and state.has("Bead of Blue Wax", player, 3) - )) - - - # D05Z02S10 (The Sleeping Canvases) - # Items - set_rule(world.get_location("TSC: Jocinero's 1st reward", player), - lambda state: state.has("Child of Moonlight", player, 20)) - set_rule(world.get_location("TSC: Jocinero's final reward", player), - lambda state: state.has("Child of Moonlight", player, 38)) - # Doors - set_rule(world.get_entrance("D05Z02S10[W]", player), - lambda state: state.has("Dash Ability", player)) - - # D05Z02S11 (The Sleeping Canvases) - # Event - set_rule(world.get_location("OpenedTSCGate", player), - lambda state: opened_tsc_gate(state, player)) - - - # D05Z02S13 (The Sleeping Canvases) - # No items - # Doors - set_rule(world.get_entrance("D05Z02S13[E]", player), - lambda state: state.has("Dash Ability", player)) - - - # D05Z02S14 (The Sleeping Canvases) - # Items - set_rule(world.get_location("TSC: Exposito, Scion of Abjuration", player), - lambda state: can_beat_boss(state, "Canvases", logic, player)) - # Doors - set_rule(world.get_entrance("D05Z02S14[W]", player), - lambda state: can_beat_boss(state, "Canvases", logic, player)) - set_rule(world.get_entrance("D05Z02S14[E]", player), - lambda state: can_beat_boss(state, "Canvases", logic, player)) - - - # D05Z02S15 (The Sleeping Canvases) - # Items - set_rule(world.get_location("TSC: Swinging blade tunnel", player), - lambda state: state.has("Dash Ability", player)) - # No doors - - - # D06Z01S01 (Archcathedral Rooftops) - # No items - # Doors - set_rule(world.get_entrance("D06Z01S01[SW]", player), - lambda state: ( - ( - state.has("D06Z01S01[SE]", player) - or state.has("D06Z01S01[W]", player) - or state.has("D06Z01S01[E]", player) - or state.has("D06Z01S01[NNW]", player) - or state.has("D06Z01S01[NNE]", player) - or state.has("D06Z01S01[N]", player) - ) - or state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[NW]", player) - or state.has("D06Z01S01[NE]", player) - ) - )) - set_rule(world.get_entrance("D06Z01S01[SE]", player), - lambda state: ( - ( - state.has("D06Z01S01[SW]", player) - or state.has("D06Z01S01[W]", player) - or state.has("D06Z01S01[E]", player) - or state.has("D06Z01S01[NNW]", player) - or state.has("D06Z01S01[NNE]", player) - or state.has("D06Z01S01[N]", player) - ) - or state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[NW]", player) - or state.has("D06Z01S01[NE]", player) - ) - )) - set_rule(world.get_entrance("D06Z01S01[W]", player), - lambda state: ( - ( - state.has("D06Z01S01[E]", player) - or state.has("D06Z01S01[NNW]", player) - or state.has("D06Z01S01[NNE]", player) - or state.has("D06Z01S01[N]", player) - ) - or state.has_group("masks", player, 1) - and ( - state.has("D06Z01S01[SW]", player) - or state.has("D06Z01S01[SE]", player) - ) - or state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[NW]", player) - or state.has("D06Z01S01[NE]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 1) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S01[E]", player), - lambda state: ( - ( - state.has("D06Z01S01[W]", player) - or state.has("D06Z01S01[NNW]", player) - or state.has("D06Z01S01[NNE]", player) - or state.has("D06Z01S01[N]", player) - ) - or state.has_group("masks", player, 1) - and ( - state.has("D06Z01S01[SW]", player) - or state.has("D06Z01S01[SE]", player) - ) - or state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[NW]", player) - or state.has("D06Z01S01[NE]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 1) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S01[NW]", player), - lambda state: ( - state.has("D06Z01S01[NE]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 8) - ) - or state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[NNW]", player) - or state.has("D06Z01S01[NNE]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 3) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S01[NE]", player), - lambda state: ( - state.has("D06Z01S01[NW]", player) - or ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 8) - ) - or state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[NNW]", player) - or state.has("D06Z01S01[NNE]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 3) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S01[NNW]", player), - lambda state: ( - ( - state.has("D06Z01S01[NNE]", player) - or state.has("D06Z01S01[N]", player) - ) - or state.has_group("masks", player, 2) - and ( - state.has("D06Z01S01[SW]", player) - or state.has("D06Z01S01[SE]", player) - or state.has("D06Z01S01[W]", player) - or state.has("D06Z01S01[E]", player) - or state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[NW]", player) - or state.has("D06Z01S01[NE]", player) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S01[NNE]", player), - lambda state: ( - ( - state.has("D06Z01S01[NNW]", player) - or state.has("D06Z01S01[N]", player) - ) - or state.has_group("masks", player, 2) - and ( - state.has("D06Z01S01[SW]", player) - or state.has("D06Z01S01[SE]", player) - or state.has("D06Z01S01[W]", player) - or state.has("D06Z01S01[E]", player) - or state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[NW]", player) - or state.has("D06Z01S01[NE]", player) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S01[N]", player), - lambda state: ( - state.has_group("masks", player, 3) - and ( - state.has("D06Z01S01[SW]", player) - or state.has("D06Z01S01[SE]", player) - or state.has("D06Z01S01[W]", player) - or state.has("D06Z01S01[E]", player) - or state.has("D06Z01S01[NNW]", player) - or state.has("D06Z01S01[NNE]", player) - or state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[NW]", player) - or state.has("D06Z01S01[NE]", player) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S01[-Cherubs]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S01[SW]", player) - or state.has("D06Z01S01[SE]", player) - or state.has("D06Z01S01[W]", player) - or state.has("D06Z01S01[E]", player) - or state.has("D06Z01S01[NW]", player) - or state.has("D06Z01S01[NE]", player) - or state.has("D06Z01S01[NNW]", player) - or state.has("D06Z01S01[NNE]", player)) - )) - - - # D06Z01S03 (Archcathedral Rooftops) - # Items - set_rule(world.get_location("AR: First soldier fight", player), - lambda state: can_beat_boss(state, "Legionary", logic, player)) - # Doors - set_rule(world.get_entrance("D06Z01S03[W]", player), - lambda state: can_beat_boss(state, "Legionary", logic, player)) - set_rule(world.get_entrance("D06Z01S03[E]", player), - lambda state: can_beat_boss(state, "Legionary", logic, player)) - - - # D06Z01S04 (Archcathedral Rooftops) - # No items - # Doors - set_rule(world.get_entrance("D06Z01S04[SW]", player), - lambda state: ( - state.has("D06Z01S04[W]", player) - or state.has("D06Z01S04[Health]", player) - )) - set_rule(world.get_entrance("D06Z01S04[W]", player), - lambda state: ( - state.has("D06Z01S04[SW]", player) - or state.has("D06Z01S04[Health]", player) - )) - set_rule(world.get_entrance("D06Z01S04[Health]", player), - lambda state: ( - state.has("D06Z01S04[SW]", player) - or state.has("D06Z01S04[W]", player) - )) - add_rule(world.get_entrance("D06Z01S04[Health]", player), - lambda state: ( - ( - state.has("Wall Climb Ability", player) - and can_survive_poison(state, logic, player, 2) - and ( - state.has("Purified Hand of the Nun", player) - or ( - state.has("Blood Perpetuated in Sand", player) - and can_climb_on_root(state, player) - ) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S04[NW]", player), - lambda state: ( - state.has("D06Z01S04[NE]", player) - or state.has("D06Z01S04[Cherubs]", player) - )) - add_rule(world.get_entrance("D06Z01S04[NW]", player), - lambda state: ( - state.has("D06Z01S04[Cherubs]", player) - or ( - state.has("D06Z01S04[SW]", player) - or state.has("D06Z01S04[W]", player) - or state.has("D06Z01S04[Health]", player) - ) - and state.has("Wall Climb Ability", player) - and can_survive_poison(state, logic, player, 2) - and ( - state.has_any({"Dash Ability", "Purified Hand of the Nun"}, player) - and ( - can_dawn_jump(state, logic, player) - or can_climb_on_root(state, player) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S04[NE]", player), - lambda state: ( - state.has("D06Z01S04[NW]", player) - or state.has("D06Z01S04[Cherubs]", player) - )) - add_rule(world.get_entrance("D06Z01S04[NE]", player), - lambda state: ( - ( - state.has("D06Z01S04[SW]", player) - or state.has("D06Z01S04[W]", player) - or state.has("D06Z01S04[Health]", player) - ) - and state.has("Wall Climb Ability", player) - and can_survive_poison(state, logic, player, 2) - and ( - state.has_any({"Dash Ability", "Purified Hand of the Nun"}, player) - and ( - can_dawn_jump(state, logic, player) - or can_climb_on_root(state, player) - ) - ) - )) - - - # D06Z01S06 (Archcathedral Rooftops) - # Items - set_rule(world.get_location("AR: Second soldier fight", player), - lambda state: ( - can_beat_boss(state, "Legionary", logic, player) - and ( - state.has("D06Z01S06[WW]", player) - or state.has("D06Z01S06[E]", player) - ) - )) - # Doors - set_rule(world.get_entrance("D06Z01S06[WW]", player), - lambda state: state.has("D06Z01S06[E]", player)) - add_rule(world.get_entrance("D06Z01S06[WW]", player), - lambda state: can_beat_boss(state, "Legionary", logic, player)) - set_rule(world.get_entrance("D06Z01S06[E]", player), - lambda state: state.has("D06Z01S06[WW]", player)) - add_rule(world.get_entrance("D06Z01S06[E]", player), - lambda state: can_beat_boss(state, "Legionary", logic, player)) - set_rule(world.get_entrance("D06Z01S06[W]", player), - lambda state: state.has("D06Z01S06[EE]", player)) - set_rule(world.get_entrance("D06Z01S06[EE]", player), - lambda state: state.has("D06Z01S06[W]", player)) - - - # D06Z01S08 (Archcathedral Rooftops) - # No items - # Doors - set_rule(world.get_entrance("D06Z01S08[E]", player), - lambda state: state.has("D06Z01S08[N]", player) or \ - state.has("Wall Climb Ability", player)) - - - # D06Z01S09 (Archcathedral Rooftops) - # No items - # Doors - set_rule(world.get_entrance("D06Z01S09[-CherubsL]", player), - lambda state: state.has("Linen of Golden Thread", player)) - set_rule(world.get_entrance("D06Z01S09[-CherubsR]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D06Z01S10 (Archcathedral Rooftops) - # No items - # Doors - set_rule(world.get_entrance("D06Z01S10[-CherubsL]", player), - lambda state: state.has("Linen of Golden Thread", player)) - set_rule(world.get_entrance("D06Z01S10[-CherubsR]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D06Z01S12 (Archcathedral Rooftops) - # Items - set_rule(world.get_location("AR: Upper west shaft ledge", player), - lambda state: ( - state.has("D06Z01S12[NW]", player) - or state.has("D06Z01S12[NE]", player) - or state.has("D06Z01S12[NE2]", player) - or state.has("D06Z01S12[W]", player) - or state.has("D06Z01S12[E]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_location("AR: Upper west shaft chest", player), - lambda state: ( - state.has("D06Z01S12[NE2]", player) - or ( - state.has("D06Z01S12[NW]", player) - or state.has("D06Z01S12[NE]", player) - ) - and state.has("Purified Hand of the Nun", player) - )) - set_rule(world.get_location("AR: Upper west shaft Child of Moonlight", player), - lambda state: ( - state.has("D06Z01S12[W]", player) - or state.has("D06Z01S12[E]", player) - or state.has("D06Z01S12[NW]", player) - or state.has("D06Z01S12[NE]", player) - or state.has("D06Z01S12[NE2]", player) - or state.has("Wall Climb Ability", player) - and state.has_any({"Purified Hand of the Nun", "Taranto to my Sister"}, player) - )) - # Doors - set_rule(world.get_entrance("D06Z01S12[W]", player), - lambda state: ( - state.has("D06Z01S12[NW]", player) - or state.has("D06Z01S12[NE]", player) - or state.has("D06Z01S12[NE2]", player) - or state.has("D06Z01S12[E]", player) - or state.has_all({"Wall Climb Ability", "Purified Hand of the Nun"}, player) - )) - set_rule(world.get_entrance("D06Z01S12[E]", player), - lambda state: ( - state.has("D06Z01S12[NW]", player) - or state.has("D06Z01S12[NE]", player) - or state.has("D06Z01S12[NE2]", player) - or state.has("D06Z01S12[W]", player) - or state.has_all({"Wall Climb Ability", "Purified Hand of the Nun"}, player) - )) - set_rule(world.get_entrance("D06Z01S12[NW]", player), - lambda state: ( - state.has("D06Z01S12[NE]", player) - or state.has("D06Z01S12[NE2]", player) - )) - add_rule(world.get_entrance("D06Z01S12[NW]", player), - lambda state: ( - state.has("D06Z01S12[NE]", player) - or state.has_any({"Wall Climb Ability", "Purified Hand of the Nun"}, player) - )) - set_rule(world.get_entrance("D06Z01S12[NE]", player), - lambda state: ( - state.has("D06Z01S12[NW]", player) - or state.has("D06Z01S12[NE2]", player) - )) - add_rule(world.get_entrance("D06Z01S12[NE]", player), - lambda state: ( - state.has("D06Z01S12[NW]", player) - or state.has_any({"Wall Climb Ability", "Purified Hand of the Nun"}, player) - )) - - - # D06Z01S15 (Archcathedral Rooftops) - # Items - set_rule(world.get_location("AR: Upper east shaft ledge", player), - lambda state: ( - state.has("D06Z01S15[SW]", player) - and state.has("Wall Climb Ability", player) - and ( - can_cross_gap(state, logic, player, 10) - or can_climb_on_root(state, player) - and ( - state.has("Blood Perpetuated in Sand", player) - or state.has("Purified Hand of the Nun", player) - and can_air_stall(state, logic, player) - ) - ) - )) - # Doors - set_rule(world.get_entrance("D06Z01S15[NW]", player), - lambda state: state.has("D06Z01S15[NE]", player)) - add_rule(world.get_entrance("D06Z01S15[NW]", player), - lambda state: ( - state.has("D06Z01S15[SW]", player) - or state.has("Wall Climb Ability", player) - )) - set_rule(world.get_entrance("D06Z01S15[NE]", player), - lambda state: state.has("D06Z01S15[NW]", player)) - add_rule(world.get_entrance("D06Z01S15[NE]", player), - lambda state: ( - state.has("D06Z01S15[SW]", player) - or state.has("Wall Climb Ability", player) - )) - - - # D06Z01S16 (Archcathedral Rooftops) - # No items - # Doors - set_rule(world.get_entrance("D06Z01S16[W]", player), - lambda state: ( - ( - state.has("D06Z01S16[CherubsL]", player) - and ( - state.has("Purified Hand of the Nun", player) - or state.has("Wall Climb Ability", player) - and ( - can_walk_on_root(state, player) - or can_air_stall(state, logic, player) - ) - ) - ) - or ( - state.has("D06Z01S16[CherubsR]", player) - and ( - state.has("Purified Hand of the Nun", player) - or can_air_stall(state, logic, player) - and ( - can_walk_on_root(state, player) - or state.has("The Young Mason's Wheel", player) - ) - and ( - state.has("Wall Climb Ability", player) - or can_dawn_jump(state, logic, player) - ) - ) - ) - or ( - state.has("D06Z01S16[E]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 7) - ) - and ( - state.has("Wall Climb Ability", player) or - can_cross_gap(state, logic, player, 5) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S16[E]", player), - lambda state: ( - ( - ( - state.has("D06Z01S16[W]", player) - or state.has("D06Z01S16[CherubsL]", player) - ) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 5) - ) - ) - or ( - state.has("D06Z01S16[CherubsR]", player) - and ( - state.has("Purified Hand of the Nun", player) - or can_air_stall(state, logic, player) - and ( - can_walk_on_root(state, player) - and state.has("The Young Mason's Wheel", player) - ) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S16[-CherubsL]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S16[W]", player) - or ( - state.has("D06Z01S16[CherubsR]", player) - and ( - state.has("Purified Hand of the Nun", player) - or can_air_stall(state, logic, player) - and ( - can_walk_on_root(state, player) - or state.has("The Young Mason's Wheel", player) - ) - ) - ) - or ( - state.has("D06Z01S16[E]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 7) - ) - ) - ) - )) - set_rule(world.get_entrance("D06Z01S16[-CherubsR]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) - and ( - state.has("D06Z01S16[E]", player) - or ( - state.has("D06Z01S16[CherubsL]", player) - and ( - can_air_stall(state, logic, player) - or can_walk_on_root(state, player) - or state.has("Purified Hand of the Nun", player) - ) - ) - or ( - state.has("D06Z01S16[W]", player) - and ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 1) - ) - ) - ) - )) - - - # D06Z01S17 (Archcathedral Rooftops) - # No items - # Doors - set_rule(world.get_entrance("D06Z01S17[W]", player), - lambda state: ( - ( - state.has("D06Z01S17[E]", player) - or state.has("D06Z01S17[CherubsR]", player) - ) - and state.has("Blood Perpetuated in Sand", player) - or state.has("D06Z01S17[CherubsL]", player) - and state.has("Purified Hand of the Nun", player) - )) - set_rule(world.get_entrance("D06Z01S17[E]", player), - lambda state: ( - state.has("D06Z01S17[CherubsR]", player) - or state.has("Blood Perpetuated in Sand", player) + def can_beat_prison_boss(self, state: CollectionState) -> bool: + return ( + self.has_boss_strength(state, "quirce") and ( - state.has("D06Z01S17[W]", player) - or state.has("D06Z01S17[CherubsL]", player) - and state.has("Purified Hand of the Nun", player) + state.can_reach_region("D09Z01S05[SE]", self.player) + or state.can_reach_region("D09Z01S08[S]", self.player) ) - )) - set_rule(world.get_entrance("D06Z01S17[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - - # D06Z01S18 (Archcathedral Rooftops) - # No items - # Doors - set_rule(world.get_entrance("D06Z01S18[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - - # D06Z01S21 (Archcathedral Rooftops) - # Items - set_rule(world.get_location("AR: Third soldier fight", player), - lambda state: can_beat_boss(state, "Legionary", logic, player)) - # Doors - set_rule(world.get_entrance("D06Z01S21[W]", player), - lambda state: can_beat_boss(state, "Legionary", logic, player)) - set_rule(world.get_entrance("D06Z01S21[E]", player), - lambda state: can_beat_boss(state, "Legionary", logic, player)) + ) - - # D06Z01S23 (Archcathedral Rooftops) - # Event - set_rule(world.get_location("OpenedARLadder", player), - lambda state: opened_ar_ladder(state, player)) - - - # D06Z01S25 (Archcathedral Rooftops) - # Items - set_rule(world.get_location("AR: Crisanta of the Wrapped Agony", player), - lambda state: can_beat_boss(state, "Rooftops", logic, player)) - # Doors - set_rule(world.get_entrance("D06Z01S25[W]", player), - lambda state: can_beat_boss(state, "Rooftops", logic, player)) - set_rule(world.get_entrance("D06Z01S25[E]", player), - lambda state: can_beat_boss(state, "Rooftops", logic, player)) - - - # D08Z01S01 (Bridge of the Three Cavalries) - # Items - set_rule(world.get_location("BotTC: Esdras, of the Anointed Legion", player), - lambda state: ( - state.has_group("wounds", player, 3) - and can_beat_boss(state, "Bridge", logic, player) - )) - set_rule(world.get_location("BotTC: Esdras' gift", player), - lambda state: ( - state.has_group("wounds", player, 3) - and can_beat_boss(state, "Bridge", logic, player) - )) - # Doors - set_rule(world.get_entrance("D08Z01S01[W]", player), - lambda state: can_beat_boss(state, "Bridge", logic, player)) - set_rule(world.get_entrance("D08Z01S01[E]", player), - lambda state: ( - state.has_group("wounds", player, 3) + def can_beat_rooftops_boss(self, state: CollectionState) -> bool: + return ( + self.has_boss_strength(state, "crisanta") and ( - state.has("D08Z01S01[Cherubs]", player) - or can_beat_boss(state, "Bridge", logic, player) + state.can_reach_region("D06Z01S19[E]", self.player) + or state.can_reach_region("D07Z01S01[W]", self.player) ) - )) - - - # D08Z01S02 (Bridge of the Three Cavalries) - # No items - # Items - set_rule(world.get_entrance("D08Z01S02[-Cherubs]", player), - lambda state: state.has("Linen of Golden Thread", player)) - # Event - set_rule(world.get_location("BrokeBOTTCStatue", player), - lambda state: broke_bottc_statue(state, player)) - - - # D08Z02S03 (Ferrous Tree) - # No items - # Doors - set_rule(world.get_entrance("D08Z02S03[W]", player), - lambda state: state.has("OpenedBOTTCStatue", player)) - - - # D08Z03S01 (Hall of the Dawning) - # No items - # Doors - set_rule(world.get_entrance("D08Z03S01[E]", player), - lambda state: state.has("Verses Spun from Gold", player, 4)) - - - # D08Z03S02 (Hall of the Dawning) - # No items - # Doors - set_rule(world.get_entrance("D08Z03S02[NW]", player), - lambda state: state.has("Wall Climb Ability", player)) - - - # D08Z03S03 (Hall of the Dawning) - # Items - set_rule(world.get_location("HotD: Laudes, the First of the Amanecidas", player), - lambda state: can_beat_boss(state, "Hall", logic, player)) - # Doors - set_rule(world.get_entrance("D08Z03S03[W]", player), - lambda state: can_beat_boss(state, "Hall", logic, player)) - set_rule(world.get_entrance("D08Z03S03[E]", player), - lambda state: can_beat_boss(state, "Hall", logic, player)) - - - # D09Z01S01 (Wall of the Holy Prohibitions) - # Items - set_rule(world.get_location("WotHP: Amanecida of the Molten Thorn", player), - lambda state: can_beat_boss(state, "Wall", logic, player)) - # No doors - - - # D09Z01S02 (Wall of the Holy Prohibitions) - # Items - set_rule(world.get_location("WotHP: Upper east room, center gold cell", player), - lambda state: state.has("D09Z01S02[Cell5]", player)) - set_rule(world.get_location("WotHP: Upper east room, lift puzzle", player), - lambda state: ( - state.has("D09Z01S02[NW]", player) - or state.has("D09Z01S02[N]", player) - or state.has("D09Z01S02[Cell1]", player) - or state.has("D09Z01S02[Cell6]", player) - or state.has("D09Z01S02[Cell4]", player) - or state.has("D09Z01S02[Cell3]", player) - or state.has("D09Z01S02[Cell22]", player) - or state.has("D09Z01S02[Cell23]", player) - )) - # Doors - set_rule(world.get_entrance("D09Z01S02[SW]", player), - lambda state: state.has("D09Z01S02[Cell2]", player)) - set_rule(world.get_entrance("D09Z01S02[NW]", player), - lambda state: ( - state.has("D09Z01S02[N]", player) - or state.has("D09Z01S02[Cell1]", player) - or state.has("D09Z01S02[Cell6]", player) - or state.has("D09Z01S02[Cell4]", player) - or state.has("D09Z01S02[Cell3]", player) - or state.has("D09Z01S02[Cell22]", player) - or state.has("D09Z01S02[Cell23]", player) - )) - set_rule(world.get_entrance("D09Z01S02[N]", player), - lambda state: ( - state.has("D09Z01S02[NW]", player) - or state.has("D09Z01S02[Cell1]", player) - or state.has("D09Z01S02[Cell6]", player) - or state.has("D09Z01S02[Cell4]", player) - or state.has("D09Z01S02[Cell3]", player) - or state.has("D09Z01S02[Cell22]", player) - or state.has("D09Z01S02[Cell23]", player) - )) - set_rule(world.get_entrance("D09Z01S02[Cell1]", player), - lambda state: ( - state.has("D09Z01S02[NW]", player) - or state.has("D09Z01S02[N]", player) - or state.has("D09Z01S02[Cell6]", player) - or state.has("D09Z01S02[Cell4]", player) - or state.has("D09Z01S02[Cell3]", player) - or state.has("D09Z01S02[Cell22]", player) - or state.has("D09Z01S02[Cell23]", player) - )) - add_rule(world.get_entrance("D09Z01S02[Cell1]", player), - lambda state: state.has("Key of the Secular", player)) - set_rule(world.get_entrance("D09Z01S02[Cell6]", player), - lambda state: ( - state.has("D09Z01S02[NW]", player) - or state.has("D09Z01S02[N]", player) - or state.has("D09Z01S02[Cell1]", player) - or state.has("D09Z01S02[Cell4]", player) - or state.has("D09Z01S02[Cell3]", player) - or state.has("D09Z01S02[Cell22]", player) - or state.has("D09Z01S02[Cell23]", player) - )) - add_rule(world.get_entrance("D09Z01S02[Cell6]", player), - lambda state: state.has("Key of the Scribe", player)) - set_rule(world.get_entrance("D09Z01S02[Cell4]", player), - lambda state: ( - state.has("D09Z01S02[NW]", player) - or state.has("D09Z01S02[N]", player) - or state.has("D09Z01S02[Cell1]", player) - or state.has("D09Z01S02[Cell6]", player) - or state.has("D09Z01S02[Cell3]", player) - or state.has("D09Z01S02[Cell22]", player) - or state.has("D09Z01S02[Cell23]", player) - )) - add_rule(world.get_entrance("D09Z01S02[Cell4]", player), - lambda state: state.has("Key of the Inquisitor", player)) - set_rule(world.get_entrance("D09Z01S02[Cell2]", player), - lambda state: state.has("D09Z01S02[SW]", player)) - set_rule(world.get_entrance("D09Z01S02[Cell3]", player), - lambda state: ( - state.has("D09Z01S02[NW]", player) - or state.has("D09Z01S02[N]", player) - or state.has("D09Z01S02[Cell1]", player) - or state.has("D09Z01S02[Cell6]", player) - or state.has("D09Z01S02[Cell4]", player) - or state.has("D09Z01S02[Cell22]", player) - or state.has("D09Z01S02[Cell23]", player) - )) - add_rule(world.get_entrance("D09Z01S02[Cell3]", player), - lambda state: state.has("Key of the Secular", player)) - set_rule(world.get_entrance("D09Z01S02[Cell22]", player), - lambda state: ( - state.has("D09Z01S02[NW]", player) - or state.has("D09Z01S02[N]", player) - or state.has("D09Z01S02[Cell1]", player) - or state.has("D09Z01S02[Cell6]", player) - or state.has("D09Z01S02[Cell4]", player) - or state.has("D09Z01S02[Cell3]", player) - or state.has("D09Z01S02[Cell23]", player) - )) - set_rule(world.get_entrance("D09Z01S02[Cell23]", player), - lambda state: ( - state.has("D09Z01S02[NW]", player) - or state.has("D09Z01S02[N]", player) - or state.has("D09Z01S02[Cell1]", player) - or state.has("D09Z01S02[Cell6]", player) - or state.has("D09Z01S02[Cell4]", player) - or state.has("D09Z01S02[Cell3]", player) - or state.has("D09Z01S02[Cell22]", player) - )) - add_rule(world.get_entrance("D09Z01S02[Cell23]", player), - lambda state: state.has("Key of the Secular", player)) - - - # D09Z01S03 (Wall of the Holy Prohibitions) - # Items - set_rule(world.get_location("WotHP: Quirce, Returned By The Flames", player), - lambda state: can_beat_boss(state, "Prison", logic, player)) - # Doors - set_rule(world.get_entrance("D09Z01S03[W]", player), - lambda state: ( - state.has("D09Z01S03[N]", player) - and can_beat_boss(state, "Prison", logic, player) - )) + ) - - # D09Z01S05 (Wall of the Holy Prohibitions) - # Event - set_rule(world.get_location("OpenedWOTHPGate", player), - lambda state: opened_wothp_gate(state, player)) - - - # D09Z01S06 (Wall of the Holy Prohibitions) - # No items - # Doors - set_rule(world.get_entrance("D09Z01S06[-E]", player), - lambda state: state.has("Key of the High Peaks", player)) - - - # D09Z01S07 (Wall of the Holy Prohibitions) - # No items - # Doors - set_rule(world.get_entrance("D09Z01S07[SW]", player), - lambda state: ( - state.has("D09Z01S07[SE]", player) - or state.has("D09Z01S07[W]", player) - or state.has("D09Z01S07[E]", player) - )) - set_rule(world.get_entrance("D09Z01S07[SE]", player), - lambda state: ( - state.has("D09Z01S07[SW]", player) - or state.has("D09Z01S07[W]", player) - or state.has("D09Z01S07[E]", player) - )) - set_rule(world.get_entrance("D09Z01S07[W]", player), - lambda state: ( - state.has("D09Z01S07[SW]", player) - or state.has("D09Z01S07[SE]", player) - or state.has("D09Z01S07[E]", player) - )) - set_rule(world.get_entrance("D09Z01S07[E]", player), - lambda state: ( - state.has("D09Z01S07[SW]", player) - or state.has("D09Z01S07[SE]", player) - or state.has("D09Z01S07[W]", player) - )) - set_rule(world.get_entrance("D09Z01S07[NW]", player), - lambda state: state.has("D09Z01S07[N]", player)) - set_rule(world.get_entrance("D09Z01S07[N]", player), - lambda state: state.has("D09Z01S07[NW]", player)) - set_rule(world.get_entrance("D09Z01S07[NE]", player), - lambda state: ( - state.has("D09Z01S07[SW]", player) - or state.has("D09Z01S07[SE]", player) - or state.has("D09Z01S07[W]", player) - or state.has("D09Z01S07[E]", player) - )) - add_rule(world.get_entrance("D09Z01S07[NE]", player), - lambda state: state.has("Blood Perpetuated in Sand", player)) - - - # D09Z01S08 (Wall of the Holy Prohibitions) - # Items - set_rule(world.get_location("WotHP: Collapsing floor ledge", player), - lambda state: ( - ( - state.has("D09Z01S08[W]", player) - or state.has("D09Z01S08[Cell18]", player) - ) - and state.has("OpenedWOTHPGate", player) - )) - # Doors - set_rule(world.get_entrance("D09Z01S08[W]", player), - lambda state: state.has("D09Z01S08[Cell14]", player)) - add_rule(world.get_entrance("D09Z01S08[W]", player), - lambda state: state.has("OpenedWOTHPGate", player)) - set_rule(world.get_entrance("D09Z01S08[S]", player), - lambda state: ( - state.has("D09Z01S08[W]", player) - or state.has("D09Z01S08[Cell14]", player) - )) - set_rule(world.get_entrance("D09Z01S08[SE]", player), - lambda state: ( - state.has("D09Z01S08[Cell15]", player) - or state.has("D09Z01S08[Cell16]", player) - or state.has("D09Z01S08[Cell18]", player) - or state.has("D09Z01S08[Cell17]", player) - and state.has("Dash Ability", player) - )) - set_rule(world.get_entrance("D09Z01S08[NE]", player), - lambda state: ( - state.has("D09Z01S08[Cell7]", player) - or state.has("D09Z01S08[Cell17]", player) - and state.has("Dash Ability", player) - )) - set_rule(world.get_entrance("D09Z01S08[Cell14]", player), - lambda state: state.has("D09Z01S08[W]", player)) - set_rule(world.get_entrance("D09Z01S08[Cell15]", player), - lambda state: ( - state.has("Key of the Scribe", player) - and ( - state.has("D09Z01S08[SE]", player) - or state.has("D09Z01S08[Cell16]", player) - or state.has("D09Z01S08[Cell18]", player) - or state.has("D09Z01S08[Cell17]", player) - and state.has("Dash Ability", player) - ) - )) - set_rule(world.get_entrance("D09Z01S08[Cell7]", player), - lambda state: ( - state.has("Key of the Inquisitor", player) - and ( - state.has("D09Z01S08[NE]", player) - or state.has("D09Z01S08[Cell17]", player) - and state.has("Dash Ability", player) - ) - )) - set_rule(world.get_entrance("D09Z01S08[Cell16]", player), - lambda state: ( - state.has("Key of the Inquisitor", player) - and ( - state.has("D09Z01S08[SE]", player) - or state.has("D09Z01S08[Cell15]", player) - or state.has("D09Z01S08[Cell18]", player) - or state.has("D09Z01S08[Cell17]", player) - and state.has("Dash Ability", player) - ) - )) - set_rule(world.get_entrance("D09Z01S08[Cell18]", player), - lambda state: ( - state.has("Key of the Scribe", player) - and ( - state.has("D09Z01S08[SE]", player) - or state.has("D09Z01S08[Cell15]", player) - or state.has("D09Z01S08[Cell16]", player) - or state.has("D09Z01S08[Cell17]", player) - and state.has("Dash Ability", player) - ) - )) - - - # D09Z01S09 (Wall of the Holy Prohibitions) - # Items - set_rule(world.get_location("WotHP: Lower west room, top ledge", player), - lambda state: ( - state.has("D09Z01S09[Cell24]", player) - or state.has("Dash Ability", player) - and ( - state.has("D09Z01S09[NW]", player) - or state.has("D09Z01S09[Cell19]", player) - or state.has("Purified Hand of the Nun", player) - and ( - can_air_stall(state, logic, player) - or can_dawn_jump(state, logic, player) - ) - ) - )) - # Doors - set_rule(world.get_entrance("D09Z01S09[SW]", player), - lambda state: ( - state.has("D09Z01S09[Cell21]", player) - or state.has("D09Z01S09[Cell20]", player) - or state.has("D09Z01S09[E]", player) - or state.has("Dash Ability", player) - )) - set_rule(world.get_entrance("D09Z01S09[NW]", player), - lambda state: ( - state.has("D09Z01S09[Cell19]", player) - or state.has("D09Z01S09[Cell24]", player) - )) - add_rule(world.get_entrance("D09Z01S09[NW]", player), - lambda state: ( - state.has("D09Z01S09[Cell19]", player) - or state.has("Dash Ability", player) - and ( - state.has("D09Z01S09[Cell24]", player) - or state.has("Purified Hand of the Nun", player) - and ( - can_air_stall(state, logic, player) - or can_dawn_jump(state, logic, player) - ) - ) - )) - set_rule(world.get_entrance("D09Z01S09[E]", player), - lambda state: ( - state.has("D09Z01S09[Cell21]", player) - or state.has("D09Z01S09[Cell20]", player) - or state.has("D09Z01S09[SW]", player) - or state.has("Dash Ability", player) - )) - set_rule(world.get_entrance("D09Z01S09[Cell24]", player), - lambda state: ( - state.has("D09Z01S09[NW]", player) - or state.has("D09Z01S09[Cell19]", player) - )) - add_rule(world.get_entrance("D09Z01S09[Cell24]", player), - lambda state: ( - state.has("Dash Ability", player) - and ( - state.has("D09Z01S09[NW]", player) - or state.has("D09Z01S09[Cell19]", player) - or state.has("Purified Hand of the Nun", player) - and ( - can_air_stall(state, logic, player) - or can_dawn_jump(state, logic, player) - ) - ) - )) - set_rule(world.get_entrance("D09Z01S09[Cell19]", player), - lambda state: ( - state.has("D09Z01S09[NW]", player) - or state.has("D09Z01S09[Cell24]", player) - )) - add_rule(world.get_entrance("D09Z01S09[Cell19]", player), - lambda state: ( - state.has("D09Z01S09[NW]", player) - or state.has("Dash Ability", player) - and ( - state.has("D09Z01S09[Cell24]", player) - or state.has("Purified Hand of the Nun", player) - and ( - can_air_stall(state, logic, player) - or can_dawn_jump(state, logic, player) - ) - ) - )) - set_rule(world.get_entrance("D09Z01S09[Cell20]", player), - lambda state: ( - state.has("Key of the Scribe", player) - and ( - state.has("D09Z01S09[Cell21]", player) - or state.has("D09Z01S09[SW]", player) - or state.has("D09Z01S09[E]", player) - or state.has("Dash Ability", player) - ) - )) - set_rule(world.get_entrance("D09Z01S09[Cell21]", player), - lambda state: ( - state.has("Key of the Inquisitor", player) - and ( - state.has("D09Z01S09[Cell20]", player) - or state.has("D09Z01S09[SW]", player) - or state.has("D09Z01S09[E]", player) - or state.has("Dash Ability", player) - ) - )) - - - # D09Z01S10 (Wall of the Holy Prohibitions) - # Items - set_rule(world.get_location("WotHP: Lower east room, top bronze cell", player), - lambda state: state.has("D09Z01S10[Cell13]", player)) - set_rule(world.get_location("WotHP: Lower east room, hidden ledge", player), - lambda state: ( - state.has("D09Z01S10[W]", player) - or state.has("D09Z01S10[Cell12]", player) - or state.has("D09Z01S10[Cell10]", player) - or state.has("D09Z01S10[Cell11]", player) - )) - # Doors - set_rule(world.get_entrance("D09Z01S10[W]", player), - lambda state: ( - state.has("D09Z01S10[Cell12]", player) - or state.has("D09Z01S10[Cell10]", player) - or state.has("D09Z01S10[Cell11]", player) - )) - set_rule(world.get_entrance("D09Z01S10[Cell12]", player), - lambda state: ( - state.has("D09Z01S10[W]", player) or \ - state.has("D09Z01S10[Cell10]", player) or \ - state.has("D09Z01S10[Cell11]", player) - )) - add_rule(world.get_entrance("D09Z01S10[Cell12]", player), - lambda state: state.has("Key of the Secular", player)) - set_rule(world.get_entrance("D09Z01S10[Cell10]", player), - lambda state: ( - state.has("D09Z01S10[W]", player) - or state.has("D09Z01S10[Cell12]", player) - or state.has("D09Z01S10[Cell11]", player) - )) - add_rule(world.get_entrance("D09Z01S10[Cell10]", player), - lambda state: state.has("Key of the Scribe", player)) - set_rule(world.get_entrance("D09Z01S10[Cell11]", player), - lambda state: ( - state.has("D09Z01S10[W]", player) - or state.has("D09Z01S10[Cell12]", player) - or state.has("D09Z01S10[Cell10]", player) - )) - add_rule(world.get_entrance("D09Z01S10[Cell11]", player), - lambda state: state.has("Key of the Scribe", player)) + def can_beat_ossuary_boss(self, state: CollectionState) -> bool: + return ( + self.has_boss_strength(state, "isidora") + and state.can_reach_region("D01BZ06S01[E]", self.player) + ) - # D09BZ01S01 (Wall of the Holy Prohibitions - Inside cells) - # Items - set_rule(world.get_location("WotHP: Upper east room, center cell ledge", player), - lambda state: state.has("D09BZ01S01[Cell22]", player)) - set_rule(world.get_location("WotHP: Upper east room, center cell floor", player), - lambda state: ( - state.has("D09BZ01S01[Cell22]", player) - or state.has("D09BZ01S01[Cell23]", player) - )) - set_rule(world.get_location("WotHP: Upper east room, top bronze cell", player), - lambda state: state.has("D09BZ01S01[Cell1]", player)) - set_rule(world.get_location("WotHP: Upper east room, top silver cell", player), - lambda state: state.has("D09BZ01S01[Cell6]", player)) - set_rule(world.get_location("WotHP: Upper west room, top silver cell", player), - lambda state: ( - state.has("D09BZ01S01[Cell14]", player) - or state.has("D09BZ01S01[Cell15]", player) - )) - set_rule(world.get_location("WotHP: Upper west room, center gold cell", player), - lambda state: state.has("D09BZ01S01[Cell16]", player)) - set_rule(world.get_location("WotHP: Lower west room, bottom gold cell", player), - lambda state: ( - state.has("D09BZ01S01[Cell21]", player) - and state.has("Blood Perpetuated in Sand", player) - and can_climb_on_root(state, player) - and can_survive_poison(state, logic, player, 2) - and state.has("Dash Ability", player) - )) - set_rule(world.get_location("WotHP: Lower east room, top silver cell", player), - lambda state: state.has("D09BZ01S01[Cell10]", player)) - set_rule(world.get_location("WotHP: Lower east room, bottom silver cell", player), - lambda state: ( - state.has("D09BZ01S01[Cell11]", player) - and ( - can_survive_poison(state, logic, player, 1) - and state.has("Dash Ability", player) - or state.has_any({"Debla of the Lights", "Taranto to my Sister", "Cante Jondo of the Three Sisters", "Verdiales of the Forsaken Hamlet", "Cantina of the Blue Rose"}, player) - or aubade(state, player) - ) - )) - # Doors - set_rule(world.get_entrance("D09BZ01S01[Cell2]", player), - lambda state: state.has("D09BZ01S01[Cell3]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell3]", player), - lambda state: state.has("D09BZ01S01[Cell2]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell4]", player), - lambda state: state.has("D09BZ01S01[Cell5]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell5]", player), - lambda state: state.has("D09BZ01S01[Cell5]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell12]", player), - lambda state: state.has("D09BZ01S01[Cell13]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell13]", player), - lambda state: state.has("D09BZ01S01[Cell12]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell14]", player), - lambda state: state.has("D09BZ01S01[Cell15]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell15]", player), - lambda state: state.has("D09BZ01S01[Cell14]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell17]", player), - lambda state: state.has("D09BZ01S01[Cell18]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell19]", player), - lambda state: state.has("D09BZ01S01[Cell20]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell20]", player), - lambda state: state.has("D09BZ01S01[Cell19]", player)) - set_rule(world.get_entrance("D09BZ01S01[Cell23]", player), - lambda state: state.has("D09BZ01S01[Cell22]", player)) - add_rule(world.get_entrance("D09BZ01S01[Cell23]", player), - lambda state: state.has("Key of the Secular", player)) - - - # D17Z01S01 (Brotherhood of the Silent Sorrow) - set_rule(world.get_location("BotSS: Starting room ledge", player), - lambda state: state.has("D17Z01S01[Cherubs3]", player)) - set_rule(world.get_location("BotSS: Starting room Child of Moonlight", player), - lambda state: ( - state.has("D17Z01S01[Cherubs1]", player) - or state.has("Taranto to my Sister", player) - or ( - can_climb_on_root(state, player) - or can_cross_gap(state, logic, player, 9) - ) - and ( - state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun", "Debla of the Lights", "Verdiales of the Forsaken Hamlet", "Cloistered Ruby"}, player) - or tirana(state, player) - ) - )) - - - # D17Z01S02 (Brotherhood of the Silent Sorrow) - # No items - # Doors - set_rule(world.get_entrance("D17Z01S02[W]", player), - lambda state: state.has("Dash Ability", player)) - set_rule(world.get_entrance("D17Z01S02[E]", player), - lambda state: ( - state.has("D17Z01S02[N]", player) - or state.has("Dash Ability", player) - )) - set_rule(world.get_entrance("D17Z01S02[N]", player), - lambda state: ( - state.has("Blood Perpetuated in Sand", player) - and ( - state.has("D17Z01S02[E]", player) - or state.has("D17Z01S02[W]", player) - and state.has("Dash Ability", player) - ) - )) - - - # D17Z01S03 (Brotherhood of the Silent Sorrow) - # No items - # Doors - set_rule(world.get_entrance("D17Z01S03[relic]", player), - lambda state: state.has("Key to the Chamber of the Eldest Brother", player)) - - - # D17Z01S04 (Brotherhood of the Silent Sorrow) - # Items - if world.boots_of_pleading[player]: - set_rule(world.get_location("BotSS: 2nd meeting with Redento", player), - lambda state: redento(state, blasphemousworld, player, 2)) - # Doors - set_rule(world.get_entrance("D17Z01S04[N]", player), - lambda state: state.has("D17Z01S04[FrontR]", player)) - set_rule(world.get_entrance("D17Z01S04[FrontR]", player), - lambda state: state.has("D17Z01S04[N]", player)) - # Event - set_rule(world.get_location("OpenedBOTSSLadder", player), - lambda state: opened_botss_ladder(state, player)) - - - # D17Z01S05 (Brotherhood of the Silent Sorrow) - # No items - # Doors - set_rule(world.get_entrance("D17Z01S05[S]", player), - lambda state: state.has("OpenedBOTSSLadder", player)) - - - # D17Z01S10 (Brotherhood of the Silent Sorrow) - # No items - # Doors - set_rule(world.get_entrance("D17Z01S10[W]", player), - lambda state: state.has_any({"Blood Perpetuated in Sand", "Purified Hand of the Nun"}, player)) - - - # D17Z01S11 (Brotherhood of the Silent Sorrow) - # Items - set_rule(world.get_location("BotSS: Warden of the Silent Sorrow", player), - lambda state: can_beat_boss(state, "Brotherhood", logic, player)) - # Doors - set_rule(world.get_entrance("D17Z01S11[W]", player), - lambda state: can_beat_boss(state, "Brotherhood", logic, player)) - set_rule(world.get_entrance("D17Z01S11[E]", player), - lambda state: can_beat_boss(state, "Brotherhood", logic, player)) - - - # D17Z01S14 (Brotherhood of the Silent Sorrow) - # Items - set_rule(world.get_location("BotSS: Outside church", player), - lambda state: ( - state.has("D17Z01S14[W]", player) - or state.has("Blood Perpetuated in Sand", player) - )) - # Doors - set_rule(world.get_entrance("D17Z01S14[W]", player), - lambda state: ( - state.has("Incomplete Scapular", player) - and state.has("Blood Perpetuated in Sand", player) - )) - set_rule(world.get_entrance("D17Z01S14[E]", player), - lambda state: state.has("Blood Perpetuated in Sand", player)) - set_rule(world.get_entrance("D17Z01S14[-Cherubs1]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) + def can_beat_mourning_boss(self, state: CollectionState) -> bool: + return ( + self.has_boss_strength(state, "sierpes") + and state.can_reach_region("D20Z02S07[W]", self.player) + ) + + def can_beat_graveyard_boss(self, state: CollectionState) -> bool: + return ( + self.has_boss_strength(state, "amanecida") + and self.wall_climb(state) + and state.can_reach_region("D01Z06S01[Santos]", self.player) + and state.can_reach_region("D02Z03S18[NW]", self.player) + and state.can_reach_region("D02Z02S03[NE]", self.player) + ) + + def can_beat_jondo_boss(self, state: CollectionState) -> bool: + return ( + self.has_boss_strength(state, "amanecida") + and state.can_reach_region("D01Z06S01[Santos]", self.player) and ( - state.has("D17Z01S14[W]", player) - or state.has("Blood Perpetuated in Sand", player) - or can_cross_gap(state, logic, player, 11) + state.can_reach_region("D20Z01S06[NE]", self.player) + or state.can_reach_region("D20Z01S04[W]", self.player) ) - )) - set_rule(world.get_entrance("D17Z01S14[-Cherubs2]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) and ( - state.has("D17Z01S14[E]", player) - and can_cross_gap(state, logic, player, 8) - or state.has("D17Z01S14[W]", player) - and can_cross_gap(state, logic, player, 10) - or state.has("Blood Perpetuated in Sand", player) + state.can_reach_region("D03Z01S04[E]", self.player) + or state.can_reach_region("D03Z02S10[N]", self.player) ) - )) - set_rule(world.get_entrance("D17Z01S14[-Cherubs3]", player), - lambda state: ( - state.has("Linen of Golden Thread", player) + ) + + def can_beat_patio_boss(self, state: CollectionState) -> bool: + return ( + self.has_boss_strength(state, "amanecida") + and state.can_reach_region("D01Z06S01[Santos]", self.player) + and state.can_reach_region("D06Z01S02[W]", self.player) and ( - state.has("D17Z01S14[E]", player) - or state.has("Blood Perpetuated in Sand", player) + state.can_reach_region("D04Z01S03[E]", self.player) + or state.can_reach_region("D04Z01S01[W]", self.player) + or state.can_reach_region("D06Z01S18[-Cherubs]", self.player) ) - )) - - - # D17Z01S15 (Brotherhood of the Silent Sorrow) - # Items - set_rule(world.get_location("BotSS: Esdras' final gift", player), - lambda state: ( - can_beat_boss(state, "Bridge", logic, player) - and state.has_group("wounds", player, 3) - )) - set_rule(world.get_location("BotSS: Crisanta's gift", player), - lambda state: ( - can_beat_boss(state, "Rooftops", logic, player) - and state.has("Apodictic Heart of Mea Culpa", player) - )) - # No doors - - - # D17BZ02S01 (Brotherhood of the Silent Sorrow - Platforming challenge) - # Items - set_rule(world.get_location("BotSS: Platforming gauntlet", player), - lambda state: ( - #state.has("D17BZ02S01[FrontR]", player) or - # TODO: actually fix this once door rando is real - state.has_all({"Dash Ability", "Wall Climb Ability"}, player) - )) - # Doors - set_rule(world.get_entrance("D17BZ02S01[FrontR]", player), - lambda state: state.has_all({"Dash Ability", "Wall Climb Ability"}, player)) - - - # D20Z01S04 (Echoes of Salt) - # No items - # Doors - set_rule(world.get_entrance("D20Z01S04[E]", player), - lambda state: state.has("OpenedDCGateW", player)) - - - # D20Z01S09 (Echoes of Salt) - # Items - set_rule(world.get_location("EoS: Lantern jump near elevator", player), - lambda state: ( - state.has("D20Z01S09[W]", player) - or state.has("Dash Ability", player) - )) - # Doors - set_rule(world.get_entrance("D20Z01S09[W]", player), - lambda state: state.has("Dash Ability", player)) - set_rule(world.get_entrance("D20Z01S09[E]", player), - lambda state: state.has_all({"Blood Perpetuated in Sand", "Dash Ability"}, player)) - - - # D20Z01S10 (Echoes of Salt) - # No items - # Doors - set_rule(world.get_entrance("D20Z01S10[W]", player), - lambda state: state.has_all({"Blood Perpetuated in Sand", "Dash Ability"}, player)) - set_rule(world.get_entrance("D20Z01S10[E]", player), - lambda state: state.has_all({"Blood Perpetuated in Sand", "Dash Ability"}, player)) - - - # D20Z02S03 (Mourning and Havoc) - # No items - # Doors - set_rule(world.get_entrance("D20Z02S03[NE]", player), - lambda state: ( - can_walk_on_root(state, player) - or can_cross_gap(state, logic, player, 5) - )) - - - # D20Z02S04 (Mourning and Havoc) - # No items - # Doors - set_rule(world.get_entrance("D20Z02S04[W]", player), - lambda state: state.has("Dash Ability", player)) - set_rule(world.get_entrance("D20Z02S04[E]", player), - lambda state: state.has("Dash Ability", player)) - - - # D20Z02S05 (Mourning and Havoc) - # No items - # Doors - set_rule(world.get_entrance("D20Z02S05[NW]", player), - lambda state: ( - state.has("Nail Uprooted from Dirt", player) - or can_cross_gap(state, logic, player, 3) - )) - - - # D20Z02S06 (Mourning and Havoc) - # No items - # Doors - set_rule(world.get_entrance("D20Z02S06[NW]", player), - lambda state: ( - state.has("D20Z02S06[NE]", player) - or state.has("Purified Hand of the Nun", player) - or can_climb_on_root(state, player) - or can_dive_laser(state, logic, player) - )) - set_rule(world.get_entrance("D20Z02S06[NE]", player), - lambda state: ( - state.has("D20Z02S06[NW]", player) - or state.has("Purified Hand of the Nun", player) - or can_climb_on_root(state, player) - or can_dive_laser(state, logic, player) - )) - - - # D20Z02S08 (Mourning and Havoc) - # Items - set_rule(world.get_location("MaH: Sierpes", player), - lambda state: can_beat_boss(state, "Mourning", logic, player)) - set_rule(world.get_location("MaH: Sierpes' eye", player), - lambda state: can_beat_boss(state, "Mourning", logic, player)) - # No doors - - - # D20Z02S11 (Mourning and Havoc) - # No items - # Doors - set_rule(world.get_entrance("D20Z02S11[NW]", player), - lambda state: state.has("D20Z02S11[E]", player)) - set_rule(world.get_entrance("D20Z02S11[NW]", player), - lambda state: ( - mourning_skips_allowed(logic) + ) + + def can_beat_wall_boss(self, state: CollectionState) -> bool: + return ( + self.has_boss_strength(state, "amanecida") + and state.can_reach_region("D01Z06S01[Santos]", self.player) + and state.can_reach_region("D09Z01S09[Cell24]", self.player) and ( - state.has("Purified Hand of the Nun", player) - or can_break_tirana(state, logic, player) - or state.has("D20Z02S11[E]", player) + state.can_reach_region("D09Z01S11[E]", self.player) + or state.can_reach_region("D06Z01S13[W]", self.player) ) - )) - set_rule(world.get_entrance("D20Z02S11[E]", player), - lambda state: ( - mourning_skips_allowed(logic) + ) + + def can_beat_hall_boss(self, state: CollectionState) -> bool: + return ( + self.has_boss_strength(state, "laudes") and ( - state.has("Purified Hand of the Nun", player) - or can_break_tirana(state, logic, player) - or state.has("D20Z02S11[NW]", player) - and can_cross_gap(state, logic, player, 5) + state.can_reach_region("D08Z01S02[NE]", self.player) + or state.can_reach_region("D08Z03S02[NW]", self.player) ) - )) + ) + def can_beat_perpetua(self, state: CollectionState) -> bool: + return self.has_boss_strength(state, "perpetua") + + def can_beat_legionary(self, state: CollectionState) -> bool: + return self.has_boss_strength(state, "legionary") + + + def has_boss_strength(self, state: CollectionState, boss: str) -> bool: + life: int = state.count("Life Upgrade", self.player) + sword: int = state.count("Mea Culpa Upgrade", self.player) + fervour: int = state.count("Fervour Upgrade", self.player) + flasks: int = self.flasks(state) + quicksilver: int = self.quicksilver(state) + + player_strength: float = ( + min(6, life) * 0.25 / 6 + + min(7, sword) * 0.25 / 7 + + min(6, fervour) * 0.20 / 6 + + min(8, flasks) * 0.15 / 8 + + min(5, quicksilver) * 0.15 / 5 + ) - # Misc Items - set_rule(world.get_location("Second red candle", player), - lambda state: ( - state.has("Bead of Red Wax", player) - and ( - state.can_reach(world.get_region("D02Z03S06", player), player) - or state.has("D05Z01S02[W]", player) - ) - )) - set_rule(world.get_location("Third red candle", player), - lambda state: ( - state.has("Bead of Red Wax", player) - and state.has("D05Z01S02[W]", player) - and state.can_reach(world.get_region("D02Z03S06", player), player) - )) - set_rule(world.get_location("Second blue candle", player), - lambda state: ( - state.has("Bead of Blue Wax", player) - and ( - state.has("OpenedBOTSSLadder", player) - or state.can_reach(world.get_region("D01Z04S16", player), player) - ) - )) - set_rule(world.get_location("Third blue candle", player), - lambda state: ( - state.has("Bead of Blue Wax", player) - and state.has("OpenedBOTSSLadder", player) - and state.can_reach(world.get_region("D01Z04S16", player), player) - )) - set_rule(world.get_location("Defeat 1 Amanecida", player), - lambda state: amanecida_rooms(state, logic, player, 1)) - set_rule(world.get_location("Defeat 2 Amanecidas", player), - lambda state: amanecida_rooms(state, logic, player, 2)) - set_rule(world.get_location("Defeat 3 Amanecidas", player), - lambda state: amanecida_rooms(state, logic, player, 3)) - set_rule(world.get_location("Defeat 4 Amanecidas", player), - lambda state: amanecida_rooms(state, logic, player, 4)) - set_rule(world.get_location("Defeat all Amanecidas", player), - lambda state: amanecida_rooms(state, logic, player, 4)) - set_rule(world.get_location("Confessor Dungeon 1 main", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 1) - )) - set_rule(world.get_location("Confessor Dungeon 2 main", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 2) - )) - set_rule(world.get_location("Confessor Dungeon 3 main", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 3) - )) - set_rule(world.get_location("Confessor Dungeon 4 main", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 4) - )) - set_rule(world.get_location("Confessor Dungeon 5 main", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 5) - )) - set_rule(world.get_location("Confessor Dungeon 6 main", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 6) - )) - set_rule(world.get_location("Confessor Dungeon 7 main", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 7) - )) - set_rule(world.get_location("Confessor Dungeon 1 extra", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 1) - )) - set_rule(world.get_location("Confessor Dungeon 2 extra", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 2) - )) - set_rule(world.get_location("Confessor Dungeon 3 extra", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 3) - )) - set_rule(world.get_location("Confessor Dungeon 4 extra", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 4) - )) - set_rule(world.get_location("Confessor Dungeon 5 extra", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 5) - )) - set_rule(world.get_location("Confessor Dungeon 6 extra", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 6) - )) - set_rule(world.get_location("Confessor Dungeon 7 extra", player), - lambda state: ( - state.has("Weight of True Guilt", player) - and guilt_rooms(state, player, 7) - )) - set_rule(world.get_location("Skill 1, Tier 1", player), - lambda state: sword_rooms(state, player, 1)) - set_rule(world.get_location("Skill 1, Tier 2", player), - lambda state: sword_rooms(state, player, 2)) - set_rule(world.get_location("Skill 1, Tier 3", player), - lambda state: sword_rooms(state, player, 4)) - set_rule(world.get_location("Skill 2, Tier 1", player), - lambda state: sword_rooms(state, player, 1)) - set_rule(world.get_location("Skill 2, Tier 2", player), - lambda state: sword_rooms(state, player, 3)) - set_rule(world.get_location("Skill 2, Tier 3", player), - lambda state: sword_rooms(state, player, 6)) - set_rule(world.get_location("Skill 3, Tier 1", player), - lambda state: sword_rooms(state, player, 2)) - set_rule(world.get_location("Skill 3, Tier 2", player), - lambda state: sword_rooms(state, player, 5)) - set_rule(world.get_location("Skill 3, Tier 3", player), - lambda state: sword_rooms(state, player, 7)) - set_rule(world.get_location("Skill 4, Tier 1", player), - lambda state: sword_rooms(state, player, 1)) - set_rule(world.get_location("Skill 4, Tier 2", player), - lambda state: sword_rooms(state, player, 3)) - set_rule(world.get_location("Skill 4, Tier 3", player), - lambda state: sword_rooms(state, player, 6)) - set_rule(world.get_location("Skill 5, Tier 1", player), - lambda state: sword_rooms(state, player, 1)) - set_rule(world.get_location("Skill 5, Tier 2", player), - lambda state: sword_rooms(state, player, 2)) - set_rule(world.get_location("Skill 5, Tier 3", player), - lambda state: sword_rooms(state, player, 4)) \ No newline at end of file + bosses: Dict[str, float] = { + "warden": -0.10, + "ten-piedad": 0.05, + "charred-visage": 0.20, + "tres-angustias": 0.15, + "esdras": 0.25, + "melquiades": 0.25, + "exposito": 0.30, + "quirce": 0.35, + "crisanta": 0.50, + "isidora": 0.70, + "sierpes": 0.70, + "amanecida": 0.60, + "laudes": 0.60, + "perpetua": -0.05, + "legionary": 0.20 + } + boss_strength: float = bosses[boss] + return player_strength >= (boss_strength - 0.10 if self.world.options.difficulty >= 2 else + (boss_strength if self.world.options.difficulty >= 1 else boss_strength + 0.10)) + + def guilt_rooms(self, state: CollectionState) -> int: + doors = [ + "D01Z04S01[NE]", + "D02Z02S11[W]", + "D03Z03S02[NE]", + "D04Z02S02[SE]", + "D05Z01S05[NE]", + "D09Z01S05[W]", + "D17Z01S04[W]", + ] + + return sum(state.can_reach_region(door, self.player) for door in doors) + + def sword_rooms(self, state: CollectionState) -> int: + doors = [ + ["D01Z02S07[E]", "D01Z02S02[SW]"], + ["D20Z01S04[E]", "D01Z05S23[W]"], + ["D02Z03S02[NE]"], + ["D04Z02S21[NE]"], + ["D05Z01S21[NW]"], + ["D06Z01S15[NE]"], + ["D17Z01S07[SW]"] + ] + + total: int = 0 + for subdoors in doors: + for door in subdoors: + if state.can_reach_region(door, self.player): + total += 1 + break + + return total + + def redento_rooms(self, state: CollectionState) -> int: + if ( + state.can_reach_region("D03Z01S04[E]", self.player) + or state.can_reach_region("D03Z02S10[N]", self.player) + ): + if ( + state.can_reach_region("D17Z01S05[S]", self.player) + or state.can_reach_region("D17BZ02S01[FrontR]", self.player) + ): + if ( + state.can_reach_region("D01Z03S04[E]", self.player) + or state.can_reach_region("D08Z01S01[W]", self.player) + ): + if ( + state.can_reach_region("D04Z01S03[E]", self.player) + or state.can_reach_region("D04Z02S01[W]", self.player) + or state.can_reach_region("D06Z01S18[-Cherubs]", self.player) + ): + if ( + self.knots(state) >= 1 + and self.limestones(state) >= 3 + and ( + state.can_reach_region("D04Z02S08[E]", self.player) + or state.can_reach_region("D04BZ02S01[Redento]", self.player) + ) + ): + return 5 + return 4 + return 3 + return 2 + return 1 + return 0 + + def miriam_rooms(self, state: CollectionState) -> int: + doors = [ + "D02Z03S07[NWW]", + "D03Z03S07[NW]", + "D04Z04S01[E]", + "D05Z01S06[W]", + "D06Z01S17[E]" + ] + + return sum(state.can_reach_region(door, self.player) for door in doors) + + def amanecida_rooms(self, state: CollectionState) -> int: + total: int = 0 + if self.can_beat_graveyard_boss(state): + total += 1 + if self.can_beat_jondo_boss(state): + total += 1 + if self.can_beat_patio_boss(state): + total += 1 + if self.can_beat_wall_boss(state): + total += 1 + + return total + + def chalice_rooms(self, state: CollectionState) -> int: + doors = [ + ["D03Z01S02[E]", "D01Z05S02[W]", "D20Z01S03[N]"], + ["D05Z01S11[SE]", "D05Z02S02[NW]"], + ["D09Z01S09[E]", "D09Z01S10[W]", "D09Z01S08[SE]", "D09Z01S02[SW]"] + ] + + total: int = 0 + for subdoors in doors: + for door in subdoors: + if state.can_reach_region(door, self.player): + total += 1 + break + + return total diff --git a/worlds/blasphemous/Vanilla.py b/worlds/blasphemous/Vanilla.py index 034a2a295b6b..9cefe9df8ac4 100644 --- a/worlds/blasphemous/Vanilla.py +++ b/worlds/blasphemous/Vanilla.py @@ -8,12 +8,12 @@ } -junk_locations: Set[str] = [ +junk_locations: Set[str] = { "Albero: Donate 50000 Tears", "Ossuary: 11th reward", "AtTotS: Miriam's gift", "TSC: Jocinero's final reward" -] +} thorn_set: Set[str] = { @@ -44,4 +44,4 @@ "Skill 5, Tier 1": "Lunge Skill", "Skill 5, Tier 2": "Lunge Skill", "Skill 5, Tier 3": "Lunge Skill", -} \ No newline at end of file +} diff --git a/worlds/blasphemous/__init__.py b/worlds/blasphemous/__init__.py index a46fb55b9541..b110c316da48 100644 --- a/worlds/blasphemous/__init__.py +++ b/worlds/blasphemous/__init__.py @@ -1,15 +1,15 @@ from typing import Dict, List, Set, Any from collections import Counter -from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification +from BaseClasses import Region, Location, Item, Tutorial, ItemClassification +from Options import OptionError from worlds.AutoWorld import World, WebWorld -from .Items import base_id, item_table, group_table, tears_set, reliquary_set, event_table -from .Locations import location_table -from .Rooms import room_table, door_table -from .Rules import rules -from worlds.generic.Rules import set_rule, add_rule -from .Options import blasphemous_options +from .Items import base_id, item_table, group_table, tears_list, reliquary_set +from .Locations import location_names +from .Rules import BlasRules +from worlds.generic.Rules import set_rule +from .Options import BlasphemousOptions, blas_option_groups from .Vanilla import unrandomized_dict, junk_locations, thorn_set, skill_dict - +from .region_data import regions, locations class BlasphemousWeb(WebWorld): theme = "stone" @@ -21,39 +21,33 @@ class BlasphemousWeb(WebWorld): "setup/en", ["TRPG"] )] + option_groups = blas_option_groups class BlasphemousWorld(World): """ Blasphemous is a challenging Metroidvania set in the cursed land of Cvstodia. Play as the Penitent One, trapped - in an endless cycle of death and rebirth, and free the world from it's terrible fate in your quest to break + in an endless cycle of death and rebirth, and free the world from its terrible fate in your quest to break your eternal damnation! """ - game: str = "Blasphemous" + game = "Blasphemous" web = BlasphemousWeb() item_name_to_id = {item["name"]: (base_id + index) for index, item in enumerate(item_table)} - location_name_to_id = {loc["name"]: (base_id + index) for index, loc in enumerate(location_table)} - location_name_to_game_id = {loc["name"]: loc["game_id"] for loc in location_table} + location_name_to_id = {loc: (base_id + index) for index, loc in enumerate(location_names.values())} item_name_groups = group_table - option_definitions = blasphemous_options + options_dataclass = BlasphemousOptions + options: BlasphemousOptions - required_client_version = (0, 4, 2) + required_client_version = (0, 4, 7) def __init__(self, multiworld, player): super(BlasphemousWorld, self).__init__(multiworld, player) self.start_room: str = "D17Z01S01" - self.door_connections: Dict[str, str] = {} - - - def set_rules(self): - rules(self) - for door in door_table: - add_rule(self.multiworld.get_location(door["Id"], self.player), - lambda state: state.can_reach(self.get_connected_door(door["Id"])), self.player) + self.disabled_locations: List[str] = [] def create_item(self, name: str) -> "BlasphemousItem": @@ -68,64 +62,56 @@ def create_event(self, event: str): def get_filler_item_name(self) -> str: - return self.multiworld.random.choice(tears_set) + return self.random.choice(tears_list) def generate_early(self): - world = self.multiworld - player = self.player - - if not world.starting_location[player].randomized: - if world.starting_location[player].value == 6 and world.difficulty[player].value < 2: - raise Exception(f"[Blasphemous - '{world.get_player_name(player)}'] {world.starting_location[player]}" - " cannot be chosen if Difficulty is lower than Hard.") - - if (world.starting_location[player].value == 0 or world.starting_location[player].value == 6) \ - and world.dash_shuffle[player]: - raise Exception(f"[Blasphemous - '{world.get_player_name(player)}'] {world.starting_location[player]}" - " cannot be chosen if Shuffle Dash is enabled.") + if not self.options.starting_location.randomized: + if self.options.starting_location == "mourning_havoc" and self.options.difficulty < 2: + raise OptionError(f"[Blasphemous - '{self.player_name}'] " + f"{self.options.starting_location} cannot be chosen if Difficulty is lower than Hard.") + + if (self.options.starting_location == "brotherhood" or self.options.starting_location == "mourning_havoc") \ + and self.options.dash_shuffle: + raise OptionError(f"[Blasphemous - '{self.player_name}'] " + f"{self.options.starting_location} cannot be chosen if Shuffle Dash is enabled.") - if world.starting_location[player].value == 3 and world.wall_climb_shuffle[player]: - raise Exception(f"[Blasphemous - '{world.get_player_name(player)}'] {world.starting_location[player]}" - " cannot be chosen if Shuffle Wall Climb is enabled.") + if self.options.starting_location == "grievance" and self.options.wall_climb_shuffle: + raise OptionError(f"[Blasphemous - '{self.player_name}'] " + f"{self.options.starting_location} cannot be chosen if Shuffle Wall Climb is enabled.") else: locations: List[int] = [ 0, 1, 2, 3, 4, 5, 6 ] - invalid: bool = False - if world.difficulty[player].value < 2: + if self.options.difficulty < 2: locations.remove(6) - if world.dash_shuffle[player]: + if self.options.dash_shuffle: locations.remove(0) if 6 in locations: locations.remove(6) - if world.wall_climb_shuffle[player]: + if self.options.wall_climb_shuffle: locations.remove(3) - if world.starting_location[player].value == 6 and world.difficulty[player].value < 2: - invalid = True - - if (world.starting_location[player].value == 0 or world.starting_location[player].value == 6) \ - and world.dash_shuffle[player]: - invalid = True - - if world.starting_location[player].value == 3 and world.wall_climb_shuffle[player]: - invalid = True - - if invalid: - world.starting_location[player].value = world.random.choice(locations) + if self.options.starting_location.value not in locations: + self.options.starting_location.value = self.random.choice(locations) - if not world.dash_shuffle[player]: - world.push_precollected(self.create_item("Dash Ability")) + if not self.options.dash_shuffle: + self.multiworld.push_precollected(self.create_item("Dash Ability")) - if not world.wall_climb_shuffle[player]: - world.push_precollected(self.create_item("Wall Climb Ability")) + if not self.options.wall_climb_shuffle: + self.multiworld.push_precollected(self.create_item("Wall Climb Ability")) - if world.skip_long_quests[player]: + if not self.options.boots_of_pleading: + self.disabled_locations.append("RE401") + + if not self.options.purified_hand: + self.disabled_locations.append("RE402") + + if self.options.skip_long_quests: for loc in junk_locations: - world.exclude_locations[player].value.add(loc) + self.options.exclude_locations.value.add(loc) start_rooms: Dict[int, str] = { 0: "D17Z01S01", @@ -137,13 +123,10 @@ def generate_early(self): 6: "D20Z02S09" } - self.start_room = start_rooms[world.starting_location[player].value] + self.start_room = start_rooms[self.options.starting_location.value] def create_items(self): - world = self.multiworld - player = self.player - removed: int = 0 to_remove: List[str] = [ "Tears of Atonement (250)", @@ -156,46 +139,46 @@ def create_items(self): skipped_items = [] junk: int = 0 - for item, count in world.start_inventory[player].value.items(): + for item, count in self.options.start_inventory.value.items(): for _ in range(count): skipped_items.append(item) junk += 1 skipped_items.extend(unrandomized_dict.values()) - if world.thorn_shuffle[player] == 2: - for i in range(8): + if self.options.thorn_shuffle == "vanilla": + for _ in range(8): skipped_items.append("Thorn Upgrade") - if world.dash_shuffle[player]: + if self.options.dash_shuffle: skipped_items.append(to_remove[removed]) removed += 1 - elif not world.dash_shuffle[player]: + elif not self.options.dash_shuffle: skipped_items.append("Dash Ability") - if world.wall_climb_shuffle[player]: + if self.options.wall_climb_shuffle: skipped_items.append(to_remove[removed]) removed += 1 - elif not world.wall_climb_shuffle[player]: + elif not self.options.wall_climb_shuffle: skipped_items.append("Wall Climb Ability") - if not world.reliquary_shuffle[player]: + if not self.options.reliquary_shuffle: skipped_items.extend(reliquary_set) - elif world.reliquary_shuffle[player]: - for i in range(3): + elif self.options.reliquary_shuffle: + for _ in range(3): skipped_items.append(to_remove[removed]) removed += 1 - if not world.boots_of_pleading[player]: + if not self.options.boots_of_pleading: skipped_items.append("Boots of Pleading") - if not world.purified_hand[player]: + if not self.options.purified_hand: skipped_items.append("Purified Hand of the Nun") - if world.start_wheel[player]: + if self.options.start_wheel: skipped_items.append("The Young Mason's Wheel") - if not world.skill_randomizer[player]: + if not self.options.skill_randomizer: skipped_items.extend(skill_dict.values()) counter = Counter(skipped_items) @@ -208,184 +191,140 @@ def create_items(self): if count <= 0: continue else: - for i in range(count): + for _ in range(count): pool.append(self.create_item(item["name"])) for _ in range(junk): pool.append(self.create_item(self.get_filler_item_name())) - world.itempool += pool + self.multiworld.itempool += pool def pre_fill(self): - world = self.multiworld - player = self.player - self.place_items_from_dict(unrandomized_dict) - if world.thorn_shuffle[player] == 2: + if self.options.thorn_shuffle == "vanilla": self.place_items_from_set(thorn_set, "Thorn Upgrade") - if world.start_wheel[player]: - world.get_location("Beginning gift", player)\ - .place_locked_item(self.create_item("The Young Mason's Wheel")) + if self.options.start_wheel: + self.get_location("Beginning gift").place_locked_item(self.create_item("The Young Mason's Wheel")) - if not world.skill_randomizer[player]: + if not self.options.skill_randomizer: self.place_items_from_dict(skill_dict) - if world.thorn_shuffle[player] == 1: - world.local_items[player].value.add("Thorn Upgrade") + if self.options.thorn_shuffle == "local_only": + self.options.local_items.value.add("Thorn Upgrade") def place_items_from_set(self, location_set: Set[str], name: str): for loc in location_set: - self.multiworld.get_location(loc, self.player)\ - .place_locked_item(self.create_item(name)) + self.get_location(loc).place_locked_item(self.create_item(name)) def place_items_from_dict(self, option_dict: Dict[str, str]): for loc, item in option_dict.items(): - self.multiworld.get_location(loc, self.player)\ - .place_locked_item(self.create_item(item)) + self.get_location(loc).place_locked_item(self.create_item(item)) def create_regions(self) -> None: + multiworld = self.multiworld player = self.player - world = self.multiworld - - menu_region = Region("Menu", player, world) - misc_region = Region("Misc", player, world) - world.regions += [menu_region, misc_region] - for room in room_table: - region = Region(room, player, world) - world.regions.append(region) + created_regions: List[str] = [] - menu_region.add_exits({self.start_room: "New Game"}) - world.get_region(self.start_room, player).add_exits({"Misc": "Misc"}) + for r in regions: + multiworld.regions.append(Region(r["name"], player, multiworld)) + created_regions.append(r["name"]) - for door in door_table: - if door.get("OriginalDoor") is None: - continue - else: - if not door["Id"] in self.door_connections.keys(): - self.door_connections[door["Id"]] = door["OriginalDoor"] - self.door_connections[door["OriginalDoor"]] = door["Id"] - - parent_region: Region = self.get_room_from_door(door["Id"]) - target_region: Region = self.get_room_from_door(door["OriginalDoor"]) - parent_region.add_exits({ - target_region.name: door["Id"] - }, { - target_region.name: lambda x: door.get("VisibilityFlags") != 1 - }) - - for index, loc in enumerate(location_table): - if not world.boots_of_pleading[player] and loc["name"] == "BotSS: 2nd meeting with Redento": - continue - if not world.purified_hand[player] and loc["name"] == "MoM: Western room ledge": - continue + self.get_region("Menu").add_exits({self.start_room: "New Game"}) + + blas_logic = BlasRules(self) + + for r in regions: + region = self.get_region(r["name"]) + + for e in r["exits"]: + region.add_exits({e["target"]}, {e["target"]: blas_logic.load_rule(True, r["name"], e)}) - region: Region = world.get_region(loc["room"], player) - region.add_locations({loc["name"]: base_id + index}) - #id = base_id + location_table.index(loc) - #reg.locations.append(BlasphemousLocation(player, loc["name"], id, reg)) - - for e, r in event_table.items(): - region: Region = world.get_region(r, player) - event = BlasphemousLocation(player, e, None, region) - event.show_in_spoiler = False - event.place_locked_item(self.create_event(e)) - region.locations.append(event) - - for door in door_table: - region: Region = self.get_room_from_door(self.door_connections[door["Id"]]) - event = BlasphemousLocation(player, door["Id"], None, region) - event.show_in_spoiler = False - event.place_locked_item(self.create_event(door["Id"])) - region.locations.append(event) + for l in [l for l in r["locations"] if l not in self.disabled_locations]: + region.add_locations({location_names[l]: self.location_name_to_id[location_names[l]]}, BlasphemousLocation) + + for t in r["transitions"]: + if t == r["name"]: + continue + + if t in created_regions: + region.add_exits({t}) + else: + multiworld.regions.append(Region(t, player, multiworld)) + created_regions.append(t) + region.add_exits({t}) + + + for l in [l for l in locations if l["name"] not in self.disabled_locations]: + location = self.get_location(location_names[l["name"]]) + set_rule(location, blas_logic.load_rule(False, l["name"], l)) + + for rname, ename in blas_logic.indirect_conditions: + self.multiworld.register_indirect_condition(self.get_region(rname), self.get_entrance(ename)) + #from Utils import visualize_regions + #visualize_regions(self.get_region("Menu"), "blasphemous_regions.puml") - victory = Location(player, "His Holiness Escribar", None, world.get_region("D07Z01S03", player)) + victory = Location(player, "His Holiness Escribar", None, self.get_region("D07Z01S03[W]")) victory.place_locked_item(self.create_event("Victory")) - world.get_region("D07Z01S03", player).locations.append(victory) + self.get_region("D07Z01S03[W]").locations.append(victory) - if world.ending[self.player].value == 1: + if self.options.ending == "ending_a": set_rule(victory, lambda state: state.has("Thorn Upgrade", player, 8)) - elif world.ending[self.player].value == 2: + elif self.options.ending == "ending_c": set_rule(victory, lambda state: state.has("Thorn Upgrade", player, 8) and state.has("Holy Wound of Abnegation", player)) - world.completion_condition[self.player] = lambda state: state.has("Victory", player) - - - def get_room_from_door(self, door: str) -> Region: - return self.multiworld.get_region(door.split("[")[0], self.player) - - - def get_connected_door(self, door: str) -> Entrance: - return self.multiworld.get_entrance(self.door_connections[door], self.player) + multiworld.completion_condition[self.player] = lambda state: state.has("Victory", player) def fill_slot_data(self) -> Dict[str, Any]: slot_data: Dict[str, Any] = {} - locations = [] doors: Dict[str, str] = {} - - world = self.multiworld - player = self.player thorns: bool = True - if world.thorn_shuffle[player].value == 2: + if self.options.thorn_shuffle == "vanilla": thorns = False - for loc in world.get_filled_locations(player): - if loc.item.code == None: - continue - else: - data = { - "id": self.location_name_to_game_id[loc.name], - "ap_id": loc.address, - "name": loc.item.name, - "player_name": world.player_name[loc.item.player], - "type": int(loc.item.classification) - } - - locations.append(data) - config = { - "LogicDifficulty": world.difficulty[player].value, - "StartingLocation": world.starting_location[player].value, + "LogicDifficulty": self.options.difficulty.value, + "StartingLocation": self.options.starting_location.value, "VersionCreated": "AP", - "UnlockTeleportation": bool(world.prie_dieu_warp[player].value), - "AllowHints": bool(world.corpse_hints[player].value), - "AllowPenitence": bool(world.penitence[player].value), + "UnlockTeleportation": bool(self.options.prie_dieu_warp.value), + "AllowHints": bool(self.options.corpse_hints.value), + "AllowPenitence": bool(self.options.penitence.value), - "ShuffleReliquaries": bool(world.reliquary_shuffle[player].value), - "ShuffleBootsOfPleading": bool(world.boots_of_pleading[player].value), - "ShufflePurifiedHand": bool(world.purified_hand[player].value), - "ShuffleDash": bool(world.dash_shuffle[player].value), - "ShuffleWallClimb": bool(world.wall_climb_shuffle[player].value), + "ShuffleReliquaries": bool(self.options.reliquary_shuffle.value), + "ShuffleBootsOfPleading": bool(self.options.boots_of_pleading.value), + "ShufflePurifiedHand": bool(self.options.purified_hand.value), + "ShuffleDash": bool(self.options.dash_shuffle.value), + "ShuffleWallClimb": bool(self.options.wall_climb_shuffle.value), - "ShuffleSwordSkills": bool(world.skill_randomizer[player].value), + "ShuffleSwordSkills": bool(self.options.wall_climb_shuffle.value), "ShuffleThorns": thorns, - "JunkLongQuests": bool(world.skip_long_quests[player].value), - "StartWithWheel": bool(world.start_wheel[player].value), + "JunkLongQuests": bool(self.options.skip_long_quests.value), + "StartWithWheel": bool(self.options.start_wheel.value), - "EnemyShuffleType": world.enemy_randomizer[player].value, - "MaintainClass": bool(world.enemy_groups[player].value), - "AreaScaling": bool(world.enemy_scaling[player].value), + "EnemyShuffleType": self.options.enemy_randomizer.value, + "MaintainClass": bool(self.options.enemy_groups.value), + "AreaScaling": bool(self.options.enemy_scaling.value), "BossShuffleType": 0, "DoorShuffleType": 0 } slot_data = { - "locations": locations, + "locationinfo": [{"gameId": loc, "apId": (base_id + index)} for index, loc in enumerate(location_names)], "doors": doors, "cfg": config, - "ending": world.ending[self.player].value, - "death_link": bool(world.death_link[self.player].value) + "ending": self.options.ending.value, + "death_link": bool(self.options.death_link.value) } return slot_data diff --git a/worlds/blasphemous/docs/setup_en.md b/worlds/blasphemous/docs/setup_en.md index 070d1ca4964b..068990be1f3a 100644 --- a/worlds/blasphemous/docs/setup_en.md +++ b/worlds/blasphemous/docs/setup_en.md @@ -1,48 +1,17 @@ # Blasphemous Multiworld Setup Guide -## Useful Links +It is recommended to use the [Mod Installer](https://github.com/BrandenEK/Blasphemous.Modding.Installer) to handle installing and updating mods. If you would prefer to install mods manually, instructions can also be found at the Mod Installer repository. -Required: -- Blasphemous: [Steam](https://store.steampowered.com/app/774361/Blasphemous/) - - The GOG version of Blasphemous will also work. -- Blasphemous Mod Installer: [GitHub](https://github.com/BrandenEK/Blasphemous-Mod-Installer) -- Blasphemous Modding API: [GitHub](https://github.com/BrandenEK/Blasphemous-Modding-API) -- Blasphemous Randomizer: [GitHub](https://github.com/BrandenEK/Blasphemous-Randomizer) -- Blasphemous Multiworld: [GitHub](https://github.com/BrandenEK/Blasphemous-Multiworld) +You will need the [Multiworld](https://github.com/BrandenEK/Blasphemous.Randomizer.Multiworld) mod to play an Archipelago randomizer. -Optional: -- In-game map tracker: [GitHub](https://github.com/BrandenEK/Blasphemous-Rando-Map) -- Quick Prie Dieu warp mod: [GitHub](https://github.com/BadMagic100/Blasphemous-PrieWarp) -- Boots of Pleading mod: [GitHub](https://github.com/BrandenEK/Blasphemous-Boots-of-Pleading) -- Double Jump mod: [GitHub](https://github.com/BrandenEK/Blasphemous-Double-Jump) +Some optional mods are also recommended: +- [Rando Map](https://github.com/BrandenEK/Blasphemous.Randomizer.MapTracker) +- [Boots of Pleading](https://github.com/BrandenEK/Blasphemous.BootsOfPleading) (Required if the "Boots of Pleading" option is enabled) +- [Double Jump](https://github.com/BrandenEK/Blasphemous.DoubleJump) (Required if the "Purified Hand of the Nun" option is enabled) -## Mod Installer (Recommended) +To connect to a multiworld: Choose a save file and enter the address, your name, and the password (if the server has one) into the menu. -1. Download the [Mod Installer](https://github.com/BrandenEK/Blasphemous-Mod-Installer), -and point it to your install directory for Blasphemous. - -2. Install the `Modding API`, `Randomizer`, and `Multiworld` mods. Optionally, you can also install the -`Rando Map`, `PrieWarp`, `Boots of Pleading`, and `Double Jump` mods, and set up the PopTracker pack if desired. - -3. Start Blasphemous. To verfy that the mods are working, look for a version number for both -the Randomizer and Multiworld on the title screen. - -## Manual Installation - -1. Download the [Modding API](https://github.com/BrandenEK/Blasphemous-Modding-API/releases), and follow -the [installation instructions](https://github.com/BrandenEK/Blasphemous-Modding-API#installation) on the GitHub page. - -2. After the Modding API has been installed, download the -[Randomizer](https://github.com/BrandenEK/Blasphemous-Randomizer/releases) and -[Multiworld](https://github.com/BrandenEK/Blasphemous-Multiworld/releases) archives, and extract the contents of both -into the `Modding` folder. Then, add any desired additional mods. - -3. Start Blasphemous. To verfy that the mods are working, look for a version number for both -the Randomizer and Multiworld on the title screen. - -## Connecting - -To connect to an Archipelago server, open the in-game console by pressing backslash `\` and use -the command `multiworld connect [address:port] [name] [password]`. -The port and password are both optional - if no port is provided then the default port of 38281 is used. -**Make sure to connect to the server before attempting to start a new save file.** \ No newline at end of file +After connecting, there are some commands you can use in the console, which can be opened by pressing backslash `\`: +- `ap status` - Display connection status. +- `ap say [message]` - Send a message to the server. +- `ap hint [item]` - Request a hint for an item from the server. \ No newline at end of file diff --git a/worlds/blasphemous/region_data.py b/worlds/blasphemous/region_data.py new file mode 100644 index 000000000000..b072b7931857 --- /dev/null +++ b/worlds/blasphemous/region_data.py @@ -0,0 +1,48070 @@ +# This file is programmatically generated, do not modify by hand + +regions = [ + { + "name": "Menu", + "exits": [], + "locations": [ + "QI106", + "QI107", + "QI108", + "QI109", + "QI110", + "PR101", + "QI32", + "QI33", + "QI34", + "QI35", + "QI79", + "QI80", + "QI81", + "Arena_NailManager[1000]", + "HE10", + "Arena_NailManager[3000]", + "RB34", + "Arena_NailManager[5000]", + "RB35", + "RB36", + "COMBO_1", + "COMBO_2", + "COMBO_3", + "CHARGED_1", + "CHARGED_2", + "CHARGED_3", + "RANGED_1", + "RANGED_2", + "RANGED_3", + "VERTICAL_1", + "VERTICAL_2", + "VERTICAL_3", + "LUNGE_1", + "LUNGE_2", + "LUNGE_3" + ], + "transitions": [] + }, + { + "name": "D01Z01S07", + "exits": [ + { + "logic": [], + "target": "D01Z01S07[W]" + }, + { + "logic": [], + "target": "D01Z01S07[E]" + } + ], + "locations": [ + "QI31" + ], + "transitions": [] + }, + { + "name": "D01Z01S01[W]", + "exits": [ + { + "logic": [], + "target": "D01Z01S07" + } + ], + "locations": [], + "transitions": [ + "D01Z01S01[W]" + ] + }, + { + "name": "D17Z01S03[E]", + "exits": [ + { + "logic": [], + "target": "D01Z01S07" + } + ], + "locations": [], + "transitions": [ + "D17Z01S03[E]" + ] + }, + { + "name": "D01Z01S02", + "exits": [ + { + "logic": [], + "target": "D01Z01S02[W]" + }, + { + "logic": [], + "target": "D01Z01S02[E]" + } + ], + "locations": [ + "PR14", + "RB07" + ], + "transitions": [] + }, + { + "name": "D01Z01S01[E]", + "exits": [ + { + "logic": [], + "target": "D01Z01S02" + } + ], + "locations": [], + "transitions": [ + "D01Z01S01[E]" + ] + }, + { + "name": "D01Z01S03[W]", + "exits": [ + { + "logic": [], + "target": "D01Z01S02" + } + ], + "locations": [], + "transitions": [ + "D01Z01S03[W]" + ] + }, + { + "name": "D01Z06S01", + "exits": [ + { + "logic": [], + "target": "D01Z06S01[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "bell" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z06S01[Santos]" + } + ], + "locations": [ + "QI101" + ], + "transitions": [] + }, + { + "name": "D01Z01S01[S]", + "exits": [ + { + "logic": [], + "target": "D01Z06S01" + } + ], + "locations": [], + "transitions": [ + "D01Z01S01[S]" + ] + }, + { + "name": "D01BZ07S01[Santos]", + "exits": [ + { + "logic": [], + "target": "D01Z06S01" + } + ], + "locations": [], + "transitions": [ + "D01BZ07S01[Santos]" + ] + }, + { + "name": "D01Z01S02[W]", + "exits": [ + { + "logic": [], + "target": "D01Z01S01[W]" + }, + { + "logic": [], + "target": "D01Z01S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBreakHoles" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z01S01[S]" + } + ], + "locations": [], + "transitions": [ + "D01Z01S02[W]" + ] + }, + { + "name": "D01Z01S07[E]", + "exits": [ + { + "logic": [], + "target": "D01Z01S01[W]" + }, + { + "logic": [], + "target": "D01Z01S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBreakHoles" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z01S01[S]" + } + ], + "locations": [], + "transitions": [ + "D01Z01S07[E]" + ] + }, + { + "name": "D01Z06S01[N]", + "exits": [ + { + "logic": [], + "target": "D01Z01S01[S]" + }, + { + "logic": [], + "target": "D01Z01S01[W]" + }, + { + "logic": [], + "target": "D01Z01S01[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z06S01[N]" + ] + }, + { + "name": "D01Z01S03", + "exits": [ + { + "logic": [], + "target": "D01Z01S03[W]" + }, + { + "logic": [], + "target": "D01Z01S03[E]" + } + ], + "locations": [ + "CO04", + "QI55", + "RESCUED_CHERUB_07" + ], + "transitions": [] + }, + { + "name": "D01Z01S02[E]", + "exits": [ + { + "logic": [], + "target": "D01Z01S03" + } + ], + "locations": [], + "transitions": [ + "D01Z01S02[E]" + ] + }, + { + "name": "D01Z02S01[W]", + "exits": [ + { + "logic": [], + "target": "D01Z01S03" + } + ], + "locations": [], + "transitions": [ + "D01Z02S01[W]" + ] + }, + { + "name": "D01Z02S01", + "exits": [ + { + "logic": [], + "target": "D01Z02S01[W]" + }, + { + "logic": [], + "target": "D01Z02S01[E]" + } + ], + "locations": [ + "RE02", + "RE04", + "RE10" + ], + "transitions": [] + }, + { + "name": "D01Z01S03[E]", + "exits": [ + { + "logic": [], + "target": "D01Z02S01" + }, + { + "logic": [ + { + "item_requirements": [ + "ceremonyItems3", + "hatchedEgg" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB06" + } + ], + "locations": [], + "transitions": [ + "D01Z01S03[E]" + ] + }, + { + "name": "D01Z02S02[W]", + "exits": [ + { + "logic": [], + "target": "D01Z02S01" + }, + { + "logic": [ + { + "item_requirements": [ + "ceremonyItems3", + "hatchedEgg" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB06" + } + ], + "locations": [], + "transitions": [ + "D01Z02S02[W]" + ] + }, + { + "name": "D01Z01S07[W]", + "exits": [ + { + "logic": [], + "target": "D17Z01S03[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "elderKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S03[relic]" + }, + { + "logic": [], + "target": "D17Z01S11[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z01S07[W]" + ] + }, + { + "name": "D17Z01S11[E]", + "exits": [ + { + "logic": [], + "target": "D17Z01S03[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "elderKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S03[relic]" + }, + { + "logic": [], + "target": "D17Z01S11" + } + ], + "locations": [], + "transitions": [ + "D17Z01S11[E]", + "D17Z01S03[W]" + ] + }, + { + "name": "D17BZ01S01[relic]", + "exits": [ + { + "logic": [], + "target": "D17Z01S03[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "elderKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S03[relic]" + }, + { + "logic": [], + "target": "D17Z01S11[E]" + } + ], + "locations": [], + "transitions": [ + "D17BZ01S01[relic]" + ] + }, + { + "name": "D01Z02S02", + "exits": [ + { + "logic": [], + "target": "D01Z02S02[SW]" + }, + { + "logic": [], + "target": "D01Z02S02[SE]" + }, + { + "logic": [], + "target": "D01Z02S02[W]" + }, + { + "logic": [], + "target": "D01Z02S02[E]" + }, + { + "logic": [], + "target": "D01Z02S02[NE]" + } + ], + "locations": [ + "RB01", + "QI66", + "Tirso[500]", + "Tirso[1000]", + "Tirso[2000]", + "Tirso[5000]", + "Tirso[10000]", + "QI56" + ], + "transitions": [] + }, + { + "name": "D01Z02S01[E]", + "exits": [ + { + "logic": [], + "target": "D01Z02S02" + } + ], + "locations": [], + "transitions": [ + "D01Z02S01[E]" + ] + }, + { + "name": "D01Z02S03[W]", + "exits": [ + { + "logic": [], + "target": "D01Z02S02" + } + ], + "locations": [], + "transitions": [ + "D01Z02S03[W]" + ] + }, + { + "name": "D01Z02S03[NW]", + "exits": [ + { + "logic": [], + "target": "D01Z02S02" + } + ], + "locations": [], + "transitions": [ + "D01Z02S03[NW]" + ] + }, + { + "name": "D01Z02S04[W]", + "exits": [ + { + "logic": [], + "target": "D01Z02S02" + } + ], + "locations": [], + "transitions": [ + "D01Z02S04[W]" + ] + }, + { + "name": "D01Z02S06[E]", + "exits": [ + { + "logic": [], + "target": "D01Z02S02" + } + ], + "locations": [], + "transitions": [ + "D01Z02S06[E]" + ] + }, + { + "name": "D01Z02S06", + "exits": [ + { + "logic": [], + "target": "D01Z02S06[W]" + }, + { + "logic": [], + "target": "D01Z02S06[E]" + } + ], + "locations": [ + "Sword[D01Z02S06]" + ], + "transitions": [] + }, + { + "name": "D01Z02S02[SW]", + "exits": [ + { + "logic": [], + "target": "D01Z02S06" + } + ], + "locations": [], + "transitions": [ + "D01Z02S02[SW]" + ] + }, + { + "name": "D01Z02S07[E]", + "exits": [ + { + "logic": [], + "target": "D01Z02S06" + } + ], + "locations": [], + "transitions": [ + "D01Z02S07[E]" + ] + }, + { + "name": "D01Z02S04", + "exits": [ + { + "logic": [], + "target": "D01Z02S04[W]" + }, + { + "logic": [], + "target": "D01Z02S04[E]" + }, + { + "logic": [], + "target": "D01Z02S04[Ossary]" + } + ], + "locations": [ + "CO43" + ], + "transitions": [] + }, + { + "name": "D01Z02S02[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z02S04" + } + ], + "locations": [], + "transitions": [ + "D01Z02S02[SE]" + ] + }, + { + "name": "D01BZ06S01[Ossary]", + "exits": [ + { + "logic": [], + "target": "D01Z02S04" + } + ], + "locations": [], + "transitions": [ + "D01BZ06S01[Ossary]" + ] + }, + { + "name": "D01Z05S01[N]", + "exits": [ + { + "logic": [], + "target": "D01Z02S04" + } + ], + "locations": [], + "transitions": [ + "D01Z05S01[N]" + ] + }, + { + "name": "D01Z02S03", + "exits": [ + { + "logic": [], + "target": "D01Z02S03[W]" + }, + { + "logic": [], + "target": "D01Z02S03[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatMercyBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canBeatConventBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canBeatGrievanceBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z02S03[church]" + }, + { + "logic": [ + { + "item_requirements": [ + "rodeGotPElevator" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_08" + } + ], + "locations": [ + "Lvdovico[500]", + "Lvdovico[1000]", + "PR03" + ], + "transitions": [] + }, + { + "name": "D01Z02S02[E]", + "exits": [ + { + "logic": [], + "target": "D01Z02S03" + } + ], + "locations": [], + "transitions": [ + "D01Z02S02[E]" + ] + }, + { + "name": "D01Z02S02[NE]", + "exits": [ + { + "logic": [], + "target": "D01Z02S03" + }, + { + "logic": [], + "target": "D01Z02S03[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "chargeBeam" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "rangedAttack" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_08" + } + ], + "locations": [], + "transitions": [ + "D01Z02S02[NE]" + ] + }, + { + "name": "D01Z02S05[W]", + "exits": [ + { + "logic": [], + "target": "D01Z02S03" + } + ], + "locations": [], + "transitions": [ + "D01Z02S05[W]" + ] + }, + { + "name": "D01BZ04S01[church]", + "exits": [ + { + "logic": [], + "target": "D01Z02S03" + } + ], + "locations": [], + "transitions": [ + "D01BZ04S01[church]" + ] + }, + { + "name": "D02Z02S11[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D01Z02S03" + } + ], + "locations": [], + "transitions": [ + "D02Z02S11[-Cherubs]" + ] + }, + { + "name": "D01Z02S05", + "exits": [ + { + "logic": [], + "target": "D01Z02S05[W]" + }, + { + "logic": [], + "target": "D01Z02S05[E]" + } + ], + "locations": [ + "CO16" + ], + "transitions": [] + }, + { + "name": "D01Z02S03[E]", + "exits": [ + { + "logic": [], + "target": "D01Z02S05" + } + ], + "locations": [], + "transitions": [ + "D01Z02S03[E]" + ] + }, + { + "name": "D01Z03S01[W]", + "exits": [ + { + "logic": [], + "target": "D01Z02S05" + } + ], + "locations": [], + "transitions": [ + "D01Z03S01[W]" + ] + }, + { + "name": "D01BZ04S01", + "exits": [ + { + "logic": [], + "target": "D01BZ04S01[church]" + } + ], + "locations": [ + "RB104", + "RB105" + ], + "transitions": [] + }, + { + "name": "D01Z02S03[church]", + "exits": [ + { + "logic": [], + "target": "D01BZ04S01" + } + ], + "locations": [], + "transitions": [ + "D01Z02S03[church]" + ] + }, + { + "name": "D01Z02S04[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S01[N]" + }, + { + "logic": [], + "target": "D01Z05S02[N]" + } + ], + "locations": [], + "transitions": [ + "D01Z02S04[E]" + ] + }, + { + "name": "D01Z05S02[N]", + "exits": [ + { + "logic": [], + "target": "D01Z05S01[N]" + }, + { + "logic": [], + "target": "D01Z05S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S03[NW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedDCLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S02[S]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S02[N]", + "D01Z05S01[S]", + "D01Z05S27[E]", + "D01Z05S01[W]" + ] + }, + { + "name": "D01BZ06S01", + "exits": [ + { + "logic": [], + "target": "D01BZ06S01[Ossary]" + }, + { + "logic": [ + { + "item_requirements": [ + "bones30" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01BZ06S01[E]" + } + ], + "locations": [ + "Undertaker[250]", + "Undertaker[500]", + "Undertaker[750]", + "Undertaker[1000]", + "Undertaker[1250]", + "Undertaker[1500]", + "Undertaker[1750]", + "Undertaker[2000]", + "Undertaker[2500]", + "Undertaker[3000]", + "Undertaker[5000]" + ], + "transitions": [] + }, + { + "name": "D01Z02S04[Ossary]", + "exits": [ + { + "logic": [], + "target": "D01BZ06S01" + } + ], + "locations": [], + "transitions": [ + "D01Z02S04[Ossary]" + ] + }, + { + "name": "D01BZ08S01[W]", + "exits": [ + { + "logic": [], + "target": "D01BZ06S01" + } + ], + "locations": [], + "transitions": [ + "D01BZ08S01[W]" + ] + }, + { + "name": "D01Z02S05[E]", + "exits": [ + { + "logic": [], + "target": "D01Z03S01[W]" + }, + { + "logic": [], + "target": "D01Z03S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z03S02[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z03S01[SE]" + } + ], + "locations": [], + "transitions": [ + "D01Z02S05[E]" + ] + }, + { + "name": "D01Z03S02[W]", + "exits": [ + { + "logic": [], + "target": "D01Z03S01[W]" + }, + { + "logic": [], + "target": "D01Z03S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z03S02[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z03S01[SE]" + } + ], + "locations": [], + "transitions": [ + "D01Z03S02[W]" + ] + }, + { + "name": "D01Z03S02[SW]", + "exits": [ + { + "logic": [], + "target": "D01Z03S01[W]" + }, + { + "logic": [], + "target": "D01Z03S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z03S02[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z03S01[SE]" + } + ], + "locations": [ + "RB04" + ], + "transitions": [ + "D01Z03S02[SW]" + ] + }, + { + "name": "D01Z02S07", + "exits": [ + { + "logic": [], + "target": "D01Z02S07[E]" + } + ], + "locations": [ + "QI65" + ], + "transitions": [] + }, + { + "name": "D01Z02S06[W]", + "exits": [ + { + "logic": [], + "target": "D01Z02S07" + } + ], + "locations": [], + "transitions": [ + "D01Z02S06[W]" + ] + }, + { + "name": "D01BZ08S01", + "exits": [ + { + "logic": [], + "target": "D01BZ08S01[W]" + } + ], + "locations": [ + "QI201" + ], + "transitions": [] + }, + { + "name": "D01BZ06S01[E]", + "exits": [ + { + "logic": [], + "target": "D01BZ08S01" + } + ], + "locations": [], + "transitions": [ + "D01BZ06S01[E]" + ] + }, + { + "name": "D01Z03S02", + "exits": [ + { + "logic": [], + "target": "D01Z03S02[W]" + }, + { + "logic": [], + "target": "D01Z03S02[SW]" + }, + { + "logic": [], + "target": "D01Z03S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S05[N]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z03S02[S]" + } + ], + "locations": [ + "CO14" + ], + "transitions": [] + }, + { + "name": "D01Z03S01[E]", + "exits": [ + { + "logic": [], + "target": "D01Z03S02" + } + ], + "locations": [], + "transitions": [ + "D01Z03S01[E]" + ] + }, + { + "name": "D01Z03S01[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z03S02" + } + ], + "locations": [], + "transitions": [ + "D01Z03S01[SE]" + ] + }, + { + "name": "D01Z03S03[W]", + "exits": [ + { + "logic": [], + "target": "D01Z03S02" + } + ], + "locations": [], + "transitions": [ + "D01Z03S03[W]" + ] + }, + { + "name": "D01Z05S05[N]", + "exits": [ + { + "logic": [], + "target": "D01Z03S02" + } + ], + "locations": [], + "transitions": [ + "D01Z05S05[N]" + ] + }, + { + "name": "D01Z03S03", + "exits": [ + { + "logic": [], + "target": "D01Z03S03[W]" + }, + { + "logic": [], + "target": "D01Z03S03[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z03S03[-Cherubs]" + } + ], + "locations": [ + "CO36", + "RESCUED_CHERUB_10" + ], + "transitions": [] + }, + { + "name": "D01Z03S02[E]", + "exits": [ + { + "logic": [], + "target": "D01Z03S03" + } + ], + "locations": [], + "transitions": [ + "D01Z03S02[E]" + ] + }, + { + "name": "D01Z03S04[SW]", + "exits": [ + { + "logic": [], + "target": "D01Z03S03" + } + ], + "locations": [], + "transitions": [ + "D01Z03S04[SW]" + ] + }, + { + "name": "D01Z03S07[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D01Z03S03" + } + ], + "locations": [], + "transitions": [ + "D01Z03S07[-Cherubs]" + ] + }, + { + "name": "D01Z05S05", + "exits": [ + { + "logic": [], + "target": "D01Z05S05[N]" + }, + { + "logic": [], + "target": "D01Z05S05[NW]" + }, + { + "logic": [], + "target": "D01Z05S05[NE]" + }, + { + "logic": [], + "target": "D01Z05S05[SW]" + }, + { + "logic": [], + "target": "D01Z05S05[E]" + } + ], + "locations": [ + "CO09", + "QI67" + ], + "transitions": [] + }, + { + "name": "D01Z03S02[S]", + "exits": [ + { + "logic": [], + "target": "D01Z05S05" + } + ], + "locations": [], + "transitions": [ + "D01Z03S02[S]" + ] + }, + { + "name": "D01Z05S04[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S05" + } + ], + "locations": [], + "transitions": [ + "D01Z05S04[E]" + ] + }, + { + "name": "D01Z05S06[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S05" + } + ], + "locations": [], + "transitions": [ + "D01Z05S06[W]" + ] + }, + { + "name": "D01Z05S09[NW]", + "exits": [ + { + "logic": [], + "target": "D01Z05S05" + } + ], + "locations": [], + "transitions": [ + "D01Z05S09[NW]" + ] + }, + { + "name": "D01Z05S18[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S05" + } + ], + "locations": [], + "transitions": [ + "D01Z05S18[E]" + ] + }, + { + "name": "D01Z03S03[E]", + "exits": [ + { + "logic": [], + "target": "D01Z03S04[SW]" + }, + { + "logic": [], + "target": "D01Z03S04[W]" + }, + { + "logic": [], + "target": "D01Z03S04[SE]" + }, + { + "logic": [], + "target": "D01Z03S04[E]" + }, + { + "logic": [], + "target": "D02Z01S01[SE]" + } + ], + "locations": [], + "transitions": [ + "D01Z03S03[E]" + ] + }, + { + "name": "D01Z03S05[W]", + "exits": [ + { + "logic": [], + "target": "D01Z03S04[SW]" + }, + { + "logic": [], + "target": "D01Z03S04[W]" + }, + { + "logic": [], + "target": "D01Z03S04[SE]" + }, + { + "logic": [], + "target": "D01Z03S04[E]" + }, + { + "logic": [], + "target": "D02Z01S01[SE]" + } + ], + "locations": [], + "transitions": [ + "D01Z03S05[W]" + ] + }, + { + "name": "D01Z03S06[W]", + "exits": [ + { + "logic": [], + "target": "D01Z03S04[SW]" + }, + { + "logic": [], + "target": "D01Z03S04[W]" + }, + { + "logic": [], + "target": "D01Z03S04[SE]" + }, + { + "logic": [], + "target": "D01Z03S04[E]" + }, + { + "logic": [], + "target": "D02Z01S01[SE]" + } + ], + "locations": [], + "transitions": [ + "D01Z03S06[W]" + ] + }, + { + "name": "D01Z03S07[E]", + "exits": [ + { + "logic": [], + "target": "D01Z03S04[SW]" + }, + { + "logic": [], + "target": "D01Z03S04[W]" + }, + { + "logic": [], + "target": "D01Z03S04[SE]" + }, + { + "logic": [], + "target": "D01Z03S04[E]" + }, + { + "logic": [], + "target": "D02Z01S01[SE]" + } + ], + "locations": [], + "transitions": [ + "D01Z03S07[E]" + ] + }, + { + "name": "D02Z01S01[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z03S04[SW]" + }, + { + "logic": [], + "target": "D01Z03S04[W]" + }, + { + "logic": [], + "target": "D01Z03S04[SE]" + }, + { + "logic": [], + "target": "D01Z03S04[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedWOTWCave", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "openedWOTWCave", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO11" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI59" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "fullThimble", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB10" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z01S01[SE]", + "D01Z03S04[NW]" + ] + }, + { + "name": "D01Z03S03[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "PR16" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_13" + }, + { + "logic": [], + "target": "D01Z05S06[W]" + } + ], + "locations": [], + "transitions": [ + "D01Z03S03[-Cherubs]" + ] + }, + { + "name": "D01Z05S05[NE]", + "exits": [ + { + "logic": [], + "target": "D01Z05S06[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWaterJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "PR16" + }, + { + "logic": [ + { + "item_requirements": [ + "canWaterJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_13" + } + ], + "locations": [], + "transitions": [ + "D01Z05S05[NE]" + ] + }, + { + "name": "D01Z03S07", + "exits": [ + { + "logic": [], + "target": "D01Z03S07[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z03S07[-Cherubs]" + } + ], + "locations": [ + "HE02", + "RESCUED_CHERUB_38" + ], + "transitions": [] + }, + { + "name": "D01Z03S04[W]", + "exits": [ + { + "logic": [], + "target": "D01Z03S07" + } + ], + "locations": [], + "transitions": [ + "D01Z03S04[W]" + ] + }, + { + "name": "D02Z01S02[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedWOTWCave" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S04[-N]" + }, + { + "logic": [], + "target": "CO11" + }, + { + "logic": [], + "target": "QI59" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB10" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI68" + }, + { + "logic": [], + "target": "D02Z01S01[SE]" + }, + { + "logic": [], + "target": "D02Z01S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canCrossGap4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canCrossGap4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_23" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S03[SE]" + } + ], + "locations": [], + "transitions": [ + "D02Z01S02[E]", + "D02Z01S01[W]" + ] + }, + { + "name": "D02Z01S06[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedWOTWCave" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S04[-N]" + }, + { + "logic": [], + "target": "CO11" + }, + { + "logic": [ + { + "item_requirements": [ + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI59" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "fullThimble", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "fullThimble", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB10" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI68" + }, + { + "logic": [], + "target": "D02Z01S01[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z01S06[E]" + ] + }, + { + "name": "D02Z01S09[-CherubsL]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedWOTWCave" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S04[-N]" + }, + { + "logic": [], + "target": "CO11" + }, + { + "logic": [], + "target": "QI59" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB10" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI68" + }, + { + "logic": [], + "target": "D02Z01S01[SE]" + }, + { + "logic": [], + "target": "D02Z01S02[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z01S09[-CherubsL]" + ] + }, + { + "name": "D02Z01S09[-CherubsR]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedWOTWCave" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S04[-N]" + }, + { + "logic": [], + "target": "CO11" + }, + { + "logic": [ + { + "item_requirements": [ + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI59" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "fullThimble", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "fullThimble", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB10" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI68" + }, + { + "logic": [], + "target": "D02Z01S01[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z01S09[-CherubsR]" + ] + }, + { + "name": "D01Z03S05", + "exits": [ + { + "logic": [], + "target": "D01Z03S05[W]" + }, + { + "logic": [], + "target": "D01Z03S05[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z03S05[Cherubs]" + } + ], + "locations": [ + "QI06" + ], + "transitions": [] + }, + { + "name": "D01Z03S04[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z03S05" + } + ], + "locations": [], + "transitions": [ + "D01Z03S04[SE]" + ] + }, + { + "name": "D01Z04S01[NW]", + "exits": [ + { + "logic": [], + "target": "D01Z03S05" + } + ], + "locations": [], + "transitions": [ + "D01Z04S01[NW]" + ] + }, + { + "name": "D01Z03S06", + "exits": [ + { + "logic": [], + "target": "D01Z03S06[W]" + }, + { + "logic": [], + "target": "D01Z03S06[E]" + } + ], + "locations": [ + "RB20" + ], + "transitions": [] + }, + { + "name": "D01Z03S04[E]", + "exits": [ + { + "logic": [], + "target": "D01Z03S06" + } + ], + "locations": [], + "transitions": [ + "D01Z03S04[E]" + ] + }, + { + "name": "D08Z01S01[W]", + "exits": [ + { + "logic": [], + "target": "D01Z03S06" + } + ], + "locations": [], + "transitions": [ + "D08Z01S01[W]" + ] + }, + { + "name": "D01Z03S05[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S01[NW]" + }, + { + "logic": [], + "target": "D01Z04S01[E]" + }, + { + "logic": [], + "target": "D01Z04S03[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z03S05[E]" + ] + }, + { + "name": "D01Z04S03[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S01[NW]" + }, + { + "logic": [], + "target": "D01Z04S01[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S03[E]", + "D01Z04S01[W]", + "D01Z04S17[W]", + "D01Z04S01[NE]" + ] + }, + { + "name": "D01Z04S05[NW]", + "exits": [ + { + "logic": [], + "target": "D01Z04S01[NW]" + }, + { + "logic": [], + "target": "D01Z04S01[E]" + }, + { + "logic": [], + "target": "D01Z04S03[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S05[NW]" + ] + }, + { + "name": "D01Z04S05[SW]", + "exits": [ + { + "logic": [], + "target": "D01Z04S01[SE]" + }, + { + "logic": [], + "target": "D01Z04S01[NW]" + }, + { + "logic": [], + "target": "D01Z04S01[E]" + }, + { + "logic": [], + "target": "D01Z04S03[E]" + }, + { + "logic": [], + "target": "D01Z04S15[N]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S05[SW]" + ] + }, + { + "name": "D01Z04S15[N]", + "exits": [ + { + "logic": [], + "target": "D01Z04S01[SE]" + }, + { + "logic": [], + "target": "D01Z04S01[NW]" + }, + { + "logic": [], + "target": "D01Z04S01[E]" + }, + { + "logic": [], + "target": "D01Z04S03[E]" + }, + { + "logic": [], + "target": "D01Z04S15[NE]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S15[N]", + "D01Z04S01[S]" + ] + }, + { + "name": "D01Z05S11", + "exits": [ + { + "logic": [], + "target": "D01Z05S11[W]" + } + ], + "locations": [ + "QI45" + ], + "transitions": [] + }, + { + "name": "D01Z03S05[Cherubs]", + "exits": [ + { + "logic": [], + "target": "D01Z05S11" + } + ], + "locations": [], + "transitions": [ + "D01Z03S05[Cherubs]" + ] + }, + { + "name": "D01Z05S10[NE]", + "exits": [ + { + "logic": [], + "target": "D01Z05S11" + } + ], + "locations": [], + "transitions": [ + "D01Z05S10[NE]" + ] + }, + { + "name": "D08Z01S01", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatBridgeBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z01S01[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "holyWounds3", + "canBeatBridgeBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z01S01[E]" + } + ], + "locations": [ + "BS12", + "PR09" + ], + "transitions": [] + }, + { + "name": "D01Z03S06[E]", + "exits": [ + { + "logic": [], + "target": "D08Z01S01" + }, + { + "logic": [], + "target": "D08Z01S01[W]" + } + ], + "locations": [], + "transitions": [ + "D01Z03S06[E]" + ] + }, + { + "name": "D08Z01S02[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D08Z01S01" + }, + { + "logic": [ + { + "item_requirements": [ + "holyWounds3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z01S01[E]" + } + ], + "locations": [], + "transitions": [ + "D08Z01S02[-Cherubs]" + ] + }, + { + "name": "D08Z02S01[W]", + "exits": [ + { + "logic": [], + "target": "D08Z01S01" + }, + { + "logic": [ + { + "item_requirements": [ + "holyWounds3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z01S01[E]" + } + ], + "locations": [], + "transitions": [ + "D08Z02S01[W]" + ] + }, + { + "name": "D01Z04S05", + "exits": [ + { + "logic": [], + "target": "D01Z04S05[NW]" + }, + { + "logic": [], + "target": "D01Z04S05[SW]" + } + ], + "locations": [ + "CO30" + ], + "transitions": [] + }, + { + "name": "D01Z04S01[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S05" + } + ], + "locations": [], + "transitions": [ + "D01Z04S01[E]" + ] + }, + { + "name": "D01Z04S01[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z04S05" + } + ], + "locations": [], + "transitions": [ + "D01Z04S01[SE]" + ] + }, + { + "name": "D01Z04S06[NW]", + "exits": [ + { + "logic": [], + "target": "D01Z04S15[N]" + }, + { + "logic": [], + "target": "D01Z04S15[NE]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S06[NW]" + ] + }, + { + "name": "D01Z04S06[SW]", + "exits": [ + { + "logic": [], + "target": "D01Z04S15[W]" + }, + { + "logic": [], + "target": "D01Z04S15[E]" + }, + { + "logic": [], + "target": "D01Z04S15[N]" + }, + { + "logic": [], + "target": "D01Z04S15[NE]" + }, + { + "logic": [], + "target": "D01Z04S09[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S06[SW]" + ] + }, + { + "name": "D01Z04S08[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S15[W]" + }, + { + "logic": [], + "target": "D01Z04S15[E]" + }, + { + "logic": [], + "target": "D01Z04S15[N]" + }, + { + "logic": [], + "target": "D01Z04S15[NE]" + }, + { + "logic": [], + "target": "D01Z04S09[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S08[E]" + ] + }, + { + "name": "D01Z04S09[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S15[W]" + }, + { + "logic": [], + "target": "D01Z04S15[E]" + }, + { + "logic": [], + "target": "D01Z04S15[N]" + }, + { + "logic": [], + "target": "D01Z04S15[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedDCGateE" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z04S09[W]" + }, + { + "logic": [], + "target": "D01Z04S09[C]" + }, + { + "logic": [], + "target": "D01Z04S10[SW]" + }, + { + "logic": [], + "target": "D01Z04S13[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "canDiveLaser", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "canDiveLaser", + "wheel" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "canDiveLaser", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "canDiveLaser", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z04S13[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "canDiveLaser", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "wheel" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO21" + }, + { + "logic": [], + "target": "D01Z04S18" + } + ], + "locations": [], + "transitions": [ + "D01Z04S09[E]", + "D01Z04S15[SW]", + "D01Z04S10[NW]", + "D01Z04S15[SE]", + "D01Z04S10[SE]", + "D01Z04S12[NW]", + "D01Z04S12[SE]", + "D01Z04S13[NW]", + "D01Z04S18[E]", + "D01Z04S12[W]", + "D01Z04S02[W]", + "D01Z04S13[NE]" + ] + }, + { + "name": "D01Z04S14[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S13[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "canDiveLaser", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "canDiveLaser", + "wheel" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "canDiveLaser", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "canDiveLaser", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z04S13[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "canDiveLaser", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "wheel" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO21" + }, + { + "logic": [], + "target": "D01Z04S09[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S14[E]" + ] + }, + { + "name": "D01Z04S16[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "HardLogic" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z04S13[SE]" + }, + { + "logic": [], + "target": "CO21" + }, + { + "logic": [], + "target": "D01Z04S13[SW]" + }, + { + "logic": [], + "target": "D01Z04S09[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S16[W]" + ] + }, + { + "name": "D01Z04S07", + "exits": [ + { + "logic": [], + "target": "D01Z04S07[W]" + } + ], + "locations": [ + "PR01" + ], + "transitions": [] + }, + { + "name": "D01Z04S06[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S07" + } + ], + "locations": [], + "transitions": [ + "D01Z04S06[E]" + ] + }, + { + "name": "D01Z04S06", + "exits": [ + { + "logic": [], + "target": "D01Z04S06[E]" + }, + { + "logic": [], + "target": "D01Z04S06[NW]" + }, + { + "logic": [], + "target": "D01Z04S06[SW]" + } + ], + "locations": [ + "CO03", + "RESCUED_CHERUB_09" + ], + "transitions": [] + }, + { + "name": "D01Z04S07[W]", + "exits": [ + { + "logic": [], + "target": "D01Z04S06" + } + ], + "locations": [], + "transitions": [ + "D01Z04S07[W]" + ] + }, + { + "name": "D01Z04S15[NE]", + "exits": [ + { + "logic": [], + "target": "D01Z04S06" + } + ], + "locations": [], + "transitions": [ + "D01Z04S15[NE]" + ] + }, + { + "name": "D01Z04S15[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S06" + } + ], + "locations": [], + "transitions": [ + "D01Z04S15[E]" + ] + }, + { + "name": "D01Z04S09[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S12[E]" + }, + { + "logic": [], + "target": "D01Z05S10[SE]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S09[W]" + ] + }, + { + "name": "D01Z05S10[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z05S12[E]" + }, + { + "logic": [], + "target": "D01Z05S10[NE]" + }, + { + "logic": [], + "target": "D01Z05S10[S]" + }, + { + "logic": [], + "target": "D01Z05S09[NW]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S10[SE]", + "D01Z05S12[W]", + "D01Z05S10[W]", + "D01Z05S09[SE]" + ] + }, + { + "name": "D01BZ02S01", + "exits": [ + { + "logic": [], + "target": "D01BZ02S01[C]" + } + ], + "locations": [ + "QI58", + "RB05", + "RB09" + ], + "transitions": [] + }, + { + "name": "D01Z04S09[C]", + "exits": [ + { + "logic": [], + "target": "D01BZ02S01" + } + ], + "locations": [], + "transitions": [ + "D01Z04S09[C]" + ] + }, + { + "name": "D01Z04S11", + "exits": [ + { + "logic": [], + "target": "D01Z04S11[NE]" + } + ], + "locations": [ + "QI48" + ], + "transitions": [] + }, + { + "name": "D01Z04S10[SW]", + "exits": [ + { + "logic": [], + "target": "D01Z04S11" + } + ], + "locations": [], + "transitions": [ + "D01Z04S10[SW]" + ] + }, + { + "name": "D01Z04S11[NE]", + "exits": [ + { + "logic": [], + "target": "D01Z04S10[SW]" + }, + { + "logic": [], + "target": "D01Z04S09[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S11[NE]" + ] + }, + { + "name": "D01Z04S18", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatMercyBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z04S18[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatMercyBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z04S09[E]" + } + ], + "locations": [ + "BS01" + ], + "transitions": [] + }, + { + "name": "D01Z04S19[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S18" + }, + { + "logic": [], + "target": "D01Z04S18[W]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S19[E]" + ] + }, + { + "name": "D01Z04S14", + "exits": [ + { + "logic": [], + "target": "D01Z04S14[E]" + } + ], + "locations": [ + "CO38" + ], + "transitions": [] + }, + { + "name": "D01Z04S13[SW]", + "exits": [ + { + "logic": [], + "target": "D01Z04S14" + } + ], + "locations": [], + "transitions": [ + "D01Z04S13[SW]" + ] + }, + { + "name": "D01Z04S16", + "exits": [ + { + "logic": [], + "target": "D01Z04S16[W]" + }, + { + "logic": [], + "target": "D01Z04S16[E]" + } + ], + "locations": [ + "RESCUED_CHERUB_33" + ], + "transitions": [] + }, + { + "name": "D01Z04S13[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z04S16" + }, + { + "logic": [ + { + "item_requirements": [ + "blueWax1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB25" + } + ], + "locations": [], + "transitions": [ + "D01Z04S13[SE]" + ] + }, + { + "name": "D05Z02S12[W]", + "exits": [ + { + "logic": [], + "target": "D01Z04S16" + }, + { + "logic": [ + { + "item_requirements": [ + "blueWax1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB25" + } + ], + "locations": [], + "transitions": [ + "D05Z02S12[W]" + ] + }, + { + "name": "D01Z04S08", + "exits": [ + { + "logic": [], + "target": "D01Z04S08[E]" + } + ], + "locations": [ + "RB17" + ], + "transitions": [] + }, + { + "name": "D01Z04S15[W]", + "exits": [ + { + "logic": [], + "target": "D01Z04S08" + } + ], + "locations": [], + "transitions": [ + "D01Z04S15[W]" + ] + }, + { + "name": "D01BZ02S01[C]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedDCGateE" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z04S09[W]" + }, + { + "logic": [], + "target": "D01Z04S09[E]" + }, + { + "logic": [], + "target": "D01Z04S09[C]" + } + ], + "locations": [], + "transitions": [ + "D01BZ02S01[C]" + ] + }, + { + "name": "D01Z05S12[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedDCGateE" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z04S09[W]" + }, + { + "logic": [], + "target": "D01Z04S09[E]" + }, + { + "logic": [], + "target": "D01Z04S09[C]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S12[E]" + ] + }, + { + "name": "D01Z04S16[E]", + "exits": [ + { + "logic": [], + "target": "D05Z02S12[W]" + }, + { + "logic": [], + "target": "D05Z02S12[N]" + }, + { + "logic": [], + "target": "D05Z02S04[W]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S16[E]" + ] + }, + { + "name": "D05Z02S04[W]", + "exits": [ + { + "logic": [], + "target": "D05Z02S12[W]" + }, + { + "logic": [], + "target": "D05Z02S12[N]" + }, + { + "logic": [], + "target": "D05Z02S04[C]" + }, + { + "logic": [], + "target": "D05Z02S03[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S04[W]", + "D05Z02S12[E]", + "D05Z02S04[E]", + "D05Z02S03[W]" + ] + }, + { + "name": "D05Z02S15[S]", + "exits": [ + { + "logic": [], + "target": "D05Z02S12[W]" + }, + { + "logic": [], + "target": "D05Z02S12[N]" + }, + { + "logic": [], + "target": "D05Z02S04[W]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S15[S]" + ] + }, + { + "name": "D01Z04S19", + "exits": [ + { + "logic": [], + "target": "D01Z04S19[W]" + }, + { + "logic": [], + "target": "D01Z04S19[E]" + } + ], + "locations": [ + "QI38" + ], + "transitions": [] + }, + { + "name": "D01Z04S18[W]", + "exits": [ + { + "logic": [], + "target": "D01Z04S19" + } + ], + "locations": [], + "transitions": [ + "D01Z04S18[W]" + ] + }, + { + "name": "D01Z05S19[E]", + "exits": [ + { + "logic": [], + "target": "D01Z04S19" + } + ], + "locations": [], + "transitions": [ + "D01Z05S19[E]" + ] + }, + { + "name": "D01Z04S19[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S19[W]" + }, + { + "logic": [], + "target": "D01Z05S19[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z04S19[W]" + ] + }, + { + "name": "D01Z05S15[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z05S19[W]" + }, + { + "logic": [], + "target": "D01Z05S19[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S15[SE]" + ] + }, + { + "name": "D01Z05S03[NW]", + "exits": [ + { + "logic": [], + "target": "D01Z05S02[N]" + }, + { + "logic": [], + "target": "D01Z05S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S03[NW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedDCLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S02[S]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S03[NW]" + ] + }, + { + "name": "D01Z05S20[N]", + "exits": [ + { + "logic": [], + "target": "D01Z05S02[N]" + }, + { + "logic": [], + "target": "D01Z05S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S03[NW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedDCLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S02[S]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S20[N]" + ] + }, + { + "name": "D03Z01S01[NE]", + "exits": [ + { + "logic": [], + "target": "D01Z05S02[N]" + }, + { + "logic": [], + "target": "D01Z05S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S03[NW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedDCLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S02[S]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S01[NE]" + ] + }, + { + "name": "D03Z01S01", + "exits": [ + { + "logic": [], + "target": "D03Z01S01[W]" + }, + { + "logic": [], + "target": "D03Z01S01[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "D20Z01S03[N]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S01[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S01[-Cherubs]" + } + ], + "locations": [ + "CO13" + ], + "transitions": [] + }, + { + "name": "D01Z05S02[W]", + "exits": [ + { + "logic": [], + "target": "D03Z01S01" + } + ], + "locations": [], + "transitions": [ + "D01Z05S02[W]" + ] + }, + { + "name": "D03Z01S02[E]", + "exits": [ + { + "logic": [], + "target": "D03Z01S01" + } + ], + "locations": [], + "transitions": [ + "D03Z01S02[E]" + ] + }, + { + "name": "D20Z01S03[N]", + "exits": [ + { + "logic": [], + "target": "D03Z01S01" + } + ], + "locations": [], + "transitions": [ + "D20Z01S03[N]" + ] + }, + { + "name": "D01Z05S02[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S03[NW]" + }, + { + "logic": [], + "target": "D01Z05S03[W]" + }, + { + "logic": [], + "target": "D01Z05S03[E]" + }, + { + "logic": [], + "target": "D01Z05S04[W]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S02[E]" + ] + }, + { + "name": "D01Z05S04[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S03[NW]" + }, + { + "logic": [], + "target": "D01Z05S03[W]" + }, + { + "logic": [], + "target": "D01Z05S03[E]" + }, + { + "logic": [], + "target": "D01Z05S04[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S14[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S13[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S04[W]", + "D01Z05S03[NE]", + "D01Z05S13[N]", + "D01Z05S03[S]" + ] + }, + { + "name": "D01Z05S07[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S03[NW]" + }, + { + "logic": [], + "target": "D01Z05S03[W]" + }, + { + "logic": [], + "target": "D01Z05S03[E]" + }, + { + "logic": [], + "target": "D01Z05S04[W]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S07[E]" + ] + }, + { + "name": "D01Z05S08[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S03[NW]" + }, + { + "logic": [], + "target": "D01Z05S03[W]" + }, + { + "logic": [], + "target": "D01Z05S03[E]" + }, + { + "logic": [], + "target": "D01Z05S04[W]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S08[W]" + ] + }, + { + "name": "D01Z05S20", + "exits": [ + { + "logic": [], + "target": "D01Z05S20[W]" + }, + { + "logic": [], + "target": "D01Z05S20[N]" + } + ], + "locations": [ + "RESCUED_CHERUB_15" + ], + "transitions": [] + }, + { + "name": "D01Z05S02[S]", + "exits": [ + { + "logic": [], + "target": "D01Z05S20" + } + ], + "locations": [], + "transitions": [ + "D01Z05S02[S]" + ] + }, + { + "name": "D01Z05S25[NE]", + "exits": [ + { + "logic": [], + "target": "D01Z05S20" + } + ], + "locations": [], + "transitions": [ + "D01Z05S25[NE]" + ] + }, + { + "name": "D01Z05S05[NW]", + "exits": [ + { + "logic": [], + "target": "D01Z05S04[W]" + }, + { + "logic": [], + "target": "D01Z05S04[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S05[NW]" + ] + }, + { + "name": "D01Z05S07", + "exits": [ + { + "logic": [], + "target": "D01Z05S07[E]" + } + ], + "locations": [ + "Oil[D01Z05S07]" + ], + "transitions": [] + }, + { + "name": "D01Z05S03[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S07" + } + ], + "locations": [], + "transitions": [ + "D01Z05S03[W]" + ] + }, + { + "name": "D01Z05S08", + "exits": [ + { + "logic": [], + "target": "D01Z05S08[W]" + } + ], + "locations": [ + "QI12", + "RESCUED_CHERUB_14" + ], + "transitions": [] + }, + { + "name": "D01Z05S03[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S08" + } + ], + "locations": [], + "transitions": [ + "D01Z05S03[E]" + ] + }, + { + "name": "D01Z05S14[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canSurvivePoison3", + "canWaterJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_12" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S03[S]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canSurvivePoison3", + "canWaterJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S04[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S14[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S13[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S16[N]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canSurvivePoison3", + "canWaterJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S16[N]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S14[W]" + ] + }, + { + "name": "D01Z05S16[N]", + "exits": [ + { + "logic": [], + "target": "RESCUED_CHERUB_12" + }, + { + "logic": [ + { + "item_requirements": [ + "D01Z05S14[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S13[E]" + }, + { + "logic": [], + "target": "D01Z05S21[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "shroud" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S21[Reward]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "canWaterJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S17[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWaterJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO32" + } + ], + "locations": [], + "transitions": [ + "D01Z05S16[N]", + "D01Z05S13[SW]", + "D01Z05S21[E]", + "D01Z05S16[SW]", + "D01Z05S17[W]", + "D01Z05S16[SE]" + ] + }, + { + "name": "D01Z05S05[SW]", + "exits": [ + { + "logic": [], + "target": "D01Z05S18[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S05[SW]" + ] + }, + { + "name": "D01Z05S05[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S09[NW]" + }, + { + "logic": [], + "target": "D01Z05S10[SE]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S05[E]" + ] + }, + { + "name": "D01Z05S11[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S10[NE]" + }, + { + "logic": [], + "target": "D01Z05S10[SE]" + }, + { + "logic": [], + "target": "D01Z05S10[S]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S11[W]" + ] + }, + { + "name": "D01Z05S14[N]", + "exits": [ + { + "logic": [], + "target": "D01Z05S10[NE]" + }, + { + "logic": [], + "target": "D01Z05S10[SE]" + }, + { + "logic": [], + "target": "D01Z05S10[S]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S14[N]" + ] + }, + { + "name": "D01Z05S14", + "exits": [ + { + "logic": [], + "target": "D01Z05S14[W]" + }, + { + "logic": [], + "target": "D01Z05S14[N]" + }, + { + "logic": [], + "target": "D01Z05S14[SE]" + } + ], + "locations": [ + "RESCUED_CHERUB_11" + ], + "transitions": [] + }, + { + "name": "D01Z05S10[S]", + "exits": [ + { + "logic": [], + "target": "D01Z05S14" + } + ], + "locations": [], + "transitions": [ + "D01Z05S10[S]" + ] + }, + { + "name": "D01Z05S13[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S14" + } + ], + "locations": [], + "transitions": [ + "D01Z05S13[E]" + ] + }, + { + "name": "D01Z05S15[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S14" + } + ], + "locations": [], + "transitions": [ + "D01Z05S15[W]" + ] + }, + { + "name": "D01Z05S15", + "exits": [ + { + "logic": [], + "target": "D01Z05S15[W]" + }, + { + "logic": [], + "target": "D01Z05S15[SW]" + }, + { + "logic": [], + "target": "D01Z05S15[SE]" + } + ], + "locations": [ + "CO41" + ], + "transitions": [] + }, + { + "name": "D01Z05S14[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z05S15" + } + ], + "locations": [], + "transitions": [ + "D01Z05S14[SE]" + ] + }, + { + "name": "D01Z05S19[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S15" + } + ], + "locations": [], + "transitions": [ + "D01Z05S19[W]" + ] + }, + { + "name": "D01Z05S22[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S15" + } + ], + "locations": [], + "transitions": [ + "D01Z05S22[E]" + ] + }, + { + "name": "D01Z05S22", + "exits": [ + { + "logic": [], + "target": "D01Z05S22[E]" + } + ], + "locations": [ + "Lady[D01Z05S22]" + ], + "transitions": [] + }, + { + "name": "D01Z05S15[SW]", + "exits": [ + { + "logic": [], + "target": "D01Z05S22" + } + ], + "locations": [], + "transitions": [ + "D01Z05S15[SW]" + ] + }, + { + "name": "D01Z05S25[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S21[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "shroud" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S21[Reward]" + }, + { + "logic": [], + "target": "D01Z05S16[N]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S25[E]" + ] + }, + { + "name": "D01BZ05S01[Reward]", + "exits": [ + { + "logic": [], + "target": "D01Z05S21[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "shroud" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S21[Reward]" + }, + { + "logic": [], + "target": "D01Z05S16[N]" + } + ], + "locations": [], + "transitions": [ + "D01BZ05S01[Reward]" + ] + }, + { + "name": "D01BZ09S01[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S17[E]" + }, + { + "logic": [], + "target": "CO32" + }, + { + "logic": [], + "target": "D01Z05S16[N]" + } + ], + "locations": [], + "transitions": [ + "D01BZ09S01[W]" + ] + }, + { + "name": "D01Z05S17[E]", + "exits": [ + { + "logic": [], + "target": "D01BZ09S01[W]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S17[E]" + ] + }, + { + "name": "D01Z05S20[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S25[NE]" + }, + { + "logic": [], + "target": "D01Z05S25[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO44" + }, + { + "logic": [ + { + "item_requirements": [ + "obscureSkipsAllowed", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "obscureSkipsAllowed", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_22" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "tirana", + "obscureSkipsAllowed", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S09[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S10[W]" + }, + { + "logic": [], + "target": "D03Z03S17[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S20[W]" + ] + }, + { + "name": "D01Z05S21[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_22" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO44" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S09[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S10[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S17[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S21[W]" + ] + }, + { + "name": "D01Z05S23[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S25[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "tirana", + "obscureSkipsAllowed", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "tirana", + "obscureSkipsAllowed", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "tirana", + "obscureSkipsAllowed", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "pillar", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_22" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO44" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S09[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S10[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S17[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S23[E]" + ] + }, + { + "name": "D01Z05S26[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S25[NE]" + }, + { + "logic": [], + "target": "D01Z05S25[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO44" + }, + { + "logic": [ + { + "item_requirements": [ + "obscureSkipsAllowed", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "obscureSkipsAllowed", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_22" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "tirana", + "obscureSkipsAllowed", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S09[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S10[W]" + }, + { + "logic": [], + "target": "D03Z03S17[E]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S26[W]" + ] + }, + { + "name": "D03Z03S17[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S25[NE]" + }, + { + "logic": [], + "target": "D01Z05S25[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO44" + }, + { + "logic": [ + { + "item_requirements": [ + "obscureSkipsAllowed", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "obscureSkipsAllowed", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_22" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "tirana", + "obscureSkipsAllowed", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S09[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogic", + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogic", + "linen", + "canAirStall", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S10[W]" + }, + { + "logic": [], + "target": "D03Z03S17[W]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S17[E]", + "D01Z05S25[SW]" + ] + }, + { + "name": "D20Z01S09[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D20Z01S10[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S10[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "tirana", + "obscureSkipsAllowed", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO44" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_22" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S17[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB202" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S01[S]" + } + ], + "locations": [], + "transitions": [ + "D20Z01S09[E]", + "D01Z05S25[EchoesW]" + ] + }, + { + "name": "D20Z01S10[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D20Z01S09[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S09[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "tirana", + "obscureSkipsAllowed", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S25[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO44" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_22" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S17[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S11[W]" + } + ], + "locations": [], + "transitions": [ + "D20Z01S10[W]", + "D01Z05S25[EchoesE]" + ] + }, + { + "name": "D01BZ05S01", + "exits": [ + { + "logic": [], + "target": "D01BZ05S01[Reward]" + } + ], + "locations": [ + "RB03" + ], + "transitions": [] + }, + { + "name": "D01Z05S21[Reward]", + "exits": [ + { + "logic": [], + "target": "D01BZ05S01" + } + ], + "locations": [], + "transitions": [ + "D01Z05S21[Reward]" + ] + }, + { + "name": "D01Z05S24", + "exits": [ + { + "logic": [], + "target": "D01Z05S24[W]" + }, + { + "logic": [], + "target": "D01Z05S24[E]" + } + ], + "locations": [ + "Sword[D01Z05S24]" + ], + "transitions": [] + }, + { + "name": "D01Z05S23[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S24" + } + ], + "locations": [], + "transitions": [ + "D01Z05S23[W]" + ] + }, + { + "name": "D20Z01S04[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S24" + } + ], + "locations": [], + "transitions": [ + "D20Z01S04[E]" + ] + }, + { + "name": "D01Z05S24[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedDCGateW" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S04[E]" + }, + { + "logic": [], + "target": "D20Z01S01[S]" + } + ], + "locations": [], + "transitions": [ + "D01Z05S24[W]" + ] + }, + { + "name": "D20Z01S01[S]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedDCGateW" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S04[E]" + }, + { + "logic": [], + "target": "D20Z01S01[W]" + }, + { + "logic": [], + "target": "D20Z01S01[E]" + }, + { + "logic": [], + "target": "RB202" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S09[E]" + } + ], + "locations": [], + "transitions": [ + "D20Z01S01[S]", + "D20Z01S04[N]", + "D20Z01S05[E]", + "D20Z01S04[W]", + "D20Z01S06[NE]", + "D20Z01S05[W]", + "D20Z01S07[NW]", + "D20Z01S06[SE]", + "D20Z01S07[SE]", + "D20Z01S09[W]", + "D20Z01S08[W]", + "D20Z01S07[NE]" + ] + }, + { + "name": "D01Z05S23", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "chalice", + "chaliceRooms3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D01Z05S23[W]" + }, + { + "logic": [], + "target": "D01Z05S23[E]" + } + ], + "locations": [ + "QI75" + ], + "transitions": [] + }, + { + "name": "D01Z05S24[E]", + "exits": [ + { + "logic": [], + "target": "D01Z05S23" + } + ], + "locations": [], + "transitions": [ + "D01Z05S24[E]" + ] + }, + { + "name": "D01Z05S25[W]", + "exits": [ + { + "logic": [], + "target": "D01Z05S23" + } + ], + "locations": [], + "transitions": [ + "D01Z05S25[W]" + ] + }, + { + "name": "D03Z03S16[E]", + "exits": [ + { + "logic": [], + "target": "D03Z03S17[W]" + }, + { + "logic": [], + "target": "D03Z03S17[E]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S16[E]" + ] + }, + { + "name": "D01Z05S26", + "exits": [ + { + "logic": [], + "target": "D01Z05S26[W]" + } + ], + "locations": [ + "Lady[D01Z05S26]" + ], + "transitions": [] + }, + { + "name": "D01Z05S25[SE]", + "exits": [ + { + "logic": [], + "target": "D01Z05S26" + } + ], + "locations": [], + "transitions": [ + "D01Z05S25[SE]" + ] + }, + { + "name": "D20Z01S11[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z01S10[W]" + }, + { + "logic": [], + "target": "D20Z01S13[E]" + }, + { + "logic": [], + "target": "D20Z02S12[E]" + }, + { + "logic": [], + "target": "D20Z01S14[E]" + } + ], + "locations": [], + "transitions": [ + "D20Z01S11[W]", + "D20Z01S10[E]", + "D20Z01S12[E]", + "D20Z01S11[NW]", + "D20Z01S13[W]", + "D20Z01S11[NE]", + "D20Z02S12[W]", + "D20Z01S11[SE]", + "D20Z01S14[S]", + "D20Z01S13[N]" + ] + }, + { + "name": "D01Z06S01[Santos]", + "exits": [ + { + "logic": [], + "target": "D01BZ07S01[Santos]" + } + ], + "locations": [], + "transitions": [ + "D01Z06S01[Santos]" + ] + }, + { + "name": "D02Z01S01[SW]", + "exits": [ + { + "logic": [], + "target": "D02Z01S06[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S06[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO19" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "wallClimb", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "wallClimb", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "wallClimb", + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "dash", + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "dash", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "dash", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "dash", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_27" + } + ], + "locations": [], + "transitions": [ + "D02Z01S01[SW]" + ] + }, + { + "name": "D02Z01S02[]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO19" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S06[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S06[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "wallClimb", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "wallClimb", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "wallClimb", + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "dash", + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "dash", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "dash", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "dash", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_27" + } + ], + "locations": [], + "transitions": [ + "D02Z01S02[]" + ] + }, + { + "name": "D02Z01S08[E]", + "exits": [ + { + "logic": [], + "target": "D02Z01S06[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_27" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S06[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO19" + } + ], + "locations": [], + "transitions": [ + "D02Z01S08[E]" + ] + }, + { + "name": "D02Z01S03[SE]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_23" + }, + { + "logic": [], + "target": "D02Z01S02[W]" + }, + { + "logic": [], + "target": "D02Z01S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[]" + }, + { + "logic": [], + "target": "D02Z01S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S08[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S02[SE]" + } + ], + "locations": [], + "transitions": [ + "D02Z01S03[SE]", + "D02Z01S02[NW]", + "D02Z02S01[E]", + "D02Z01S03[W]" + ] + }, + { + "name": "D02Z01S04[E]", + "exits": [ + { + "logic": [], + "target": "D02Z01S02[W]" + }, + { + "logic": [], + "target": "D02Z01S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canCrossGap4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canCrossGap4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_23" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S03[SE]" + } + ], + "locations": [], + "transitions": [ + "D02Z01S04[E]" + ] + }, + { + "name": "D02Z01S09[W]", + "exits": [ + { + "logic": [], + "target": "D02Z01S02[NE]" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_23" + }, + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S03[SE]" + }, + { + "logic": [], + "target": "D02Z01S02[W]" + }, + { + "logic": [], + "target": "D02Z01S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S02[]" + } + ], + "locations": [], + "transitions": [ + "D02Z01S09[W]" + ] + }, + { + "name": "D02Z01S04", + "exits": [ + { + "logic": [], + "target": "D02Z01S04[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "fullThimble", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S04[-N]" + }, + { + "logic": [ + { + "item_requirements": [ + "fullThimble", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "fullThimble", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI68" + } + ], + "locations": [ + "QI20" + ], + "transitions": [] + }, + { + "name": "D02Z01S02[W]", + "exits": [ + { + "logic": [], + "target": "D02Z01S04" + } + ], + "locations": [], + "transitions": [ + "D02Z01S02[W]" + ] + }, + { + "name": "D02Z01S05[E]", + "exits": [ + { + "logic": [], + "target": "D02Z01S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S03[SE]" + } + ], + "locations": [], + "transitions": [ + "D02Z01S05[E]" + ] + }, + { + "name": "D02Z02S14[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D02Z01S03[SE]" + }, + { + "logic": [], + "target": "D02Z01S03[SW]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S14[-Cherubs]" + ] + }, + { + "name": "D02Z01S09", + "exits": [ + { + "logic": [], + "target": "D02Z01S09[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S09[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canCrossGap2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canEnemyBounce", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S09[-CherubsR]" + } + ], + "locations": [ + "HE05" + ], + "transitions": [] + }, + { + "name": "D02Z01S02[NE]", + "exits": [ + { + "logic": [], + "target": "D02Z01S09" + } + ], + "locations": [], + "transitions": [ + "D02Z01S02[NE]" + ] + }, + { + "name": "D02Z01S05", + "exits": [ + { + "logic": [], + "target": "D02Z01S05[E]" + } + ], + "locations": [ + "QI07" + ], + "transitions": [] + }, + { + "name": "D02Z01S03[SW]", + "exits": [ + { + "logic": [], + "target": "D02Z01S05" + } + ], + "locations": [], + "transitions": [ + "D02Z01S03[SW]" + ] + }, + { + "name": "D02Z02S02[SE]", + "exits": [ + { + "logic": [], + "target": "D02Z01S03[SE]" + }, + { + "logic": [], + "target": "D02Z02S08[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S02[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_24" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S03[SW]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S02[SE]", + "D02Z02S01[NW]" + ] + }, + { + "name": "D02Z02S03[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D02Z01S03[SE]" + }, + { + "logic": [], + "target": "D02Z02S08[E]" + }, + { + "logic": [], + "target": "D02Z02S02[SE]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S03[-Cherubs]" + ] + }, + { + "name": "D02Z02S08[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z01S03[SE]" + }, + { + "logic": [], + "target": "D02Z02S08[W]" + }, + { + "logic": [], + "target": "D02Z02S08[C]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canBreakHoles" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO42" + }, + { + "logic": [ + { + "item_requirements": [ + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_31" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S02[SE]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S08[E]", + "D02Z02S01[W]" + ] + }, + { + "name": "D02Z01S08", + "exits": [ + { + "logic": [], + "target": "D02Z01S08[E]" + } + ], + "locations": [ + "PR04" + ], + "transitions": [] + }, + { + "name": "D02Z01S04[-N]", + "exits": [ + { + "logic": [], + "target": "D02Z01S08" + } + ], + "locations": [], + "transitions": [ + "D02Z01S04[-N]" + ] + }, + { + "name": "D02Z01S06[W]", + "exits": [ + { + "logic": [], + "target": "D02Z01S08" + } + ], + "locations": [], + "transitions": [ + "D02Z01S06[W]" + ] + }, + { + "name": "D02Z02S02[-CherubsR]", + "exits": [ + { + "logic": [], + "target": "CO42" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_31" + }, + { + "logic": [], + "target": "D02Z02S08[W]" + }, + { + "logic": [], + "target": "D02Z02S08[E]" + }, + { + "logic": [], + "target": "D02Z02S08[C]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S02[-CherubsR]" + ] + }, + { + "name": "D02Z02S04[-CherubsL]", + "exits": [ + { + "logic": [], + "target": "D02Z02S08[W]" + }, + { + "logic": [], + "target": "D02Z02S08[E]" + }, + { + "logic": [], + "target": "D02Z02S08[C]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canBreakHoles" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO42" + }, + { + "logic": [ + { + "item_requirements": [ + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_31" + } + ], + "locations": [], + "transitions": [ + "D02Z02S04[-CherubsL]" + ] + }, + { + "name": "D02Z02S11[SE]", + "exits": [ + { + "logic": [], + "target": "D02Z02S08[W]" + }, + { + "logic": [], + "target": "D02Z02S08[E]" + }, + { + "logic": [], + "target": "D02Z02S08[C]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canBreakHoles" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO42" + }, + { + "logic": [ + { + "item_requirements": [ + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_31" + } + ], + "locations": [], + "transitions": [ + "D02Z02S11[SE]" + ] + }, + { + "name": "D02BZ02S01[C]", + "exits": [ + { + "logic": [], + "target": "D02Z02S08[W]" + }, + { + "logic": [], + "target": "D02Z02S08[E]" + }, + { + "logic": [], + "target": "D02Z02S08[C]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canBreakHoles" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO42" + }, + { + "logic": [ + { + "item_requirements": [ + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_31" + } + ], + "locations": [], + "transitions": [ + "D02BZ02S01[C]" + ] + }, + { + "name": "D02Z02S03[SW]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_24" + }, + { + "logic": [], + "target": "D02Z02S02[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S02[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "canCrossGap11" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "blood", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "blood", + "canCrossGap7" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canWalkOnRoot", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canWalkOnRoot", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S03[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S03[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI46" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO29" + }, + { + "logic": [ + { + "item_requirements": [ + "canClimbOnRoot", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI08" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO01" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash", + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash", + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash", + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_25" + }, + { + "logic": [ + { + "item_requirements": [ + "D02Z02S05[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S09[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S03[SW]", + "D02Z02S02[NE]", + "D02Z02S04[SE]", + "D02Z02S02[NW]" + ] + }, + { + "name": "D02Z02S05[-CherubsL]", + "exits": [ + { + "logic": [], + "target": "RESCUED_CHERUB_24" + }, + { + "logic": [], + "target": "D02Z02S02[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S02[-CherubsR]" + }, + { + "logic": [], + "target": "D02Z02S03[SW]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S05[-CherubsL]" + ] + }, + { + "name": "D02Z02S05[-CherubsR]", + "exits": [ + { + "logic": [], + "target": "RESCUED_CHERUB_24" + }, + { + "logic": [], + "target": "D02Z02S02[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S02[-CherubsR]" + }, + { + "logic": [], + "target": "D02Z02S03[SW]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S05[-CherubsR]" + ] + }, + { + "name": "D02Z02S05[SW]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "dash", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO01" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_25" + }, + { + "logic": [ + { + "item_requirements": [ + "D02Z02S05[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S09[E]" + } + ], + "locations": [ + "RB32" + ], + "transitions": [ + "D02Z02S05[SW]" + ] + }, + { + "name": "D02Z02S05[W]", + "exits": [ + { + "logic": [], + "target": "D02Z02S04[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[-CherubsL]" + }, + { + "logic": [], + "target": "CO01" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_25" + }, + { + "logic": [ + { + "item_requirements": [ + "D02Z02S05[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[E]" + }, + { + "logic": [], + "target": "D02Z02S03[SW]" + }, + { + "logic": [], + "target": "D02Z02S09[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S05[W]" + ] + }, + { + "name": "D02Z02S09[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO01" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_25" + }, + { + "logic": [ + { + "item_requirements": [ + "D02Z02S05[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S04[E]" + }, + { + "logic": [], + "target": "D02Z02S03[SW]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S09[E]", + "D02Z02S04[W]" + ] + }, + { + "name": "D02Z02S05[SE]", + "exits": [ + { + "logic": [], + "target": "QI46" + }, + { + "logic": [], + "target": "CO29" + }, + { + "logic": [], + "target": "D02Z02S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "canCrossGap11" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "blood", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "blood", + "canCrossGap7" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canWalkOnRoot", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canWalkOnRoot", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S03[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S03[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "canClimbOnRoot", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI08" + }, + { + "logic": [], + "target": "D02Z02S05[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "EnemySkipsAndDoubleJump", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB15" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S05[SE]", + "D02Z02S03[NW]" + ] + }, + { + "name": "D02Z02S14[W]", + "exits": [ + { + "logic": [], + "target": "D02Z02S03[NE]" + }, + { + "logic": [], + "target": "QI46" + }, + { + "logic": [], + "target": "CO29" + }, + { + "logic": [ + { + "item_requirements": [ + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI08" + }, + { + "logic": [], + "target": "D02Z02S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S03[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[SE]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S14[W]" + ] + }, + { + "name": "D02Z02S04[E]", + "exits": [ + { + "logic": [], + "target": "D02Z02S05[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "EnemySkipsAndDoubleJump", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[W]" + }, + { + "logic": [], + "target": "D02Z02S05[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB15" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S04[E]" + ] + }, + { + "name": "D02Z02S04[NE]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "EnemySkipsAndDoubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[W]" + }, + { + "logic": [], + "target": "D02Z02S05[SW]" + }, + { + "logic": [], + "target": "D02Z02S05[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB15" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S04[NE]" + ] + }, + { + "name": "D02Z02S07[E]", + "exits": [ + { + "logic": [], + "target": "D02Z02S05[E]" + }, + { + "logic": [], + "target": "RB15" + }, + { + "logic": [], + "target": "D02Z02S05[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "EnemySkipsAndDoubleJump", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[W]" + }, + { + "logic": [], + "target": "D02Z02S05[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsR]" + }, + { + "logic": [], + "target": "D02Z03S08[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D02Z03S07[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S08[W]" + }, + { + "logic": [], + "target": "D02Z02S11" + }, + { + "logic": [], + "target": "D01Z02S03[NW]" + }, + { + "logic": [], + "target": "D02Z02S11[E]" + }, + { + "logic": [], + "target": "D02Z02S11[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S02[W]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S07[E]", + "D02Z02S05[NW]", + "D02Z03S01[E]", + "D02Z02S07[W]", + "D02Z03S08[E]", + "D02Z03S01[W]", + "D02Z03S08[SE]", + "D02Z03S14[W]", + "D02Z03S14[E]", + "D02Z02S11[NW]", + "D02Z03S16[W]", + "D02Z03S08[NE]", + "D02Z03S02[S]", + "D02Z03S16[N]" + ] + }, + { + "name": "D02Z02S10[W]", + "exits": [ + { + "logic": [], + "target": "D02Z02S05[E]" + }, + { + "logic": [], + "target": "D02Z02S05[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "EnemySkipsAndDoubleJump", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[W]" + }, + { + "logic": [], + "target": "D02Z02S05[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S05[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB15" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S10[W]" + ] + }, + { + "name": "D02Z02S14", + "exits": [ + { + "logic": [], + "target": "D02Z02S14[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S14[-Cherubs]" + } + ], + "locations": [ + "RB106", + "Amanecida[D02Z02S14]" + ], + "transitions": [] + }, + { + "name": "D02Z02S03[NE]", + "exits": [ + { + "logic": [], + "target": "D02Z02S14" + } + ], + "locations": [], + "transitions": [ + "D02Z02S03[NE]" + ] + }, + { + "name": "D02Z02S10", + "exits": [ + { + "logic": [], + "target": "D02Z02S10[W]" + } + ], + "locations": [ + "Oil[D02Z02S10]" + ], + "transitions": [] + }, + { + "name": "D02Z02S05[E]", + "exits": [ + { + "logic": [], + "target": "D02Z02S10" + } + ], + "locations": [], + "transitions": [ + "D02Z02S05[E]" + ] + }, + { + "name": "D02Z03S10[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S10[-Cherubs]" + ] + }, + { + "name": "D02Z02S11", + "exits": [ + { + "logic": [], + "target": "D02Z02S11[W]" + }, + { + "logic": [], + "target": "D02Z02S11[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap6" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S11[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z02S11[-Cherubs]" + } + ], + "locations": [ + "QI53", + "RESCUED_CHERUB_26" + ], + "transitions": [] + }, + { + "name": "D02Z02S06[E]", + "exits": [ + { + "logic": [], + "target": "D02Z02S11" + }, + { + "logic": [], + "target": "D01Z02S03[NW]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S06[E]" + ] + }, + { + "name": "D02Z02S08[W]", + "exits": [ + { + "logic": [], + "target": "D02Z02S11" + }, + { + "logic": [], + "target": "D01Z02S03[NW]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S08[W]" + ] + }, + { + "name": "D02Z02S12[W]", + "exits": [ + { + "logic": [], + "target": "D02Z02S11" + }, + { + "logic": [], + "target": "D01Z02S03[NW]" + }, + { + "logic": [], + "target": "D02Z02S11[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S12[W]" + ] + }, + { + "name": "D02Z02S13[W]", + "exits": [ + { + "logic": [], + "target": "D02Z02S11" + }, + { + "logic": [], + "target": "D01Z02S03[NW]" + }, + { + "logic": [], + "target": "D02Z02S11[E]" + }, + { + "logic": [], + "target": "D02Z02S11[NE]" + }, + { + "logic": [], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z02S13[W]" + ] + }, + { + "name": "D02BZ02S01", + "exits": [ + { + "logic": [], + "target": "D02BZ02S01[C]" + } + ], + "locations": [ + "QI11", + "RB37", + "RB02" + ], + "transitions": [] + }, + { + "name": "D02Z02S08[C]", + "exits": [ + { + "logic": [], + "target": "D02BZ02S01" + } + ], + "locations": [], + "transitions": [ + "D02Z02S08[C]" + ] + }, + { + "name": "D02Z02S06", + "exits": [ + { + "logic": [], + "target": "D02Z02S06[E]" + } + ], + "locations": [ + "RB38" + ], + "transitions": [] + }, + { + "name": "D02Z02S11[W]", + "exits": [ + { + "logic": [], + "target": "D02Z02S06" + } + ], + "locations": [], + "transitions": [ + "D02Z02S11[W]" + ] + }, + { + "name": "D02Z02S12", + "exits": [ + { + "logic": [], + "target": "D02Z02S12[W]" + } + ], + "locations": [ + "Lady[D02Z02S12]" + ], + "transitions": [] + }, + { + "name": "D02Z02S11[E]", + "exits": [ + { + "logic": [], + "target": "D02Z02S12" + } + ], + "locations": [], + "transitions": [ + "D02Z02S11[E]" + ] + }, + { + "name": "D02Z02S13", + "exits": [ + { + "logic": [], + "target": "D02Z02S13[W]" + } + ], + "locations": [ + "HE11" + ], + "transitions": [] + }, + { + "name": "D02Z02S11[NE]", + "exits": [ + { + "logic": [], + "target": "D02Z02S13" + } + ], + "locations": [], + "transitions": [ + "D02Z02S11[NE]" + ] + }, + { + "name": "D02Z03S07[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S08[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D02Z03S07[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S08[W]" + }, + { + "logic": [], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S07[E]" + ] + }, + { + "name": "D02Z03S12[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S08[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D02Z03S07[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S08[W]" + }, + { + "logic": [], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S12[E]" + ] + }, + { + "name": "D02Z03S02[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO05" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S05[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S05[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB08" + }, + { + "logic": [], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S02[W]", + "D02Z03S03[E]", + "D02Z03S05[E]", + "D02Z03S03[W]" + ] + }, + { + "name": "D02Z03S05[NE]", + "exits": [ + { + "logic": [], + "target": "CO05" + }, + { + "logic": [], + "target": "D02Z03S05[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB08" + }, + { + "logic": [], + "target": "D02Z03S02[W]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S05[NE]", + "D02Z03S03[NW]" + ] + }, + { + "name": "D02Z03S21", + "exits": [ + { + "logic": [], + "target": "D02Z03S21[W]" + }, + { + "logic": [], + "target": "D02Z03S21[E]" + } + ], + "locations": [ + "QI40", + "QI57" + ], + "transitions": [] + }, + { + "name": "D02Z03S02[NW]", + "exits": [ + { + "logic": [], + "target": "D02Z03S21" + } + ], + "locations": [], + "transitions": [ + "D02Z03S02[NW]" + ] + }, + { + "name": "D02Z03S20[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S21" + } + ], + "locations": [], + "transitions": [ + "D02Z03S20[E]" + ] + }, + { + "name": "D02Z03S13", + "exits": [ + { + "logic": [], + "target": "D02Z03S13[W]" + } + ], + "locations": [ + "Sword[D02Z03S13]" + ], + "transitions": [] + }, + { + "name": "D02Z03S02[NE]", + "exits": [ + { + "logic": [], + "target": "D02Z03S13" + } + ], + "locations": [], + "transitions": [ + "D02Z03S02[NE]" + ] + }, + { + "name": "D02Z03S02[N]", + "exits": [ + { + "logic": [], + "target": "D02Z03S11[S]" + }, + { + "logic": [], + "target": "D02Z03S11[W]" + }, + { + "logic": [], + "target": "D02Z03S11[NW]" + }, + { + "logic": [], + "target": "D02Z03S10[W]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S02[N]" + ] + }, + { + "name": "D02Z03S10[W]", + "exits": [ + { + "logic": [], + "target": "D02Z03S11[S]" + }, + { + "logic": [], + "target": "D02Z03S11[W]" + }, + { + "logic": [], + "target": "D02Z03S11[NW]" + }, + { + "logic": [], + "target": "D02Z03S10[-W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S10[-Cherubs]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S10[W]", + "D02Z03S11[E]", + "D02Z03S22[W]", + "D02Z03S11[NE]" + ] + }, + { + "name": "D02Z03S15[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S11[S]" + }, + { + "logic": [], + "target": "D02Z03S11[W]" + }, + { + "logic": [], + "target": "D02Z03S11[NW]" + }, + { + "logic": [], + "target": "D02Z03S10[W]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S15[E]" + ] + }, + { + "name": "D02Z03S19[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S11[S]" + }, + { + "logic": [], + "target": "D02Z03S11[W]" + }, + { + "logic": [], + "target": "D02Z03S11[NW]" + }, + { + "logic": [], + "target": "D02Z03S10[W]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S19[E]" + ] + }, + { + "name": "D02Z03S07[N]", + "exits": [ + { + "logic": [], + "target": "D02Z03S05[S]" + }, + { + "logic": [], + "target": "D02Z03S05[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB08" + }, + { + "logic": [], + "target": "D02Z03S02[W]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S07[N]" + ] + }, + { + "name": "D02Z03S11[S]", + "exits": [ + { + "logic": [], + "target": "D02Z03S02[W]" + }, + { + "logic": [], + "target": "D02Z03S02[NW]" + }, + { + "logic": [], + "target": "D02Z03S02[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedConventLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S02[N]" + }, + { + "logic": [], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S11[S]" + ] + }, + { + "name": "D02Z03S13[W]", + "exits": [ + { + "logic": [], + "target": "D02Z03S02[W]" + }, + { + "logic": [], + "target": "D02Z03S02[NW]" + }, + { + "logic": [], + "target": "D02Z03S02[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedConventLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S02[N]" + }, + { + "logic": [], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S13[W]" + ] + }, + { + "name": "D02Z03S21[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S02[W]" + }, + { + "logic": [], + "target": "D02Z03S02[NW]" + }, + { + "logic": [], + "target": "D02Z03S02[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedConventLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S02[N]" + }, + { + "logic": [], + "target": "D02Z02S07[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S21[E]" + ] + }, + { + "name": "D02Z03S07", + "exits": [ + { + "logic": [], + "target": "D02Z03S07[W]" + }, + { + "logic": [], + "target": "D02Z03S07[NWW]" + }, + { + "logic": [], + "target": "D02Z03S07[NW]" + }, + { + "logic": [], + "target": "D02Z03S07[N]" + }, + { + "logic": [], + "target": "D02Z03S07[E]" + } + ], + "locations": [ + "CO15" + ], + "transitions": [] + }, + { + "name": "D02Z03S05[S]", + "exits": [ + { + "logic": [], + "target": "D02Z03S07" + } + ], + "locations": [], + "transitions": [ + "D02Z03S05[S]" + ] + }, + { + "name": "D02Z03S06[S]", + "exits": [ + { + "logic": [], + "target": "D02Z03S07" + } + ], + "locations": [], + "transitions": [ + "D02Z03S06[S]" + ] + }, + { + "name": "D02Z03S08[W]", + "exits": [ + { + "logic": [], + "target": "D02Z03S07" + } + ], + "locations": [], + "transitions": [ + "D02Z03S08[W]" + ] + }, + { + "name": "D02Z03S17[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S07" + } + ], + "locations": [], + "transitions": [ + "D02Z03S17[E]" + ] + }, + { + "name": "D02Z03S24[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S07" + } + ], + "locations": [], + "transitions": [ + "D02Z03S24[E]" + ] + }, + { + "name": "D02Z03S06[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S18[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S18[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "redWax1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB18" + }, + { + "logic": [], + "target": "D02Z03S06[S]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S06[W]", + "D02Z03S18[SE]" + ] + }, + { + "name": "D02Z03S09[W]", + "exits": [ + { + "logic": [], + "target": "D02Z03S18[NW]" + }, + { + "logic": [], + "target": "D02Z03S18[NE]" + }, + { + "logic": [], + "target": "D02Z03S06[W]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S09[W]" + ] + }, + { + "name": "D02Z03S23[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S18[NW]" + }, + { + "logic": [], + "target": "D02Z03S18[NE]" + }, + { + "logic": [], + "target": "D02Z03S06[W]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S23[E]" + ] + }, + { + "name": "D02Z03S17", + "exits": [ + { + "logic": [], + "target": "D02Z03S17[E]" + } + ], + "locations": [ + "RB24" + ], + "transitions": [] + }, + { + "name": "D02Z03S07[W]", + "exits": [ + { + "logic": [], + "target": "D02Z03S17" + } + ], + "locations": [], + "transitions": [ + "D02Z03S07[W]" + ] + }, + { + "name": "D02Z03S07[NWW]", + "exits": [ + { + "logic": [], + "target": "D02Z03S24[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S07[NWW]" + ] + }, + { + "name": "D02Z03S07[NW]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "redWax1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB18" + }, + { + "logic": [], + "target": "D02Z03S06[W]" + }, + { + "logic": [], + "target": "D02Z03S06[S]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S07[NW]" + ] + }, + { + "name": "D02Z03S12", + "exits": [ + { + "logic": [], + "target": "D02Z03S12[E]" + } + ], + "locations": [ + "HE03" + ], + "transitions": [] + }, + { + "name": "D02Z03S08[SW]", + "exits": [ + { + "logic": [], + "target": "D02Z03S12" + } + ], + "locations": [], + "transitions": [ + "D02Z03S08[SW]" + ] + }, + { + "name": "D02Z03S20", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatConventBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S20[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatConventBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S20[E]" + } + ], + "locations": [ + "BS03" + ], + "transitions": [] + }, + { + "name": "D02Z03S09[E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S20" + }, + { + "logic": [], + "target": "D02Z03S20[W]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S09[E]" + ] + }, + { + "name": "D02Z03S21[W]", + "exits": [ + { + "logic": [], + "target": "D02Z03S20" + }, + { + "logic": [], + "target": "D02Z03S20[E]" + } + ], + "locations": [], + "transitions": [ + "D02Z03S21[W]" + ] + }, + { + "name": "D09Z01S06", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "peaksKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S06[-E]" + }, + { + "logic": [], + "target": "D09Z01S06[E]" + } + ], + "locations": [ + "RESCUED_CHERUB_05" + ], + "transitions": [] + }, + { + "name": "D02Z03S10[-W]", + "exits": [ + { + "logic": [], + "target": "D09Z01S06" + } + ], + "locations": [], + "transitions": [ + "D02Z03S10[-W]" + ] + }, + { + "name": "D09Z01S04[W]", + "exits": [ + { + "logic": [], + "target": "D09Z01S06" + } + ], + "locations": [], + "transitions": [ + "D09Z01S04[W]" + ] + }, + { + "name": "D02Z03S15", + "exits": [ + { + "logic": [], + "target": "D02Z03S15[E]" + } + ], + "locations": [ + "Lady[D02Z03S15]" + ], + "transitions": [] + }, + { + "name": "D02Z03S11[W]", + "exits": [ + { + "logic": [], + "target": "D02Z03S15" + } + ], + "locations": [], + "transitions": [ + "D02Z03S11[W]" + ] + }, + { + "name": "D02Z03S19", + "exits": [ + { + "logic": [], + "target": "D02Z03S19[E]" + } + ], + "locations": [ + "QI61" + ], + "transitions": [] + }, + { + "name": "D02Z03S11[NW]", + "exits": [ + { + "logic": [], + "target": "D02Z03S19" + } + ], + "locations": [], + "transitions": [ + "D02Z03S11[NW]" + ] + }, + { + "name": "D09Z01S06[-E]", + "exits": [ + { + "logic": [], + "target": "D02Z03S10[W]" + }, + { + "logic": [], + "target": "D02Z03S10[-W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D02Z03S10[-Cherubs]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S06[-E]" + ] + }, + { + "name": "D02Z03S23", + "exits": [ + { + "logic": [], + "target": "D02Z03S23[E]" + } + ], + "locations": [ + "RB107" + ], + "transitions": [] + }, + { + "name": "D02Z03S18[NW]", + "exits": [ + { + "logic": [], + "target": "D02Z03S23" + } + ], + "locations": [], + "transitions": [ + "D02Z03S18[NW]" + ] + }, + { + "name": "D02Z03S09", + "exits": [ + { + "logic": [], + "target": "D02Z03S09[W]" + }, + { + "logic": [], + "target": "D02Z03S09[E]" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D02Z03S18[NE]", + "exits": [ + { + "logic": [], + "target": "D02Z03S09" + } + ], + "locations": [], + "transitions": [ + "D02Z03S18[NE]" + ] + }, + { + "name": "D02Z03S20[W]", + "exits": [ + { + "logic": [], + "target": "D02Z03S09" + } + ], + "locations": [], + "transitions": [ + "D02Z03S20[W]" + ] + }, + { + "name": "D03Z01S01[W]", + "exits": [ + { + "logic": [], + "target": "D03Z01S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S06[E]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S01[W]" + ] + }, + { + "name": "D03Z01S06[E]", + "exits": [ + { + "logic": [], + "target": "D03Z01S06" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap7" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S02[E]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S06[E]", + "D03Z01S02[W]" + ] + }, + { + "name": "D03Z01S01[S]", + "exits": [ + { + "logic": [], + "target": "D20Z01S03[W]" + }, + { + "logic": [], + "target": "D20Z01S03[N]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S01[S]" + ] + }, + { + "name": "D20Z01S02[E]", + "exits": [ + { + "logic": [], + "target": "D20Z01S03[W]" + }, + { + "logic": [], + "target": "D20Z01S03[N]" + } + ], + "locations": [], + "transitions": [ + "D20Z01S02[E]" + ] + }, + { + "name": "D03Z01S01[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D20Z01S01[W]" + }, + { + "logic": [], + "target": "D20Z01S01[E]" + }, + { + "logic": [], + "target": "D20Z01S01[S]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S01[-Cherubs]" + ] + }, + { + "name": "D03Z02S15[E]", + "exits": [ + { + "logic": [], + "target": "D20Z01S01[W]" + }, + { + "logic": [], + "target": "D20Z01S01[E]" + }, + { + "logic": [], + "target": "D20Z01S01[S]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S15[E]" + ] + }, + { + "name": "D20Z01S02[W]", + "exits": [ + { + "logic": [], + "target": "D20Z01S01[W]" + }, + { + "logic": [], + "target": "D20Z01S01[E]" + }, + { + "logic": [], + "target": "D20Z01S01[S]" + } + ], + "locations": [], + "transitions": [ + "D20Z01S02[W]" + ] + }, + { + "name": "D03Z01S06", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatPerpetua" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S06[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatPerpetua" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[E]" + } + ], + "locations": [ + "RB13", + "QI14" + ], + "transitions": [] + }, + { + "name": "D03Z01S03[E]", + "exits": [ + { + "logic": [], + "target": "D03Z01S06" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[SW]" + }, + { + "logic": [], + "target": "D03Z01S03[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-WestL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-WestR]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-EastL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-EastR]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI47" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB22" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_16" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatJondoBoss", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "Amanecida[D03Z01S03]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S03[E]", + "D03Z01S06[W]" + ] + }, + { + "name": "D03Z01S04", + "exits": [ + { + "logic": [], + "target": "D03Z01S04[NW]" + }, + { + "logic": [], + "target": "D03Z01S04[E]" + } + ], + "locations": [ + "QI63" + ], + "transitions": [] + }, + { + "name": "D03Z01S03[W]", + "exits": [ + { + "logic": [], + "target": "D03Z01S04" + } + ], + "locations": [], + "transitions": [ + "D03Z01S03[W]" + ] + }, + { + "name": "D03Z01S05[E]", + "exits": [ + { + "logic": [], + "target": "D03Z01S04" + } + ], + "locations": [], + "transitions": [ + "D03Z01S05[E]" + ] + }, + { + "name": "D03Z02S10", + "exits": [ + { + "logic": [], + "target": "D03Z02S10[W]" + }, + { + "logic": [], + "target": "D03Z02S10[N]" + }, + { + "logic": [], + "target": "D03Z02S10[S]" + }, + { + "logic": [], + "target": "D03Z02S10[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S10[-Cherubs]" + } + ], + "locations": [ + "RESCUED_CHERUB_17" + ], + "transitions": [] + }, + { + "name": "D03Z01S03[SW]", + "exits": [ + { + "logic": [], + "target": "D03Z02S10" + } + ], + "locations": [], + "transitions": [ + "D03Z01S03[SW]" + ] + }, + { + "name": "D03Z01S03[-WestL]", + "exits": [ + { + "logic": [], + "target": "D03Z02S10" + } + ], + "locations": [], + "transitions": [ + "D03Z01S03[-WestL]" + ] + }, + { + "name": "D03Z02S02[W]", + "exits": [ + { + "logic": [], + "target": "D03Z02S10" + } + ], + "locations": [], + "transitions": [ + "D03Z02S02[W]" + ] + }, + { + "name": "D03Z02S09[N]", + "exits": [ + { + "logic": [], + "target": "D03Z02S10" + } + ], + "locations": [], + "transitions": [ + "D03Z02S09[N]" + ] + }, + { + "name": "D03Z02S13[E]", + "exits": [ + { + "logic": [], + "target": "D03Z02S10" + } + ], + "locations": [], + "transitions": [ + "D03Z02S13[E]" + ] + }, + { + "name": "D03Z02S01", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "PR10" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[SE]" + } + ], + "locations": [ + "CO08" + ], + "transitions": [] + }, + { + "name": "D03Z01S03[SE]", + "exits": [ + { + "logic": [], + "target": "D03Z02S01" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-WestL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-WestR]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-EastL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-EastR]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI47" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB22" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_16" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatJondoBoss", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "Amanecida[D03Z01S03]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S03[SE]", + "D03Z02S01[N]" + ] + }, + { + "name": "D03Z01S03[-EastR]", + "exits": [ + { + "logic": [], + "target": "D03Z02S01" + }, + { + "logic": [], + "target": "PR10" + } + ], + "locations": [], + "transitions": [ + "D03Z01S03[-EastR]" + ] + }, + { + "name": "D03Z02S02[E]", + "exits": [ + { + "logic": [], + "target": "D03Z02S01" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S02[W]" + }, + { + "logic": [], + "target": "D03Z02S03[N]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S02[E]", + "D03Z02S01[W]" + ] + }, + { + "name": "D03Z01S03[-WestR]", + "exits": [ + { + "logic": [], + "target": "D03Z02S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S02[E]" + }, + { + "logic": [], + "target": "D03Z02S03[N]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S03[-WestR]" + ] + }, + { + "name": "D03Z01S03[-EastL]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S02[E]" + }, + { + "logic": [], + "target": "D03Z02S03[N]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S03[-EastL]" + ] + }, + { + "name": "D03Z02S03[N]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "doubleJump", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeJondoBellW", + "brokeJondoBellE" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeJondoBellW", + "brokeJondoBellE" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeJondoBellW", + "brokeJondoBellE" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S01[NL]" + }, + { + "logic": [ + { + "item_requirements": [ + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "boots" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S05[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S04[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO33" + } + ], + "locations": [], + "transitions": [ + "D03Z02S03[N]", + "D03Z02S02[S]", + "D03Z02S04[NW]", + "D03Z02S03[SE2]" + ] + }, + { + "name": "D03Z02S10[E]", + "exits": [ + { + "logic": [], + "target": "D03Z02S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S02[E]" + }, + { + "logic": [], + "target": "D03Z02S03[N]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S10[E]" + ] + }, + { + "name": "D03Z01S04[NW]", + "exits": [ + { + "logic": [], + "target": "D03Z01S05[E]" + }, + { + "logic": [], + "target": "D17Z01S07[SE]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S04[NW]" + ] + }, + { + "name": "D17Z01S07[SE]", + "exits": [ + { + "logic": [], + "target": "D03Z01S05[E]" + }, + { + "logic": [], + "target": "D17Z01S07[SW]" + }, + { + "logic": [], + "target": "D17Z01S07[N]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S07[SE]", + "D03Z01S05[W]", + "D17Z01S06[E]", + "D17Z01S07[W]", + "D17Z01S09[E]", + "D17Z01S07[NW]" + ] + }, + { + "name": "D03Z01S04[E]", + "exits": [ + { + "logic": [], + "target": "D03Z01S03[W]" + }, + { + "logic": [], + "target": "D03Z01S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-WestL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-WestR]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-EastL]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI47" + }, + { + "logic": [], + "target": "RB22" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_16" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatJondoBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "Amanecida[D03Z01S03]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[E]" + }, + { + "logic": [], + "target": "D03Z01S03[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-EastR]" + } + ], + "locations": [], + "transitions": [ + "D03Z01S04[E]" + ] + }, + { + "name": "D03Z02S10[N]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[W]" + }, + { + "logic": [], + "target": "D03Z01S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-WestL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-WestR]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-EastL]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI47" + }, + { + "logic": [], + "target": "RB22" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_16" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatJondoBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "Amanecida[D03Z01S03]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[E]" + }, + { + "logic": [], + "target": "D03Z01S03[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z01S03[-EastR]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S10[N]" + ] + }, + { + "name": "D17Z01S04[S]", + "exits": [ + { + "logic": [], + "target": "D17Z01S07[SW]" + }, + { + "logic": [], + "target": "D17Z01S07[SE]" + }, + { + "logic": [], + "target": "D17Z01S07[N]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S04[S]" + ] + }, + { + "name": "D17Z01S08[E]", + "exits": [ + { + "logic": [], + "target": "D17Z01S07[SW]" + }, + { + "logic": [], + "target": "D17Z01S07[SE]" + }, + { + "logic": [], + "target": "D17Z01S07[N]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S08[E]" + ] + }, + { + "name": "D03Z02S05[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[W]" + }, + { + "logic": [], + "target": "D03Z02S03[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeJondoBellW", + "brokeJondoBellE" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeJondoBellW", + "brokeJondoBellE" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeJondoBellW", + "brokeJondoBellE" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S01[NL]" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_18" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S04[NE]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S05[W]", + "D03Z02S03[E]" + ] + }, + { + "name": "D03Z02S06[W]", + "exits": [ + { + "logic": [], + "target": "D03Z02S03[SW]" + }, + { + "logic": [], + "target": "D03Z02S03[SE]" + }, + { + "logic": [], + "target": "D03Z03S01[NL]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S06[W]" + ] + }, + { + "name": "D03Z02S07[E]", + "exits": [ + { + "logic": [], + "target": "D03Z02S03[SW]" + }, + { + "logic": [], + "target": "D03Z02S03[SE]" + }, + { + "logic": [], + "target": "D03Z03S01[NL]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S07[E]" + ] + }, + { + "name": "D03Z02S07[N]", + "exits": [ + { + "logic": [], + "target": "D03Z02S03[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeJondoBellW", + "brokeJondoBellE", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeJondoBellW", + "brokeJondoBellE", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeJondoBellW", + "brokeJondoBellE", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S01[NL]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S07[N]" + ] + }, + { + "name": "D03Z03S01[NL]", + "exits": [ + { + "logic": [], + "target": "D03Z02S03[SW]" + }, + { + "logic": [], + "target": "D03Z02S03[SE]" + }, + { + "logic": [], + "target": "D03Z03S12[W]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S01[NL]", + "D03Z02S03[SSL]", + "D03Z02S03[SSC]", + "D03Z02S03[SSR]", + "D03Z03S01[NR]" + ] + }, + { + "name": "D03Z02S07", + "exits": [ + { + "logic": [], + "target": "D03Z02S07[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D03Z02S03[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S07[E]" + }, + { + "logic": [], + "target": "D03Z02S07[N]" + } + ], + "locations": [ + "CO07" + ], + "transitions": [] + }, + { + "name": "D03Z02S03[W]", + "exits": [ + { + "logic": [], + "target": "D03Z02S07" + } + ], + "locations": [], + "transitions": [ + "D03Z02S03[W]" + ] + }, + { + "name": "D03Z02S03[SW]", + "exits": [ + { + "logic": [], + "target": "D03Z02S07" + } + ], + "locations": [], + "transitions": [ + "D03Z02S03[SW]" + ] + }, + { + "name": "D03Z02S08[E]", + "exits": [ + { + "logic": [], + "target": "D03Z02S07" + } + ], + "locations": [], + "transitions": [ + "D03Z02S08[E]" + ] + }, + { + "name": "D03Z02S04[NE]", + "exits": [ + { + "logic": [], + "target": "RESCUED_CHERUB_18" + }, + { + "logic": [], + "target": "D03Z02S04[S]" + }, + { + "logic": [], + "target": "CO33" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "HE06" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canCrossGap2", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_37" + }, + { + "logic": [], + "target": "D03Z02S05[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canCrossGap2", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S11[E]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S04[NE]", + "D03Z02S05[S]", + "D03Z02S11[W]", + "D03Z02S05[E]" + ] + }, + { + "name": "D03Z02S06[N]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S04[NE]" + }, + { + "logic": [], + "target": "D03Z02S04[S]" + }, + { + "logic": [], + "target": "CO33" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S03[N]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S06[N]" + ] + }, + { + "name": "D03Z02S06", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D03Z02S03[SE]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S06[W]" + }, + { + "logic": [], + "target": "D03Z02S06[N]" + } + ], + "locations": [ + "QI19" + ], + "transitions": [] + }, + { + "name": "D03Z02S03[SE]", + "exits": [ + { + "logic": [], + "target": "D03Z02S06" + } + ], + "locations": [], + "transitions": [ + "D03Z02S03[SE]" + ] + }, + { + "name": "D03Z02S04[S]", + "exits": [ + { + "logic": [], + "target": "D03Z02S06" + } + ], + "locations": [], + "transitions": [ + "D03Z02S04[S]" + ] + }, + { + "name": "D03Z03S12[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S01[NL]" + }, + { + "logic": [], + "target": "D03Z03S02" + } + ], + "locations": [], + "transitions": [ + "D03Z03S12[W]", + "D03Z03S01[S]", + "D03Z03S18[E]", + "D03Z03S01[W]", + "D03Z03S02[W]", + "D03Z03S12[E]" + ] + }, + { + "name": "D03Z02S15[W]", + "exits": [ + { + "logic": [], + "target": "D03Z02S11[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canCrossGap2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "preciseSkipsAllowed", + "canCrossGap1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "HE06" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "canCrossGap1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_37" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canCrossGap2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "preciseSkipsAllowed", + "canCrossGap1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S04[NE]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S15[W]" + ] + }, + { + "name": "D03Z02S07[W]", + "exits": [ + { + "logic": [], + "target": "D03Z02S08[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI41" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S09[S]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S07[W]" + ] + }, + { + "name": "D03Z02S09[S]", + "exits": [ + { + "logic": [], + "target": "QI41" + }, + { + "logic": [], + "target": "D03Z02S09[N]" + }, + { + "logic": [], + "target": "D03Z02S08[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S09[W]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S09[S]", + "D03Z02S08[N]", + "D03Z02S14[E]", + "D03Z02S08[W]" + ] + }, + { + "name": "D03Z02S10[S]", + "exits": [ + { + "logic": [], + "target": "D03Z02S09[N]" + }, + { + "logic": [], + "target": "D03Z02S09[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S09[W]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S10[S]" + ] + }, + { + "name": "D03Z02S10[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D03Z02S09[N]" + }, + { + "logic": [], + "target": "D03Z02S09[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S09[W]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S10[-Cherubs]" + ] + }, + { + "name": "D03Z02S12[E]", + "exits": [ + { + "logic": [], + "target": "D03Z02S09[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S09[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S09[S]" + } + ], + "locations": [], + "transitions": [ + "D03Z02S12[E]" + ] + }, + { + "name": "D03Z02S12", + "exits": [ + { + "logic": [], + "target": "D03Z02S12[E]" + } + ], + "locations": [ + "QI52" + ], + "transitions": [] + }, + { + "name": "D03Z02S09[W]", + "exits": [ + { + "logic": [], + "target": "D03Z02S12" + } + ], + "locations": [], + "transitions": [ + "D03Z02S09[W]" + ] + }, + { + "name": "D03Z02S13[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D03Z02S12" + } + ], + "locations": [], + "transitions": [ + "D03Z02S13[-Cherubs]" + ] + }, + { + "name": "D03Z02S13", + "exits": [ + { + "logic": [], + "target": "D03Z02S13[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z02S13[-Cherubs]" + } + ], + "locations": [ + "RB28" + ], + "transitions": [] + }, + { + "name": "D03Z02S10[W]", + "exits": [ + { + "logic": [], + "target": "D03Z02S13" + } + ], + "locations": [], + "transitions": [ + "D03Z02S10[W]" + ] + }, + { + "name": "D03Z02S15", + "exits": [ + { + "logic": [], + "target": "D03Z02S15[W]" + }, + { + "logic": [], + "target": "D03Z02S15[E]" + } + ], + "locations": [ + "QI103" + ], + "transitions": [] + }, + { + "name": "D03Z02S11[E]", + "exits": [ + { + "logic": [], + "target": "D03Z02S15" + } + ], + "locations": [], + "transitions": [ + "D03Z02S11[E]" + ] + }, + { + "name": "D20Z01S01[W]", + "exits": [ + { + "logic": [], + "target": "D03Z02S15" + } + ], + "locations": [], + "transitions": [ + "D20Z01S01[W]" + ] + }, + { + "name": "D03Z03S02[NE]", + "exits": [ + { + "logic": [], + "target": "D03Z03S02" + }, + { + "logic": [], + "target": "D03Z03S12[W]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S02[NE]", + "D03Z03S14[W]" + ] + }, + { + "name": "D03Z03S02[E]", + "exits": [ + { + "logic": [], + "target": "D03Z03S03[W]" + }, + { + "logic": [], + "target": "D03Z03S04[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D03Z03S04[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S03[SE]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S02[E]" + ] + }, + { + "name": "D03Z03S04[NW]", + "exits": [ + { + "logic": [], + "target": "D03Z03S03[W]" + }, + { + "logic": [], + "target": "D03Z03S04[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S05[NW]" + }, + { + "logic": [], + "target": "D03Z03S05[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D03Z03S04[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S03[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[-Cherubs]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S04[NW]", + "D03Z03S03[NE]" + ] + }, + { + "name": "D03Z03S04[SW]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D03Z03S04[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S03[SE]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S04[SW]" + ] + }, + { + "name": "D03Z03S02", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S02[NE]" + }, + { + "logic": [], + "target": "D03Z03S02[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S12[W]" + } + ], + "locations": [ + "QI44" + ], + "transitions": [] + }, + { + "name": "D03Z03S03[W]", + "exits": [ + { + "logic": [], + "target": "D03Z03S02" + } + ], + "locations": [], + "transitions": [ + "D03Z03S03[W]" + ] + }, + { + "name": "D03Z03S03[SE]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[NW]" + }, + { + "logic": [], + "target": "D03Z03S04[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S05[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S05[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[-Cherubs]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S03[SE]" + ] + }, + { + "name": "D03Z03S05[NW]", + "exits": [ + { + "logic": [], + "target": "D03Z03S04[NW]" + }, + { + "logic": [], + "target": "D03Z03S04[SW]" + }, + { + "logic": [], + "target": "D03Z03S05[NE]" + }, + { + "logic": [], + "target": "D03Z03S05[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[-Cherubs]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S05[NW]", + "D03Z03S04[NE]" + ] + }, + { + "name": "D03Z03S05[SW]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[NW]" + }, + { + "logic": [], + "target": "D03Z03S04[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S05[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S07[NE]" + }, + { + "logic": [], + "target": "D03Z03S07[E]" + }, + { + "logic": [], + "target": "D03Z03S07[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S19[E]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S05[SW]", + "D03Z03S04[E]", + "D03Z03S07[SW]", + "D03Z03S05[SE]" + ] + }, + { + "name": "D03Z03S13[W]", + "exits": [ + { + "logic": [], + "target": "D03Z03S04[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S04[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S05[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S05[SW]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S13[W]" + ] + }, + { + "name": "D03Z03S06[W]", + "exits": [ + { + "logic": [], + "target": "D03Z03S05[NW]" + }, + { + "logic": [], + "target": "D03Z03S05[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S05[SW]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S06[W]" + ] + }, + { + "name": "D03Z03S13", + "exits": [ + { + "logic": [], + "target": "D03Z03S13[W]" + } + ], + "locations": [ + "Oil[D03Z03S13]" + ], + "transitions": [] + }, + { + "name": "D03Z03S04[SE]", + "exits": [ + { + "logic": [], + "target": "D03Z03S13" + } + ], + "locations": [], + "transitions": [ + "D03Z03S04[SE]" + ] + }, + { + "name": "D03Z03S10", + "exits": [ + { + "logic": [], + "target": "D03Z03S10[E]" + } + ], + "locations": [ + "QI13" + ], + "transitions": [] + }, + { + "name": "D03Z03S04[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D03Z03S10" + } + ], + "locations": [], + "transitions": [ + "D03Z03S04[-Cherubs]" + ] + }, + { + "name": "D03Z03S09[SW]", + "exits": [ + { + "logic": [], + "target": "D03Z03S10" + } + ], + "locations": [], + "transitions": [ + "D03Z03S09[SW]" + ] + }, + { + "name": "D03Z03S06", + "exits": [ + { + "logic": [], + "target": "D03Z03S06[W]" + } + ], + "locations": [ + "CO12", + "RE07", + "RESCUED_CHERUB_19" + ], + "transitions": [] + }, + { + "name": "D03Z03S05[NE]", + "exits": [ + { + "logic": [], + "target": "D03Z03S06" + } + ], + "locations": [], + "transitions": [ + "D03Z03S05[NE]" + ] + }, + { + "name": "D03Z03S08[W]", + "exits": [ + { + "logic": [], + "target": "D03Z03S07[NE]" + }, + { + "logic": [], + "target": "D03Z03S07[E]" + }, + { + "logic": [], + "target": "D03Z03S07[S]" + }, + { + "logic": [], + "target": "D03Z03S05[SW]" + }, + { + "logic": [], + "target": "D03Z03S19[E]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S08[W]" + ] + }, + { + "name": "D03Z03S09[N]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S07[NE]" + }, + { + "logic": [], + "target": "D03Z03S07[E]" + }, + { + "logic": [], + "target": "D03Z03S07[S]" + }, + { + "logic": [], + "target": "D03Z03S05[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S19[E]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S09[N]" + ] + }, + { + "name": "D03Z03S11[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S07[NE]" + }, + { + "logic": [], + "target": "D03Z03S07[E]" + }, + { + "logic": [], + "target": "D03Z03S07[S]" + }, + { + "logic": [], + "target": "D03Z03S05[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S19[E]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S11[W]" + ] + }, + { + "name": "D03Z03S19[E]", + "exits": [ + { + "logic": [], + "target": "D03Z03S07[NE]" + }, + { + "logic": [], + "target": "D03Z03S07[E]" + }, + { + "logic": [], + "target": "D03Z03S07[S]" + }, + { + "logic": [], + "target": "D03Z03S05[SW]" + } + ], + "locations": [], + "transitions": [ + "D03Z03S19[E]", + "D03Z03S07[NW]" + ] + }, + { + "name": "D03Z03S08", + "exits": [ + { + "logic": [], + "target": "D03Z03S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S08[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S08[-CherubsR]" + } + ], + "locations": [ + "QI10", + "RESCUED_CHERUB_21" + ], + "transitions": [] + }, + { + "name": "D03Z03S07[NE]", + "exits": [ + { + "logic": [], + "target": "D03Z03S08" + } + ], + "locations": [], + "transitions": [ + "D03Z03S07[NE]" + ] + }, + { + "name": "D03Z03S11", + "exits": [ + { + "logic": [], + "target": "D03Z03S11[W]" + }, + { + "logic": [], + "target": "D03Z03S11[E]" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D03Z03S07[E]", + "exits": [ + { + "logic": [], + "target": "D03Z03S11" + } + ], + "locations": [], + "transitions": [ + "D03Z03S07[E]" + ] + }, + { + "name": "D03Z03S08[-CherubsL]", + "exits": [ + { + "logic": [], + "target": "D03Z03S11" + } + ], + "locations": [], + "transitions": [ + "D03Z03S08[-CherubsL]" + ] + }, + { + "name": "D03Z03S08[-CherubsR]", + "exits": [ + { + "logic": [], + "target": "D03Z03S11" + } + ], + "locations": [], + "transitions": [ + "D03Z03S08[-CherubsR]" + ] + }, + { + "name": "D03Z03S15[W]", + "exits": [ + { + "logic": [], + "target": "D03Z03S11" + } + ], + "locations": [], + "transitions": [ + "D03Z03S15[W]" + ] + }, + { + "name": "D03Z03S09", + "exits": [ + { + "logic": [], + "target": "D03Z03S09[SW]" + }, + { + "logic": [], + "target": "D03Z03S09[N]" + } + ], + "locations": [ + "RESCUED_CHERUB_20" + ], + "transitions": [] + }, + { + "name": "D03Z03S07[S]", + "exits": [ + { + "logic": [], + "target": "D03Z03S09" + } + ], + "locations": [], + "transitions": [ + "D03Z03S07[S]" + ] + }, + { + "name": "D03Z03S10[E]", + "exits": [ + { + "logic": [], + "target": "D03Z03S09" + } + ], + "locations": [], + "transitions": [ + "D03Z03S10[E]" + ] + }, + { + "name": "D03Z03S15", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatGrievanceBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S15[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatGrievanceBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D03Z03S15[E]" + } + ], + "locations": [ + "BS04" + ], + "transitions": [] + }, + { + "name": "D03Z03S11[E]", + "exits": [ + { + "logic": [], + "target": "D03Z03S15" + } + ], + "locations": [], + "transitions": [ + "D03Z03S11[E]" + ] + }, + { + "name": "D03Z03S16[W]", + "exits": [ + { + "logic": [], + "target": "D03Z03S15" + } + ], + "locations": [], + "transitions": [ + "D03Z03S16[W]" + ] + }, + { + "name": "D03Z03S16", + "exits": [ + { + "logic": [], + "target": "D03Z03S16[W]" + }, + { + "logic": [], + "target": "D03Z03S16[E]" + } + ], + "locations": [ + "QI39" + ], + "transitions": [] + }, + { + "name": "D03Z03S15[E]", + "exits": [ + { + "logic": [], + "target": "D03Z03S16" + } + ], + "locations": [], + "transitions": [ + "D03Z03S15[E]" + ] + }, + { + "name": "D03Z03S17[W]", + "exits": [ + { + "logic": [], + "target": "D03Z03S16" + } + ], + "locations": [], + "transitions": [ + "D03Z03S17[W]" + ] + }, + { + "name": "D04Z01S01[W]", + "exits": [ + { + "logic": [], + "target": "D08Z02S01[W]" + }, + { + "logic": [], + "target": "D08Z02S01[E]" + }, + { + "logic": [], + "target": "D08Z02S02[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z01S01[W]" + ] + }, + { + "name": "D08Z01S01[E]", + "exits": [ + { + "logic": [], + "target": "D08Z02S01[W]" + }, + { + "logic": [], + "target": "D08Z02S01[E]" + }, + { + "logic": [], + "target": "D08Z02S02[W]" + } + ], + "locations": [], + "transitions": [ + "D08Z01S01[E]" + ] + }, + { + "name": "D08Z02S02[W]", + "exits": [ + { + "logic": [], + "target": "D08Z02S01[W]" + }, + { + "logic": [], + "target": "D08Z02S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "brokeBotTCStatue" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z02S03[W]" + }, + { + "logic": [], + "target": "D08Z02S03[E]" + } + ], + "locations": [], + "transitions": [ + "D08Z02S02[W]", + "D08Z02S01[SE]", + "D08Z02S03[S]", + "D08Z02S01[N]" + ] + }, + { + "name": "D04Z01S02", + "exits": [ + { + "logic": [], + "target": "D04Z01S02[W]" + }, + { + "logic": [], + "target": "D04Z01S02[NW]" + }, + { + "logic": [], + "target": "D04Z01S02[E]" + } + ], + "locations": [ + "RB14" + ], + "transitions": [] + }, + { + "name": "D04Z01S01[E]", + "exits": [ + { + "logic": [], + "target": "D04Z01S02" + } + ], + "locations": [], + "transitions": [ + "D04Z01S01[E]" + ] + }, + { + "name": "D04Z01S01[NE]", + "exits": [ + { + "logic": [], + "target": "D04Z01S02" + } + ], + "locations": [], + "transitions": [ + "D04Z01S01[NE]" + ] + }, + { + "name": "D04Z01S03[W]", + "exits": [ + { + "logic": [], + "target": "D04Z01S02" + } + ], + "locations": [], + "transitions": [ + "D04Z01S03[W]" + ] + }, + { + "name": "D04Z01S01[N]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "blood", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S05[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S05[-Cherubs]" + }, + { + "logic": [], + "target": "D04Z01S01" + }, + { + "logic": [], + "target": "D04Z01S01[NE]" + }, + { + "logic": [], + "target": "CO23" + } + ], + "locations": [], + "transitions": [ + "D04Z01S01[N]", + "D04Z01S05[S]" + ] + }, + { + "name": "D04Z01S06[S]", + "exits": [ + { + "logic": [], + "target": "D04Z01S05[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S05[-Cherubs]" + }, + { + "logic": [], + "target": "D04Z01S01[N]" + } + ], + "locations": [], + "transitions": [ + "D04Z01S06[S]" + ] + }, + { + "name": "D04Z01S06[Cherubs]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "blood", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S05[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S05[-Cherubs]" + }, + { + "logic": [], + "target": "D04Z01S01[N]" + } + ], + "locations": [], + "transitions": [ + "D04Z01S06[Cherubs]" + ] + }, + { + "name": "D04Z01S01", + "exits": [ + { + "logic": [], + "target": "D04Z01S01[W]" + }, + { + "logic": [], + "target": "D04Z01S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S01[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S01[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO23" + } + ], + "locations": [ + "RESCUED_CHERUB_35" + ], + "transitions": [] + }, + { + "name": "D04Z01S02[W]", + "exits": [ + { + "logic": [], + "target": "D04Z01S01" + } + ], + "locations": [], + "transitions": [ + "D04Z01S02[W]" + ] + }, + { + "name": "D04Z01S02[NW]", + "exits": [ + { + "logic": [], + "target": "D04Z01S01" + }, + { + "logic": [], + "target": "D04Z01S01[NE]" + }, + { + "logic": [], + "target": "D04Z01S01[N]" + }, + { + "logic": [], + "target": "CO23" + } + ], + "locations": [], + "transitions": [ + "D04Z01S02[NW]" + ] + }, + { + "name": "D04Z01S05[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D04Z01S01" + } + ], + "locations": [], + "transitions": [ + "D04Z01S05[-Cherubs]" + ] + }, + { + "name": "D08Z02S01[E]", + "exits": [ + { + "logic": [], + "target": "D04Z01S01" + } + ], + "locations": [], + "transitions": [ + "D08Z02S01[E]" + ] + }, + { + "name": "D04Z01S03", + "exits": [ + { + "logic": [], + "target": "D04Z01S03[W]" + }, + { + "logic": [], + "target": "D04Z01S03[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "D05Z01S20[N]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S03[S]" + } + ], + "locations": [ + "QI37", + "CO39", + "RESCUED_CHERUB_28" + ], + "transitions": [] + }, + { + "name": "D04Z01S02[E]", + "exits": [ + { + "logic": [], + "target": "D04Z01S03" + } + ], + "locations": [], + "transitions": [ + "D04Z01S02[E]" + ] + }, + { + "name": "D04Z01S04[W]", + "exits": [ + { + "logic": [], + "target": "D04Z01S03" + } + ], + "locations": [], + "transitions": [ + "D04Z01S04[W]" + ] + }, + { + "name": "D05Z01S20[N]", + "exits": [ + { + "logic": [], + "target": "D04Z01S03" + } + ], + "locations": [], + "transitions": [ + "D05Z01S20[N]" + ] + }, + { + "name": "D04Z01S04", + "exits": [ + { + "logic": [], + "target": "D04Z01S04[W]" + }, + { + "logic": [], + "target": "D04Z01S04[E]" + } + ], + "locations": [ + "RB21", + "Amanecida[D04Z01S04]" + ], + "transitions": [] + }, + { + "name": "D04Z01S03[E]", + "exits": [ + { + "logic": [], + "target": "D04Z01S04" + } + ], + "locations": [], + "transitions": [ + "D04Z01S03[E]" + ] + }, + { + "name": "D04Z02S01[W]", + "exits": [ + { + "logic": [], + "target": "D04Z01S04" + } + ], + "locations": [], + "transitions": [ + "D04Z02S01[W]" + ] + }, + { + "name": "D06Z01S18[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D04Z01S04" + } + ], + "locations": [], + "transitions": [ + "D06Z01S18[-Cherubs]" + ] + }, + { + "name": "D04Z01S03[S]", + "exits": [ + { + "logic": [], + "target": "D05Z01S20[N]" + }, + { + "logic": [], + "target": "D05Z01S06[E]" + } + ], + "locations": [], + "transitions": [ + "D04Z01S03[S]" + ] + }, + { + "name": "D05Z01S06[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S20[N]" + }, + { + "logic": [], + "target": "D05Z01S07[E]" + }, + { + "logic": [], + "target": "D05Z01S08[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "canSurvivePoison3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S06[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canSurvivePoison3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB31" + } + ], + "locations": [], + "transitions": [ + "D05Z01S06[E]", + "D05Z01S20[W]", + "D05Z01S07[NW]", + "D05Z01S20[E]" + ] + }, + { + "name": "D04Z01S04[E]", + "exits": [ + { + "logic": [], + "target": "D04Z02S01[W]" + }, + { + "logic": [], + "target": "D04Z02S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_30" + } + ], + "locations": [], + "transitions": [ + "D04Z01S04[E]" + ] + }, + { + "name": "D04Z02S02[S]", + "exits": [ + { + "logic": [], + "target": "D04Z02S01[N]" + }, + { + "logic": [], + "target": "RE402" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_30" + }, + { + "logic": [], + "target": "D04Z02S01[W]" + }, + { + "logic": [], + "target": "D04Z02S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "canCrossGap1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S03[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S02[S]" + ] + }, + { + "name": "D04Z02S03[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "dash", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S01[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RE402" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canCrossGap1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_30" + }, + { + "logic": [], + "target": "D04Z02S01[W]" + }, + { + "logic": [], + "target": "D04Z02S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedMoMLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S04[N]" + }, + { + "logic": [], + "target": "D04Z02S04[SW]" + }, + { + "logic": [], + "target": "D04Z02S04[W]" + }, + { + "logic": [], + "target": "D04Z02S05[W]" + }, + { + "logic": [], + "target": "D04Z02S19[E]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S03[W]", + "D04Z02S01[NE]", + "D04Z02S04[NW]", + "D04Z02S03[E]", + "D04Z02S19[W]", + "D04Z02S04[NE]" + ] + }, + { + "name": "D04Z03S01[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S01[W]" + }, + { + "logic": [], + "target": "D04Z02S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_30" + } + ], + "locations": [], + "transitions": [ + "D04Z03S01[W]" + ] + }, + { + "name": "D04Z01S06", + "exits": [ + { + "logic": [], + "target": "D04Z01S06[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "DoubleJump", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S06[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S06[Cherubs]" + } + ], + "locations": [ + "QI102" + ], + "transitions": [] + }, + { + "name": "D04Z01S05[N]", + "exits": [ + { + "logic": [], + "target": "D04Z01S06" + } + ], + "locations": [], + "transitions": [ + "D04Z01S05[N]" + ] + }, + { + "name": "D09Z01S09[SW]", + "exits": [ + { + "logic": [], + "target": "D04Z01S06" + }, + { + "logic": [ + { + "item_requirements": [ + "DoubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z01S06[E]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S09[SW]" + ] + }, + { + "name": "D04Z01S06[E]", + "exits": [ + { + "logic": [], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell16]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [ + "D04Z01S06[E]" + ] + }, + { + "name": "D09Z01S07[SW]", + "exits": [ + { + "logic": [], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [ + "D09Z01S07[SW]", + "D09Z01S09[E]", + "D09Z01S02[SW]", + "D09Z01S07[E]", + "D09Z01S08[SE]", + "D09Z01S07[W]", + "D09Z01S10[W]", + "D09Z01S07[SE]" + ] + }, + { + "name": "D09Z01S12[E]", + "exits": [ + { + "logic": [], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [ + "D09Z01S12[E]" + ] + }, + { + "name": "D09BZ01S01[Cell19]", + "exits": [ + { + "logic": [], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D09BZ01S01[Cell24]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S12[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell19]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S12[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell19]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D04Z02S02", + "exits": [ + { + "logic": [], + "target": "D04Z02S02[S]" + }, + { + "logic": [], + "target": "D04Z02S02[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogicAndDoubleJump", + "doubleJump", + "upwarpSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogicAndDoubleJump", + "doubleJump", + "canEnemyUpslash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogicAndDoubleJump", + "canEnemyUpslash", + "upwarpSkipsAllowed", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "EnemySkips", + "doubleJump", + "upwarpSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "EnemySkips", + "doubleJump", + "canEnemyUpslash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "EnemySkips", + "canEnemyUpslash", + "upwarpSkipsAllowed", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S02[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S02[S]" + } + ], + "locations": [ + "CO17" + ], + "transitions": [] + }, + { + "name": "D04Z02S01[N]", + "exits": [ + { + "logic": [], + "target": "D04Z02S02" + } + ], + "locations": [], + "transitions": [ + "D04Z02S01[N]" + ] + }, + { + "name": "D04Z02S15[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S02" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogicAndDoubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "EnemySkips" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S02[NE]" + }, + { + "logic": [], + "target": "D06Z01S02[S]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S15[W]" + ] + }, + { + "name": "D04Z02S17[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S02" + } + ], + "locations": [], + "transitions": [ + "D04Z02S17[W]" + ] + }, + { + "name": "D06Z01S02[S]", + "exits": [ + { + "logic": [], + "target": "D04Z02S02" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogicAndDoubleJump", + "canEnemyUpslash", + "upwarpSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "EnemySkips", + "canEnemyUpslash", + "upwarpSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S02[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S18[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "EnemySkipsAndDoubleJump", + "wallClimb", + "doubleJump", + "canEnemyBounce", + "preciseSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S08[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[SW]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S02[S]", + "D04Z02S02[N]", + "D06Z01S18[E]", + "D06Z01S02[W]", + "D06Z01S08[W]", + "D06Z01S02[E]" + ] + }, + { + "name": "D04Z03S01", + "exits": [ + { + "logic": [], + "target": "D04Z03S01[W]" + }, + { + "logic": [], + "target": "D04Z03S01[E]" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D04Z02S01[E]", + "exits": [ + { + "logic": [], + "target": "D04Z03S01" + } + ], + "locations": [], + "transitions": [ + "D04Z02S01[E]" + ] + }, + { + "name": "D04Z02S04[W]", + "exits": [ + { + "logic": [], + "target": "D04Z03S01" + } + ], + "locations": [], + "transitions": [ + "D04Z02S04[W]" + ] + }, + { + "name": "D04Z02S02[SE]", + "exits": [ + { + "logic": [], + "target": "D04Z02S17[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S02[SE]" + ] + }, + { + "name": "D04Z02S15", + "exits": [ + { + "logic": [], + "target": "D04Z02S15[W]" + }, + { + "logic": [], + "target": "D04Z02S15[E]" + } + ], + "locations": [ + "QI60" + ], + "transitions": [] + }, + { + "name": "D04Z02S02[NE]", + "exits": [ + { + "logic": [], + "target": "D04Z02S15" + } + ], + "locations": [], + "transitions": [ + "D04Z02S02[NE]" + ] + }, + { + "name": "D04Z02S22[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S15" + } + ], + "locations": [], + "transitions": [ + "D04Z02S22[W]" + ] + }, + { + "name": "D04Z02S05[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S04[SW]" + }, + { + "logic": [], + "target": "D04Z02S04[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "openedMoMLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S04[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S03[W]" + }, + { + "logic": [], + "target": "D04Z02S05[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "D05Z01S15[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S02[W]" + }, + { + "logic": [], + "target": "D05Z01S03[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S05[W]", + "D04Z02S04[E]", + "D05Z01S01[NW]", + "D04Z02S04[SE]", + "D05Z01S02[E]", + "D05Z01S01[W]", + "D05Z01S16[W]", + "D05Z01S01[E]", + "D05Z01S03[E]", + "D05Z01S02[NW]" + ] + }, + { + "name": "D04Z02S06[S]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedMoMLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S04[N]" + }, + { + "logic": [], + "target": "D04Z02S03[W]" + }, + { + "logic": [], + "target": "D04Z02S04[SW]" + }, + { + "logic": [], + "target": "D04Z02S04[W]" + }, + { + "logic": [], + "target": "D04Z02S05[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S06[S]" + ] + }, + { + "name": "D04Z02S06[-Cherubs]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedMoMLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S04[N]" + }, + { + "logic": [], + "target": "D04Z02S03[W]" + }, + { + "logic": [], + "target": "D04Z02S04[SW]" + }, + { + "logic": [], + "target": "D04Z02S04[W]" + }, + { + "logic": [], + "target": "D04Z02S05[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S06[-Cherubs]" + ] + }, + { + "name": "D04Z02S14[E]", + "exits": [ + { + "logic": [], + "target": "D04Z02S04[SW]" + }, + { + "logic": [], + "target": "D04Z02S04[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "openedMoMLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S04[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S03[W]" + }, + { + "logic": [], + "target": "D04Z02S05[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S14[E]" + ] + }, + { + "name": "D04Z03S01[E]", + "exits": [ + { + "logic": [], + "target": "D04Z02S04[SW]" + }, + { + "logic": [], + "target": "D04Z02S04[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "openedMoMLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S04[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S03[W]" + }, + { + "logic": [], + "target": "D04Z02S05[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z03S01[E]" + ] + }, + { + "name": "D04Z02S14", + "exits": [ + { + "logic": [], + "target": "D04Z02S14[E]" + } + ], + "locations": [ + "Oil[D04Z02S14]" + ], + "transitions": [] + }, + { + "name": "D04Z02S04[SW]", + "exits": [ + { + "logic": [], + "target": "D04Z02S14" + } + ], + "locations": [], + "transitions": [ + "D04Z02S04[SW]" + ] + }, + { + "name": "D04Z02S07[SW]", + "exits": [ + { + "logic": [], + "target": "D04Z02S05[W]" + }, + { + "logic": [], + "target": "D04Z02S05[E]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S07[SW]" + ] + }, + { + "name": "D04Z02S07[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S19[E]" + }, + { + "logic": [], + "target": "D04Z02S03[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S07[W]" + ] + }, + { + "name": "D04Z02S04[N]", + "exits": [ + { + "logic": [], + "target": "D04Z02S06[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "openedARLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO34" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S09[W]" + }, + { + "logic": [], + "target": "D04Z02S10[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S04[N]" + ] + }, + { + "name": "D04Z02S09[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S06[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedARLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[N]" + }, + { + "logic": [], + "target": "CO34" + }, + { + "logic": [], + "target": "D04Z02S06[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S09[NE]" + }, + { + "logic": [], + "target": "D04Z02S10[W]" + }, + { + "logic": [], + "target": "D04Z02S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "redentoRooms5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S20[Redento]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S09[W]", + "D04Z02S06[NE]", + "D04Z02S08[W]", + "D04Z02S09[E]", + "D04Z02S20[W]", + "D04Z02S08[E]" + ] + }, + { + "name": "D04Z02S10[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S06[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "openedARLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO34" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S09[W]" + } + ], + "locations": [ + "QI01", + "PR11" + ], + "transitions": [ + "D04Z02S10[W]", + "D04Z02S06[E]" + ] + }, + { + "name": "D04Z02S11[E]", + "exits": [ + { + "logic": [], + "target": "D04Z02S06[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedARLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[N]" + }, + { + "logic": [], + "target": "CO34" + }, + { + "logic": [], + "target": "D04Z02S06[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[-Cherubs]" + }, + { + "logic": [], + "target": "D04Z02S09[W]" + }, + { + "logic": [], + "target": "D04Z02S10[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S11[E]" + ] + }, + { + "name": "D06Z01S23[S]", + "exits": [ + { + "logic": [], + "target": "D04Z02S06[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedARLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[N]" + }, + { + "logic": [], + "target": "CO34" + }, + { + "logic": [], + "target": "D04Z02S06[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S06[-Cherubs]" + }, + { + "logic": [], + "target": "D04Z02S09[W]" + }, + { + "logic": [], + "target": "D04Z02S10[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S23[S]" + ] + }, + { + "name": "D04Z02S07", + "exits": [ + { + "logic": [], + "target": "D04Z02S07[SW]" + }, + { + "logic": [], + "target": "D04Z02S07[W]" + }, + { + "logic": [], + "target": "D04Z02S07[N]" + }, + { + "logic": [], + "target": "D04Z02S07[NE]" + }, + { + "logic": [], + "target": "D04Z02S07[SE]" + } + ], + "locations": [ + "CO35", + "RB33" + ], + "transitions": [] + }, + { + "name": "D04Z02S05[E]", + "exits": [ + { + "logic": [], + "target": "D04Z02S07" + } + ], + "locations": [], + "transitions": [ + "D04Z02S05[E]" + ] + }, + { + "name": "D04Z02S08[S]", + "exits": [ + { + "logic": [], + "target": "D04Z02S07" + } + ], + "locations": [], + "transitions": [ + "D04Z02S08[S]" + ] + }, + { + "name": "D04Z02S13[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S07" + } + ], + "locations": [], + "transitions": [ + "D04Z02S13[W]" + ] + }, + { + "name": "D04Z02S19[E]", + "exits": [ + { + "logic": [], + "target": "D04Z02S07" + } + ], + "locations": [], + "transitions": [ + "D04Z02S19[E]" + ] + }, + { + "name": "D04Z02S23[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S07" + } + ], + "locations": [], + "transitions": [ + "D04Z02S23[W]" + ] + }, + { + "name": "D04Z02S11", + "exits": [ + { + "logic": [], + "target": "D04Z02S11[W]" + }, + { + "logic": [], + "target": "D04Z02S11[E]" + } + ], + "locations": [ + "CO20", + "RESCUED_CHERUB_29" + ], + "transitions": [] + }, + { + "name": "D04Z02S06[NW]", + "exits": [ + { + "logic": [], + "target": "D04Z02S11" + } + ], + "locations": [], + "transitions": [ + "D04Z02S06[NW]" + ] + }, + { + "name": "D04Z02S21[SE]", + "exits": [ + { + "logic": [], + "target": "D04Z02S11" + } + ], + "locations": [], + "transitions": [ + "D04Z02S21[SE]" + ] + }, + { + "name": "D04Z02S06[N]", + "exits": [ + { + "logic": [], + "target": "D06Z01S23[Sword]" + }, + { + "logic": [], + "target": "D06Z01S23[S]" + }, + { + "logic": [], + "target": "D06Z01S20[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S06[N]" + ] + }, + { + "name": "D06Z01S01[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D06Z01S23[Sword]" + }, + { + "logic": [], + "target": "D06Z01S23[S]" + }, + { + "logic": [], + "target": "D06Z01S20[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S01[-Cherubs]" + ] + }, + { + "name": "D06Z01S20[W]", + "exits": [ + { + "logic": [], + "target": "D06Z01S23[Sword]" + }, + { + "logic": [], + "target": "D06Z01S23[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S24[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canSurvivePoison2", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canSurvivePoison2", + "blood", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canSurvivePoison2", + "dash", + "preciseSkipsAllowed", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce", + "preciseSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S04[Health]" + }, + { + "logic": [], + "target": "D06Z01S03" + } + ], + "locations": [], + "transitions": [ + "D06Z01S20[W]", + "D06Z01S23[E]", + "D06Z01S20[E]", + "D06Z01S04[SW]", + "D06Z01S04[W]", + "D06Z01S03[E]" + ] + }, + { + "name": "D06Z01S22[Sword]", + "exits": [ + { + "logic": [], + "target": "D06Z01S23[Sword]" + }, + { + "logic": [], + "target": "D06Z01S23[S]" + }, + { + "logic": [], + "target": "D06Z01S20[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S22[Sword]" + ] + }, + { + "name": "D04Z02S16[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S09[NE]" + }, + { + "logic": [], + "target": "D04Z02S09[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S16[W]" + ] + }, + { + "name": "D04Z02S07[N]", + "exits": [ + { + "logic": [], + "target": "D04Z02S08[S]" + }, + { + "logic": [], + "target": "D04Z02S09[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S07[N]" + ] + }, + { + "name": "D04Z02S16[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D04Z02S08[S]" + }, + { + "logic": [], + "target": "D04Z02S09[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S16[-Cherubs]" + ] + }, + { + "name": "D04Z02S07[NE]", + "exits": [ + { + "logic": [], + "target": "D04Z02S13[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S07[NE]" + ] + }, + { + "name": "D04Z02S07[SE]", + "exits": [ + { + "logic": [], + "target": "D04Z02S23[W]" + }, + { + "logic": [], + "target": "D04Z02S23[NE]" + }, + { + "logic": [], + "target": "D04Z02S24[NW]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S07[SE]" + ] + }, + { + "name": "D04Z02S24[NW]", + "exits": [ + { + "logic": [], + "target": "D04Z02S23[W]" + }, + { + "logic": [], + "target": "D04Z02S23[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S03[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S05[E]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S24[NW]", + "D04Z02S23[SE]", + "D20Z02S01[E]", + "D04Z02S24[SW]", + "D04Z02S25[W]", + "D04Z02S24[SE]", + "D20Z02S03[SE]", + "D20Z02S01[W]", + "D20Z02S04[E]", + "D20Z02S03[W]" + ] + }, + { + "name": "D04Z04S01[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S23[W]" + }, + { + "logic": [], + "target": "D04Z02S23[NE]" + }, + { + "logic": [], + "target": "D04Z02S24[NW]" + } + ], + "locations": [], + "transitions": [ + "D04Z04S01[W]" + ] + }, + { + "name": "D04BZ02S01[Redento]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "redentoRooms5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S20[Redento]" + }, + { + "logic": [], + "target": "D04Z02S09[W]" + } + ], + "locations": [], + "transitions": [ + "D04BZ02S01[Redento]" + ] + }, + { + "name": "D04Z02S16", + "exits": [ + { + "logic": [], + "target": "D04Z02S16[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S16[-Cherubs]" + } + ], + "locations": [ + "HE01" + ], + "transitions": [] + }, + { + "name": "D04Z02S09[NE]", + "exits": [ + { + "logic": [], + "target": "D04Z02S16" + } + ], + "locations": [], + "transitions": [ + "D04Z02S09[NE]" + ] + }, + { + "name": "D04Z02S11[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S21[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S21[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S22[E]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S11[W]" + ] + }, + { + "name": "D04Z02S12[W]", + "exits": [ + { + "logic": [], + "target": "D04Z02S21[NE]" + }, + { + "logic": [], + "target": "D04Z02S22[E]" + }, + { + "logic": [], + "target": "D04Z02S21[SE]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S12[W]" + ] + }, + { + "name": "D04Z02S22[E]", + "exits": [ + { + "logic": [], + "target": "D04Z02S22" + }, + { + "logic": [], + "target": "D04Z02S21[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S21[NE]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S22[E]", + "D04Z02S21[W]" + ] + }, + { + "name": "D04Z02S22", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatMothersBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S22[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatMothersBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S22[E]" + } + ], + "locations": [ + "BS05" + ], + "transitions": [] + }, + { + "name": "D04Z02S15[E]", + "exits": [ + { + "logic": [], + "target": "D04Z02S22" + }, + { + "logic": [], + "target": "D04Z02S22[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z02S15[E]" + ] + }, + { + "name": "D04BZ02S01", + "exits": [ + { + "logic": [], + "target": "D04BZ02S01[Redento]" + } + ], + "locations": [ + "RE03", + "QI54" + ], + "transitions": [] + }, + { + "name": "D04Z02S20[Redento]", + "exits": [ + { + "logic": [], + "target": "D04BZ02S01" + } + ], + "locations": [], + "transitions": [ + "D04Z02S20[Redento]" + ] + }, + { + "name": "D04Z02S12", + "exits": [ + { + "logic": [], + "target": "D04Z02S12[W]" + } + ], + "locations": [ + "Sword[D04Z02S12]" + ], + "transitions": [] + }, + { + "name": "D04Z02S21[NE]", + "exits": [ + { + "logic": [], + "target": "D04Z02S12" + } + ], + "locations": [], + "transitions": [ + "D04Z02S21[NE]" + ] + }, + { + "name": "D04Z04S01", + "exits": [ + { + "logic": [], + "target": "D04Z04S01[W]" + }, + { + "logic": [], + "target": "D04Z04S01[E]" + } + ], + "locations": [ + "PR201" + ], + "transitions": [] + }, + { + "name": "D04Z02S23[NE]", + "exits": [ + { + "logic": [], + "target": "D04Z04S01" + } + ], + "locations": [], + "transitions": [ + "D04Z02S23[NE]" + ] + }, + { + "name": "D04Z04S02[W]", + "exits": [ + { + "logic": [], + "target": "D04Z04S01" + } + ], + "locations": [], + "transitions": [ + "D04Z04S02[W]" + ] + }, + { + "name": "D04Z03S02[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S22[FrontalN]" + }, + { + "logic": [], + "target": "D05Z01S22[E]" + } + ], + "locations": [], + "transitions": [ + "D04Z03S02[W]" + ] + }, + { + "name": "D05BZ01S01[FrontalN]", + "exits": [ + { + "logic": [], + "target": "D05Z01S22[FrontalN]" + }, + { + "logic": [], + "target": "D05Z01S22[E]" + } + ], + "locations": [], + "transitions": [ + "D05BZ01S01[FrontalN]" + ] + }, + { + "name": "D04Z04S01[E]", + "exits": [ + { + "logic": [], + "target": "D04Z04S02[W]" + } + ], + "locations": [], + "transitions": [ + "D04Z04S01[E]" + ] + }, + { + "name": "D05Z01S15[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "redWax1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB18" + }, + { + "logic": [ + { + "item_requirements": [ + "D05Z01S15[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S02[W]" + }, + { + "logic": [], + "target": "D04Z02S05[W]" + } + ], + "locations": [ + "RB19" + ], + "transitions": [ + "D05Z01S15[E]" + ] + }, + { + "name": "D05Z01S15", + "exits": [ + { + "logic": [], + "target": "D05Z01S15[W]" + }, + { + "logic": [], + "target": "D05Z01S15[E]" + } + ], + "locations": [ + "QI62" + ], + "transitions": [] + }, + { + "name": "D05Z01S02[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S15" + } + ], + "locations": [], + "transitions": [ + "D05Z01S02[W]" + ] + }, + { + "name": "D05Z01S21[NE]", + "exits": [ + { + "logic": [], + "target": "D05Z01S15" + } + ], + "locations": [], + "transitions": [ + "D05Z01S21[NE]" + ] + }, + { + "name": "D05Z01S04[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S03[W]" + }, + { + "logic": [], + "target": "D04Z02S05[W]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S04[E]" + ] + }, + { + "name": "D05BZ01S01[FrontalS]", + "exits": [ + { + "logic": [], + "target": "D05Z01S03[W]" + }, + { + "logic": [], + "target": "D04Z02S05[W]" + } + ], + "locations": [], + "transitions": [ + "D05BZ01S01[FrontalS]" + ] + }, + { + "name": "D05Z01S04", + "exits": [ + { + "logic": [], + "target": "D05Z01S04[W]" + }, + { + "logic": [], + "target": "D05Z01S04[E]" + } + ], + "locations": [ + "CO18", + "RESCUED_CHERUB_01" + ], + "transitions": [] + }, + { + "name": "D05Z01S03[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S04" + } + ], + "locations": [], + "transitions": [ + "D05Z01S03[W]" + ] + }, + { + "name": "D05Z01S05[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S04" + } + ], + "locations": [], + "transitions": [ + "D05Z01S05[E]" + ] + }, + { + "name": "D05BZ01S01", + "exits": [ + { + "logic": [], + "target": "D05BZ01S01[FrontalS]" + }, + { + "logic": [], + "target": "D05BZ01S01[FrontalN]" + } + ], + "locations": [ + "RB301" + ], + "transitions": [] + }, + { + "name": "D05Z01S03[Frontal]", + "exits": [ + { + "logic": [], + "target": "D05BZ01S01" + } + ], + "locations": [], + "transitions": [ + "D05Z01S03[Frontal]" + ] + }, + { + "name": "D05Z01S22[FrontalN]", + "exits": [ + { + "logic": [], + "target": "D05BZ01S01" + } + ], + "locations": [], + "transitions": [ + "D05Z01S22[FrontalN]" + ] + }, + { + "name": "D05Z01S05", + "exits": [ + { + "logic": [], + "target": "D05Z01S05[SW]" + }, + { + "logic": [], + "target": "D05Z01S05[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canClimbOnRoot", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO22" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S17[W]" + } + ], + "locations": [ + "QI50" + ], + "transitions": [] + }, + { + "name": "D05Z01S04[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S05" + } + ], + "locations": [], + "transitions": [ + "D05Z01S04[W]" + ] + }, + { + "name": "D05Z01S07[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S05" + } + ], + "locations": [], + "transitions": [ + "D05Z01S07[E]" + ] + }, + { + "name": "D05Z01S17[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S05" + }, + { + "logic": [ + { + "item_requirements": [ + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO22" + } + ], + "locations": [], + "transitions": [ + "D05Z01S17[W]", + "D05Z01S05[NE]" + ] + }, + { + "name": "D05Z01S05[SW]", + "exits": [ + { + "logic": [], + "target": "D05Z01S07[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap7" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S06[E]" + }, + { + "logic": [], + "target": "D05Z01S08[NE]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S05[SW]" + ] + }, + { + "name": "D05Z01S08[NE]", + "exits": [ + { + "logic": [], + "target": "D05Z01S07[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap7" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S06[E]" + }, + { + "logic": [], + "target": "D05Z01S08[W]" + }, + { + "logic": [], + "target": "D05Z01S08[Health]" + }, + { + "logic": [], + "target": "D05Z01S09[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S08[NE]", + "D05Z01S07[SW]", + "D05Z01S12[E]", + "D05Z01S08[NW]", + "D05Z01S09[W]", + "D05Z01S08[E]" + ] + }, + { + "name": "D05Z01S06[W]", + "exits": [ + { + "logic": [], + "target": "RB31" + }, + { + "logic": [ + { + "item_requirements": [ + "canSurvivePoison3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S06[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S06[W]", + "D05Z01S24[E]" + ] + }, + { + "name": "D05Z01S10[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S08[W]" + }, + { + "logic": [], + "target": "D05Z01S08[Health]" + }, + { + "logic": [], + "target": "D05Z01S08[NE]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S10[E]" + ] + }, + { + "name": "D05Z01S14[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S08[W]" + }, + { + "logic": [], + "target": "D05Z01S08[Health]" + }, + { + "logic": [], + "target": "D05Z01S08[NE]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S14[W]" + ] + }, + { + "name": "D05Z01S10", + "exits": [ + { + "logic": [], + "target": "D05Z01S10[W]" + }, + { + "logic": [], + "target": "D05Z01S10[NW]" + }, + { + "logic": [], + "target": "D05Z01S10[E]" + } + ], + "locations": [ + "PR07" + ], + "transitions": [] + }, + { + "name": "D05Z01S08[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S10" + } + ], + "locations": [], + "transitions": [ + "D05Z01S08[W]" + ] + }, + { + "name": "D05Z01S11[NE]", + "exits": [ + { + "logic": [], + "target": "D05Z01S10" + } + ], + "locations": [], + "transitions": [ + "D05Z01S11[NE]" + ] + }, + { + "name": "D05Z01S11[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S10" + } + ], + "locations": [], + "transitions": [ + "D05Z01S11[E]" + ] + }, + { + "name": "D05Z01S18[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S09[E]" + }, + { + "logic": [], + "target": "D05Z01S08[NE]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S18[W]" + ] + }, + { + "name": "D05Z01S14", + "exits": [ + { + "logic": [], + "target": "D05Z01S14[W]" + } + ], + "locations": [ + "Lady[D05Z01S14]" + ], + "transitions": [] + }, + { + "name": "D05Z01S08[Health]", + "exits": [ + { + "logic": [], + "target": "D05Z01S14" + } + ], + "locations": [], + "transitions": [ + "D05Z01S08[Health]" + ] + }, + { + "name": "D05Z01S18", + "exits": [ + { + "logic": [], + "target": "D05Z01S18[W]" + } + ], + "locations": [ + "PR15" + ], + "transitions": [] + }, + { + "name": "D05Z01S09[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S18" + } + ], + "locations": [], + "transitions": [ + "D05Z01S09[E]" + ] + }, + { + "name": "D05Z01S11", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "tirana", + "obscureSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S11[SW]" + }, + { + "logic": [], + "target": "D05Z01S11[SE]" + }, + { + "logic": [], + "target": "D05Z01S11[E]" + } + ], + "locations": [ + "RB30", + "RESCUED_CHERUB_02" + ], + "transitions": [] + }, + { + "name": "D05Z01S10[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S11" + } + ], + "locations": [], + "transitions": [ + "D05Z01S10[W]" + ] + }, + { + "name": "D05Z01S10[NW]", + "exits": [ + { + "logic": [], + "target": "D05Z01S11" + }, + { + "logic": [], + "target": "D05Z01S11[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "D05Z01S11[NW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB203" + }, + { + "logic": [], + "target": "CO28" + }, + { + "logic": [], + "target": "D05Z01S23[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S10[NW]" + ] + }, + { + "name": "D05Z01S19[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S11" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S11[SW]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S19[E]" + ] + }, + { + "name": "D05Z01S23[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S11" + }, + { + "logic": [], + "target": "D05Z01S11[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "D05Z01S11[NW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB203" + }, + { + "logic": [], + "target": "CO28" + }, + { + "logic": [ + { + "item_requirements": [ + "woodKey", + "D05Z01S23[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "woodKey", + "D05Z01S10[NW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S03[Frontal]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S23[E]", + "D05Z01S11[NW]" + ] + }, + { + "name": "D05Z02S01[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S11" + } + ], + "locations": [], + "transitions": [ + "D05Z02S01[W]" + ] + }, + { + "name": "D05Z01S19", + "exits": [ + { + "logic": [], + "target": "D05Z01S19[W]" + }, + { + "logic": [], + "target": "D05Z01S19[E]" + } + ], + "locations": [ + "Oil[D05Z01S19]" + ], + "transitions": [] + }, + { + "name": "D05Z01S11[SW]", + "exits": [ + { + "logic": [], + "target": "D05Z01S19" + } + ], + "locations": [], + "transitions": [ + "D05Z01S11[SW]" + ] + }, + { + "name": "D05Z02S15[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S19" + } + ], + "locations": [], + "transitions": [ + "D05Z02S15[E]" + ] + }, + { + "name": "D05Z01S11[SE]", + "exits": [ + { + "logic": [], + "target": "D05Z02S01[W]" + }, + { + "logic": [], + "target": "D05Z02S01[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S11[SE]" + ] + }, + { + "name": "D05Z02S02[NW]", + "exits": [ + { + "logic": [], + "target": "D05Z02S01[W]" + }, + { + "logic": [], + "target": "D05Z02S01[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S02[NW]" + ] + }, + { + "name": "D05Z01S21", + "exits": [ + { + "logic": [], + "target": "D05Z01S21[SW]" + }, + { + "logic": [], + "target": "D05Z01S21[NW]" + }, + { + "logic": [], + "target": "D05Z01S21[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z01S21[-Cherubs]" + } + ], + "locations": [ + "RESCUED_CHERUB_32" + ], + "transitions": [] + }, + { + "name": "D05Z01S13[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S21" + } + ], + "locations": [], + "transitions": [ + "D05Z01S13[E]" + ] + }, + { + "name": "D05Z01S15[W]", + "exits": [ + { + "logic": [], + "target": "D05Z01S21" + } + ], + "locations": [], + "transitions": [ + "D05Z01S15[W]" + ] + }, + { + "name": "D05Z02S14[E]", + "exits": [ + { + "logic": [], + "target": "D05Z01S21" + } + ], + "locations": [], + "transitions": [ + "D05Z02S14[E]" + ] + }, + { + "name": "D05Z02S15", + "exits": [ + { + "logic": [], + "target": "D05Z02S15[S]" + }, + { + "logic": [], + "target": "D05Z02S15[E]" + } + ], + "locations": [ + "QI104" + ], + "transitions": [] + }, + { + "name": "D05Z01S19[W]", + "exits": [ + { + "logic": [], + "target": "D05Z02S15" + } + ], + "locations": [], + "transitions": [ + "D05Z01S19[W]" + ] + }, + { + "name": "D05Z02S12[N]", + "exits": [ + { + "logic": [], + "target": "D05Z02S15" + } + ], + "locations": [], + "transitions": [ + "D05Z02S12[N]" + ] + }, + { + "name": "D05Z02S14", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatCanvasesBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z02S14[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatCanvasesBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z02S06[NE]" + } + ], + "locations": [ + "BS06" + ], + "transitions": [] + }, + { + "name": "D05Z01S21[SW]", + "exits": [ + { + "logic": [], + "target": "D05Z02S14" + }, + { + "logic": [], + "target": "D05Z02S14[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z01S21[SW]" + ] + }, + { + "name": "D05Z02S06[NE]", + "exits": [ + { + "logic": [], + "target": "D05Z02S14" + }, + { + "logic": [ + { + "item_requirements": [ + "openedTSCGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z02S06[SE]" + }, + { + "logic": [], + "target": "D05Z02S05[W]" + }, + { + "logic": [], + "target": "D05Z02S07[W]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S06[NE]", + "D05Z02S14[W]", + "D05Z02S06[SW]", + "D05Z02S05[E]", + "D05Z02S07[E]", + "D05Z02S06[NW]" + ] + }, + { + "name": "D05Z01S13", + "exits": [ + { + "logic": [], + "target": "D05Z01S13[E]" + } + ], + "locations": [ + "Sword[D05Z01S13]" + ], + "transitions": [] + }, + { + "name": "D05Z01S21[NW]", + "exits": [ + { + "logic": [], + "target": "D05Z01S13" + } + ], + "locations": [], + "transitions": [ + "D05Z01S21[NW]" + ] + }, + { + "name": "D05Z02S11", + "exits": [ + { + "logic": [], + "target": "D05Z02S11[W]" + } + ], + "locations": [ + "CO31" + ], + "transitions": [] + }, + { + "name": "D05Z01S21[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D05Z02S11" + } + ], + "locations": [], + "transitions": [ + "D05Z01S21[-Cherubs]" + ] + }, + { + "name": "D05Z02S06[SE]", + "exits": [ + { + "logic": [], + "target": "D05Z02S11" + } + ], + "locations": [], + "transitions": [ + "D05Z02S06[SE]" + ] + }, + { + "name": "D04Z03S02", + "exits": [ + { + "logic": [], + "target": "D04Z03S02[W]" + } + ], + "locations": [ + "HE201" + ], + "transitions": [] + }, + { + "name": "D05Z01S22[E]", + "exits": [ + { + "logic": [], + "target": "D04Z03S02" + } + ], + "locations": [], + "transitions": [ + "D05Z01S22[E]" + ] + }, + { + "name": "D05Z02S02", + "exits": [ + { + "logic": [], + "target": "D05Z02S02[SW]" + }, + { + "logic": [], + "target": "D05Z02S02[NW]" + }, + { + "logic": [], + "target": "D05Z02S02[SE]" + }, + { + "logic": [], + "target": "D05Z02S02[NE]" + } + ], + "locations": [ + "QI64" + ], + "transitions": [] + }, + { + "name": "D05Z02S01[E]", + "exits": [ + { + "logic": [], + "target": "D05Z02S02" + } + ], + "locations": [], + "transitions": [ + "D05Z02S01[E]" + ] + }, + { + "name": "D05Z02S03[E]", + "exits": [ + { + "logic": [], + "target": "D05Z02S02" + } + ], + "locations": [], + "transitions": [ + "D05Z02S03[E]" + ] + }, + { + "name": "D05Z02S05[W]", + "exits": [ + { + "logic": [], + "target": "D05Z02S02" + } + ], + "locations": [], + "transitions": [ + "D05Z02S05[W]" + ] + }, + { + "name": "D05Z02S09[W]", + "exits": [ + { + "logic": [], + "target": "D05Z02S02" + } + ], + "locations": [], + "transitions": [ + "D05Z02S09[W]" + ] + }, + { + "name": "D05Z02S02[SW]", + "exits": [ + { + "logic": [], + "target": "D05Z02S03[E]" + }, + { + "logic": [], + "target": "D05Z02S04[W]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S02[SW]" + ] + }, + { + "name": "D05Z02S02[SE]", + "exits": [ + { + "logic": [], + "target": "D05Z02S09[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "redWax3", + "blueWax3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z02S09[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S02[SE]" + ] + }, + { + "name": "D05Z02S08[W]", + "exits": [ + { + "logic": [], + "target": "D05Z02S09[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "redWax3", + "blueWax3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z02S09[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S08[W]" + ] + }, + { + "name": "D05Z02S02[NE]", + "exits": [ + { + "logic": [], + "target": "D05Z02S05[W]" + }, + { + "logic": [], + "target": "D05Z02S06[NE]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S02[NE]" + ] + }, + { + "name": "D05BZ02S01[C]", + "exits": [ + { + "logic": [], + "target": "D05Z02S04[W]" + }, + { + "logic": [], + "target": "D05Z02S04[C]" + } + ], + "locations": [], + "transitions": [ + "D05BZ02S01[C]" + ] + }, + { + "name": "D05BZ02S01", + "exits": [ + { + "logic": [], + "target": "D05BZ02S01[C]" + } + ], + "locations": [ + "RB12", + "QI49", + "QI71" + ], + "transitions": [] + }, + { + "name": "D05Z02S04[C]", + "exits": [ + { + "logic": [], + "target": "D05BZ02S01" + } + ], + "locations": [], + "transitions": [ + "D05Z02S04[C]" + ] + }, + { + "name": "D05Z02S11[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedTSCGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z02S06[SE]" + }, + { + "logic": [], + "target": "D05Z02S06[NE]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S11[W]" + ] + }, + { + "name": "D05Z02S10[E]", + "exits": [ + { + "logic": [], + "target": "D05Z02S07[W]" + }, + { + "logic": [], + "target": "D05Z02S06[NE]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S10[E]" + ] + }, + { + "name": "D05Z02S10", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z02S10[W]" + }, + { + "logic": [], + "target": "D05Z02S10[E]" + } + ], + "locations": [ + "RE05", + "PR05" + ], + "transitions": [] + }, + { + "name": "D05Z02S07[W]", + "exits": [ + { + "logic": [], + "target": "D05Z02S10" + } + ], + "locations": [], + "transitions": [ + "D05Z02S07[W]" + ] + }, + { + "name": "D05Z02S13[E]", + "exits": [ + { + "logic": [], + "target": "D05Z02S10" + } + ], + "locations": [], + "transitions": [ + "D05Z02S13[E]" + ] + }, + { + "name": "D05Z02S08", + "exits": [ + { + "logic": [], + "target": "D05Z02S08[W]" + } + ], + "locations": [ + "HE07" + ], + "transitions": [] + }, + { + "name": "D05Z02S09[E]", + "exits": [ + { + "logic": [], + "target": "D05Z02S08" + } + ], + "locations": [], + "transitions": [ + "D05Z02S09[E]" + ] + }, + { + "name": "D05Z02S10[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D05Z02S13[E]" + } + ], + "locations": [], + "transitions": [ + "D05Z02S10[W]" + ] + }, + { + "name": "D06Z01S01[SW]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "masks1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NNW]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NNE]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[-Cherubs]" + }, + { + "logic": [], + "target": "D06Z01S03" + }, + { + "logic": [ + { + "item_requirements": [ + "EnemySkipsAndDoubleJump", + "wallClimb", + "doubleJump", + "canEnemyBounce", + "preciseSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S08[N]" + }, + { + "logic": [], + "target": "D06Z01S02[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO06" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "taranto" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_36" + } + ], + "locations": [], + "transitions": [ + "D06Z01S01[SW]", + "D06Z01S14[E]", + "D06Z01S01[SE]", + "D06Z01S03[W]", + "D06Z01S08[E]", + "D06Z01S14[W]", + "D06Z01S12[S]", + "D06Z01S14[N]" + ] + }, + { + "name": "D06Z01S03", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S20[W]" + } + ], + "locations": [ + "QI02" + ], + "transitions": [] + }, + { + "name": "D06Z01S01[W]", + "exits": [ + { + "logic": [], + "target": "D06Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NNW]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NNE]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI03" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S04[NW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S04[NW]" + }, + { + "logic": [], + "target": "CO06" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_36" + }, + { + "logic": [], + "target": "D06Z01S13[W]" + }, + { + "logic": [], + "target": "D06Z01S13[S]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S01[W]", + "D06Z01S07[E]", + "D06Z01S01[E]", + "D06Z01S06[WW]", + "D06Z01S12[E]", + "D06Z01S07[W]", + "D06Z01S13[E]", + "D06Z01S12[W]" + ] + }, + { + "name": "D06Z01S16[-CherubsL]", + "exits": [ + { + "logic": [], + "target": "D06Z01S01[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S16[-CherubsL]" + ] + }, + { + "name": "D06Z01S16[-CherubsR]", + "exits": [ + { + "logic": [], + "target": "D06Z01S01[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S16[-CherubsR]" + ] + }, + { + "name": "D06Z01S04[NW]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI03" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S06[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S20[E]", + "wallClimb", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S20[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S20[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S03[E]", + "wallClimb", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S03[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S03[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "wallClimb", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "canSurvivePoison2", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "canSurvivePoison2", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S04[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S01[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S04[NW]", + "D06Z01S06[E]" + ] + }, + { + "name": "D06Z01S04[NE]", + "exits": [ + { + "logic": [], + "target": "D06Z01S06[EE]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S06[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S17[-Cherubs]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S20[E]", + "wallClimb", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S20[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S20[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S03[E]", + "wallClimb", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S03[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S03[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "wallClimb", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "canSurvivePoison2", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "canSurvivePoison2", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S04[NW]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S04[NE]", + "D06Z01S06[W]" + ] + }, + { + "name": "D06Z01S15[SW]", + "exits": [ + { + "logic": [], + "target": "D06Z01S06[EE]" + }, + { + "logic": [], + "target": "D06Z01S04[NE]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S15[SW]" + ] + }, + { + "name": "D06Z01S01[NW]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canCrossGap7" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S16[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S16[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks2", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NNW]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks2", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NNE]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks3", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canWalkOnRoot", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap7", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap7", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S12[NE2]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S01[NW]", + "D06Z01S16[E]" + ] + }, + { + "name": "D06Z01S09[-CherubsL]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S16[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S16[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S12[NE2]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S09[-CherubsL]" + ] + }, + { + "name": "D06Z01S09[-CherubsR]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "linen", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canAirStall", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canAirStall", + "wheel" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S16[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S16[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canAirStall", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canAirStall", + "wheel" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canAirStall", + "canWalkOnRoot", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canAirStall", + "canWalkOnRoot", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canAirStall", + "wheel", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canAirStall", + "wheel", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S12[NE2]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S09[-CherubsR]" + ] + }, + { + "name": "D06Z01S12[NE2]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S16[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canCrossGap1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S16[-CherubsR]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S05[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S09[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S12[NE]" + }, + { + "logic": [], + "target": "CO06" + }, + { + "logic": [], + "target": "PR12" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_36" + }, + { + "logic": [], + "target": "D06Z01S01[W]" + }, + { + "logic": [], + "target": "D06Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S05[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S09[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S05[E]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S12[NE2]", + "D06Z01S16[W]" + ] + }, + { + "name": "D06Z01S01[NE]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks2", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NNW]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks2", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NNE]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks3", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S17[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S26[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S01[NE]", + "D06Z01S17[W]" + ] + }, + { + "name": "D06Z01S10[-CherubsL]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S17[-Cherubs]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S26[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S10[-CherubsL]" + ] + }, + { + "name": "D06Z01S10[-CherubsR]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S17[-Cherubs]" + }, + { + "logic": [], + "target": "D06Z01S26[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S10[-CherubsR]" + ] + }, + { + "name": "D06Z01S26[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S17[-Cherubs]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S26[W]", + "D06Z01S17[E]" + ] + }, + { + "name": "D06Z01S09", + "exits": [ + { + "logic": [], + "target": "D06Z01S09[W]" + }, + { + "logic": [], + "target": "D06Z01S09[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S09[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S09[-CherubsR]" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D06Z01S01[NNW]", + "exits": [ + { + "logic": [], + "target": "D06Z01S09" + } + ], + "locations": [], + "transitions": [ + "D06Z01S01[NNW]" + ] + }, + { + "name": "D06Z01S12[NE]", + "exits": [ + { + "logic": [], + "target": "D06Z01S09" + } + ], + "locations": [], + "transitions": [ + "D06Z01S12[NE]" + ] + }, + { + "name": "D06Z01S01[NNE]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S10[-CherubsL]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S10[-CherubsR]" + }, + { + "logic": [], + "target": "D06Z01S01[SW]" + }, + { + "logic": [], + "target": "D06Z01S01[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NE]" + }, + { + "logic": [], + "target": "D06Z01S01[NNW]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[-Cherubs]" + }, + { + "logic": [], + "target": "D06Z01S21" + } + ], + "locations": [], + "transitions": [ + "D06Z01S01[NNE]", + "D06Z01S10[W]", + "D06Z01S21[W]", + "D06Z01S10[E]" + ] + }, + { + "name": "D06Z01S01[N]", + "exits": [ + { + "logic": [], + "target": "D06Z01S19[S]" + }, + { + "logic": [], + "target": "D06Z01S25[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S01[N]" + ] + }, + { + "name": "D06Z01S25[W]", + "exits": [ + { + "logic": [], + "target": "D06Z01S19[S]" + }, + { + "logic": [], + "target": "D06Z01S25" + } + ], + "locations": [], + "transitions": [ + "D06Z01S25[W]", + "D06Z01S19[E]" + ] + }, + { + "name": "D06Z01S13[S]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "EnemySkipsAndDoubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S08[N]" + }, + { + "logic": [], + "target": "D06Z01S01[SW]" + }, + { + "logic": [], + "target": "D06Z01S02[S]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S13[S]" + ] + }, + { + "name": "D06Z01S09[E]", + "exits": [ + { + "logic": [], + "target": "D06Z01S01[SW]" + }, + { + "logic": [], + "target": "D06Z01S01[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NE]" + }, + { + "logic": [], + "target": "D06Z01S01[NNW]" + }, + { + "logic": [], + "target": "D06Z01S01[NNE]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[-Cherubs]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S09[E]" + ] + }, + { + "name": "D06Z01S19[S]", + "exits": [ + { + "logic": [], + "target": "D06Z01S01[SW]" + }, + { + "logic": [], + "target": "D06Z01S01[W]" + }, + { + "logic": [], + "target": "D06Z01S01[NNW]" + }, + { + "logic": [], + "target": "D06Z01S01[NNE]" + }, + { + "logic": [ + { + "item_requirements": [ + "masks3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[N]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S19[S]" + ] + }, + { + "name": "D06Z01S17[-Cherubs]", + "exits": [ + { + "logic": [], + "target": "D06Z01S04[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S06[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S20[E]", + "wallClimb", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S20[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S20[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S03[E]", + "wallClimb", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S03[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S03[E]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "wallClimb", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "wallClimb", + "canSurvivePoison2", + "doubleJump", + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "canSurvivePoison2", + "canCrossGap9" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S24[W]", + "canSurvivePoison2", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S04[NE]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S17[-Cherubs]" + ] + }, + { + "name": "D06Z01S24[W]", + "exits": [ + { + "logic": [], + "target": "D06Z01S04[Health]" + }, + { + "logic": [], + "target": "D06Z01S20[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S24[W]" + ] + }, + { + "name": "D06Z01S24", + "exits": [ + { + "logic": [], + "target": "D06Z01S24[W]" + } + ], + "locations": [ + "Lady[D06Z01S24]" + ], + "transitions": [] + }, + { + "name": "D06Z01S04[Health]", + "exits": [ + { + "logic": [], + "target": "D06Z01S24" + } + ], + "locations": [], + "transitions": [ + "D06Z01S04[Health]" + ] + }, + { + "name": "D06Z01S05[E]", + "exits": [ + { + "logic": [], + "target": "D06Z01S12[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S16[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S12[NE2]" + }, + { + "logic": [], + "target": "CO06" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "PR12" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_36" + }, + { + "logic": [], + "target": "D06Z01S01[W]" + }, + { + "logic": [], + "target": "D06Z01S01[SW]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S05[E]", + "D06Z01S12[NW]" + ] + }, + { + "name": "D06Z01S09[W]", + "exits": [ + { + "logic": [], + "target": "D06Z01S12[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S16[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S12[NE2]" + }, + { + "logic": [], + "target": "CO06" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "PR12" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_36" + }, + { + "logic": [], + "target": "D06Z01S01[W]" + }, + { + "logic": [], + "target": "D06Z01S01[SW]" + }, + { + "logic": [], + "target": "D06Z01S05[E]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S09[W]" + ] + }, + { + "name": "D06Z01S06[EE]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D06Z01S06[EE]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S15[SW]" + } + ], + "locations": [ + "CO40" + ], + "transitions": [ + "D06Z01S06[EE]" + ] + }, + { + "name": "D06Z01S11[W]", + "exits": [ + { + "logic": [], + "target": "D06Z01S15[NE]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S21[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S06[EE]", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S06[EE]", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S06[EE]", + "doubleJump", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S21[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S06[EE]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S15[SW]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S11[W]" + ] + }, + { + "name": "D06Z01S21[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D06Z01S11[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S06[EE]", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S06[EE]", + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D06Z01S06[EE]", + "doubleJump", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S15[NE]" + }, + { + "logic": [], + "target": "D06Z01S21" + }, + { + "logic": [ + { + "item_requirements": [ + "D06Z01S06[EE]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S15[SW]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S21[E]", + "D06Z01S15[NW]" + ] + }, + { + "name": "D06Z01S08[N]", + "exits": [ + { + "logic": [], + "target": "D06Z01S13[W]" + }, + { + "logic": [], + "target": "D06Z01S13[S]" + }, + { + "logic": [], + "target": "D06Z01S01[W]" + } + ], + "locations": [], + "transitions": [ + "D06Z01S08[N]" + ] + }, + { + "name": "D09Z01S01[E]", + "exits": [ + { + "logic": [], + "target": "D06Z01S13[W]" + }, + { + "logic": [], + "target": "D06Z01S13[S]" + }, + { + "logic": [], + "target": "D06Z01S01[W]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S01[E]" + ] + }, + { + "name": "D06Z01S21", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S21[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S01[NNE]" + } + ], + "locations": [ + "QI04" + ], + "transitions": [] + }, + { + "name": "D09Z01S01", + "exits": [ + { + "logic": [], + "target": "D09Z01S01[W]" + }, + { + "logic": [], + "target": "D09Z01S01[E]" + } + ], + "locations": [ + "Amanecida[D09Z01S01]" + ], + "transitions": [] + }, + { + "name": "D06Z01S13[W]", + "exits": [ + { + "logic": [], + "target": "D09Z01S01" + } + ], + "locations": [], + "transitions": [ + "D06Z01S13[W]" + ] + }, + { + "name": "D09Z01S11[E]", + "exits": [ + { + "logic": [], + "target": "D09Z01S01" + } + ], + "locations": [], + "transitions": [ + "D09Z01S11[E]" + ] + }, + { + "name": "D06Z01S11", + "exits": [ + { + "logic": [], + "target": "D06Z01S11[W]" + } + ], + "locations": [ + "Sword[D06Z01S11]" + ], + "transitions": [] + }, + { + "name": "D06Z01S15[NE]", + "exits": [ + { + "logic": [], + "target": "D06Z01S11" + } + ], + "locations": [], + "transitions": [ + "D06Z01S15[NE]" + ] + }, + { + "name": "D06Z01S25", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatRooftopsBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S25[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatRooftopsBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D06Z01S25[E]" + } + ], + "locations": [ + "BS16" + ], + "transitions": [] + }, + { + "name": "D07Z01S01[W]", + "exits": [ + { + "logic": [], + "target": "D06Z01S25" + }, + { + "logic": [], + "target": "D06Z01S25[E]" + } + ], + "locations": [], + "transitions": [ + "D07Z01S01[W]" + ] + }, + { + "name": "D06Z01S22", + "exits": [ + { + "logic": [], + "target": "D06Z01S22[Sword]" + } + ], + "locations": [ + "HE04" + ], + "transitions": [] + }, + { + "name": "D06Z01S23[Sword]", + "exits": [ + { + "logic": [], + "target": "D06Z01S22" + } + ], + "locations": [], + "transitions": [ + "D06Z01S23[Sword]" + ] + }, + { + "name": "D07Z01S01", + "exits": [ + { + "logic": [], + "target": "D07Z01S01[W]" + }, + { + "logic": [], + "target": "D07Z01S01[E]" + } + ], + "locations": [ + "PR08" + ], + "transitions": [] + }, + { + "name": "D06Z01S25[E]", + "exits": [ + { + "logic": [], + "target": "D07Z01S01" + } + ], + "locations": [], + "transitions": [ + "D06Z01S25[E]" + ] + }, + { + "name": "D07Z01S02[W]", + "exits": [ + { + "logic": [], + "target": "D07Z01S01" + } + ], + "locations": [], + "transitions": [ + "D07Z01S02[W]" + ] + }, + { + "name": "D07Z01S01[E]", + "exits": [ + { + "logic": [], + "target": "D07Z01S02[W]" + }, + { + "logic": [], + "target": "D07Z01S03[W]" + } + ], + "locations": [], + "transitions": [ + "D07Z01S01[E]" + ] + }, + { + "name": "D07Z01S03[W]", + "exits": [ + { + "logic": [], + "target": "D07Z01S02[W]" + } + ], + "locations": [], + "transitions": [ + "D07Z01S03[W]", + "D07Z01S02[E]" + ] + }, + { + "name": "D08Z03S03", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatHallBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z03S03[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatHallBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z03S02[NW]" + } + ], + "locations": [ + "LaudesBossTrigger[30000]" + ], + "transitions": [] + }, + { + "name": "D08Z01S02[NE]", + "exits": [ + { + "logic": [], + "target": "D08Z03S03" + }, + { + "logic": [], + "target": "D08Z03S03[W]" + } + ], + "locations": [], + "transitions": [ + "D08Z01S02[NE]" + ] + }, + { + "name": "D08Z03S02[NW]", + "exits": [ + { + "logic": [], + "target": "D08Z03S03" + }, + { + "logic": [], + "target": "D08Z03S02[SW]" + } + ], + "locations": [], + "transitions": [ + "D08Z03S02[NW]", + "D08Z03S03[E]" + ] + }, + { + "name": "D08Z01S02[SE]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "brokeBotTCStatue" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z02S03[W]" + }, + { + "logic": [], + "target": "D08Z02S03[E]" + }, + { + "logic": [], + "target": "D08Z02S02[W]" + } + ], + "locations": [], + "transitions": [ + "D08Z01S02[SE]" + ] + }, + { + "name": "D08Z03S01[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "brokeBotTCStatue" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z02S03[W]" + }, + { + "logic": [], + "target": "D08Z02S03[E]" + }, + { + "logic": [], + "target": "D08Z02S02[W]" + } + ], + "locations": [], + "transitions": [ + "D08Z03S01[W]" + ] + }, + { + "name": "D08Z01S02", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D08Z03S03[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z01S02[NE]" + }, + { + "logic": [], + "target": "D08Z01S02[SE]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z01S02[-Cherubs]" + } + ], + "locations": [ + "HE101" + ], + "transitions": [] + }, + { + "name": "D08Z02S03[W]", + "exits": [ + { + "logic": [], + "target": "D08Z01S02" + } + ], + "locations": [], + "transitions": [ + "D08Z02S03[W]" + ] + }, + { + "name": "D08Z03S03[W]", + "exits": [ + { + "logic": [], + "target": "D08Z01S02" + } + ], + "locations": [], + "transitions": [ + "D08Z03S03[W]" + ] + }, + { + "name": "D08Z03S01", + "exits": [ + { + "logic": [], + "target": "D08Z03S01[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "verses4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z03S01[E]" + } + ], + "locations": [ + "QI105" + ], + "transitions": [] + }, + { + "name": "D08Z02S03[E]", + "exits": [ + { + "logic": [], + "target": "D08Z03S01" + } + ], + "locations": [], + "transitions": [ + "D08Z02S03[E]" + ] + }, + { + "name": "D08Z03S02[SW]", + "exits": [ + { + "logic": [], + "target": "D08Z03S01" + } + ], + "locations": [], + "transitions": [ + "D08Z03S02[SW]" + ] + }, + { + "name": "D08Z03S01[E]", + "exits": [ + { + "logic": [], + "target": "D08Z03S02[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D08Z03S02[NW]" + } + ], + "locations": [], + "transitions": [ + "D08Z03S01[E]" + ] + }, + { + "name": "D09Z01S01[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S04[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S11[W]" + }, + { + "logic": [], + "target": "D09Z01S11[E]" + }, + { + "logic": [], + "target": "D09Z01S02[N]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S01[W]" + ] + }, + { + "name": "D09Z01S02[N]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S04[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S11[W]" + }, + { + "logic": [], + "target": "D09Z01S11[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "goldKey", + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S02[N]", + "D09Z01S11[S]", + "D09Z01S02[NW]", + "D09Z01S07[NE]" + ] + }, + { + "name": "D09Z01S04[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S04[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S11[W]" + }, + { + "logic": [], + "target": "D09Z01S11[E]" + }, + { + "logic": [], + "target": "D09Z01S02[N]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S04[E]" + ] + }, + { + "name": "D09Z01S04[S]", + "exits": [ + { + "logic": [], + "target": "D09Z01S04[W]" + }, + { + "logic": [], + "target": "D09Z01S04[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [ + "D09Z01S04[S]", + "D09Z01S07[N]", + "D09Z01S08[NE]", + "D09Z01S07[NW]" + ] + }, + { + "name": "D09Z01S02[Cell1]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [ + "RESCUED_CHERUB_03" + ], + "transitions": [] + }, + { + "name": "D09Z01S02[Cell6]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [ + "CO24" + ], + "transitions": [] + }, + { + "name": "D09Z01S02[Cell22]", + "exits": [ + { + "logic": [], + "target": "QI69" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "bronzeKey", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + } + ], + "locations": [ + "CO10" + ], + "transitions": [] + }, + { + "name": "D09Z01S08[Cell7]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D09Z01S08[Cell16]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [ + "CO26" + ], + "transitions": [] + }, + { + "name": "D09Z01S08[Cell18]", + "exits": [ + { + "logic": [], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D09Z01S09[Cell24]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D09Z01S09[Cell21]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [ + "CO02" + ], + "transitions": [] + }, + { + "name": "D09Z01S10[Cell10]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [ + "CO37" + ], + "transitions": [] + }, + { + "name": "D09Z01S10[Cell11]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [ + "RESCUED_CHERUB_04" + ], + "transitions": [] + }, + { + "name": "D09Z01S03[W]", + "exits": [ + { + "logic": [], + "target": "D09Z01S05[SE]" + }, + { + "logic": [], + "target": "D09Z01S05[NE]" + }, + { + "logic": [], + "target": "D09Z01S13[E]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S03[W]" + ] + }, + { + "name": "D09Z01S08[W]", + "exits": [ + { + "logic": [], + "target": "D09Z01S05[SE]" + }, + { + "logic": [], + "target": "D09Z01S05[NE]" + }, + { + "logic": [], + "target": "D09Z01S13[E]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S08[W]" + ] + }, + { + "name": "D09Z01S13[E]", + "exits": [ + { + "logic": [], + "target": "D09Z01S05[SE]" + }, + { + "logic": [], + "target": "D09Z01S05[NE]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S13[E]", + "D09Z01S05[W]" + ] + }, + { + "name": "D09Z01S03", + "exits": [], + "locations": [ + "BS14" + ], + "transitions": [] + }, + { + "name": "D09Z01S05[SE]", + "exits": [ + { + "logic": [], + "target": "D09Z01S03" + } + ], + "locations": [], + "transitions": [ + "D09Z01S05[SE]" + ] + }, + { + "name": "D09Z01S08[S]", + "exits": [ + { + "logic": [], + "target": "D09Z01S03" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatPrisonBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S03[W]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S08[S]" + ] + }, + { + "name": "D09Z01S05[NE]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [ + "D09Z01S05[NE]" + ] + }, + { + "name": "D09BZ01S01[Cell17]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "goldKey", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell21]", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell21]", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "silverKey", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell17]", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "silverKey", + "dash", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D09Z01S06[E]", + "exits": [ + { + "logic": [], + "target": "D09Z01S04[W]" + }, + { + "logic": [], + "target": "D09Z01S04[E]" + }, + { + "logic": [], + "target": "D09Z01S04[S]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S06[E]" + ] + }, + { + "name": "D09Z01S11[W]", + "exits": [ + { + "logic": [], + "target": "D09Z01S04[W]" + }, + { + "logic": [], + "target": "D09Z01S04[E]" + }, + { + "logic": [], + "target": "D09Z01S04[S]" + } + ], + "locations": [], + "transitions": [ + "D09Z01S11[W]" + ] + }, + { + "name": "D09BZ01S01[Cell13]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell7]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell16]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell18]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell1]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell6]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell22]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell1]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell6]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell22]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell1]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell1]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell6]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell6]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell22]", + "goldKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell22]", + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell5]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell1]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell6]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell13]", + "D09Z01S02[Cell22]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [ + "QI70" + ], + "transitions": [] + }, + { + "name": "D09BZ01S01[Cell5]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell24]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "goldKey", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell21]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S07[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S09[Cell24]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB16" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "NormalLogicAndDoubleJump", + "dash", + "doubleJump", + "canDawnJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S09[Cell21]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell19]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "goldKey", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell7]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell7]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "D09BZ01S01[Cell17]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell17]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "goldKey", + "D09Z01S08[Cell16]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "goldKey", + "D09Z01S08[Cell18]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell16]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[Cell18]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_34" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "silverKey", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell16]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S08[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell18]", + "openedWotHPGate" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI72" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S08[Cell7]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S04[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell10]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S10[Cell11]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO27" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell10]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "D09Z01S10[Cell11]", + "D09BZ01S01[Cell13]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "bronzeKey", + "D09Z01S10[Cell10]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "bronzeKey", + "D09Z01S10[Cell11]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09BZ01S01[Cell13]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell1]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "silverKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell6]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D09Z01S02[Cell22]" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB11" + }, + { + "logic": [ + { + "item_requirements": [ + "D09BZ01S01[Cell5]", + "bronzeKey" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "QI69" + } + ], + "locations": [ + "QI51" + ], + "transitions": [] + }, + { + "name": "D09Z01S12", + "exits": [ + { + "logic": [], + "target": "D09Z01S12[E]" + } + ], + "locations": [ + "Oil[D09Z01S12]" + ], + "transitions": [] + }, + { + "name": "D09Z01S09[NW]", + "exits": [ + { + "logic": [], + "target": "D09Z01S12" + } + ], + "locations": [], + "transitions": [ + "D09Z01S09[NW]" + ] + }, + { + "name": "D17Z01S01[E]", + "exits": [ + { + "logic": [], + "target": "D17Z01S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S05[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S10[S]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S01[E]" + ] + }, + { + "name": "D17Z01S05[W]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S02[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedBotSSLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S05[S]" + }, + { + "logic": [], + "target": "D17Z01S11" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S10[S]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S05[W]", + "D17Z01S02[E]", + "D17Z01S11[W]", + "D17Z01S05[E]" + ] + }, + { + "name": "D17Z01S10[S]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S02[W]" + }, + { + "logic": [], + "target": "D17Z01S05[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S13[E]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S10[S]", + "D17Z01S02[N]" + ] + }, + { + "name": "D17Z01S01", + "exits": [ + { + "logic": [], + "target": "D17Z01S01[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "taranto" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "debla" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot", + "ruby" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap9", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap9", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap9", + "debla" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap9", + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap9", + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap9", + "ruby" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RESCUED_CHERUB_06" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D17Z01S02[W]", + "exits": [ + { + "logic": [], + "target": "D17Z01S01" + } + ], + "locations": [], + "transitions": [ + "D17Z01S02[W]" + ] + }, + { + "name": "D17Z01S14[-Cherubs1]", + "exits": [ + { + "logic": [], + "target": "D17Z01S01" + }, + { + "logic": [], + "target": "RESCUED_CHERUB_06" + } + ], + "locations": [], + "transitions": [ + "D17Z01S14[-Cherubs1]" + ] + }, + { + "name": "D17Z01S14[-Cherubs2]", + "exits": [ + { + "logic": [], + "target": "D17Z01S01" + } + ], + "locations": [], + "transitions": [ + "D17Z01S14[-Cherubs2]" + ] + }, + { + "name": "D17Z01S14[-Cherubs3]", + "exits": [ + { + "logic": [], + "target": "D17Z01S01" + } + ], + "locations": [ + "RB204" + ], + "transitions": [ + "D17Z01S14[-Cherubs3]" + ] + }, + { + "name": "D17Z01S04[N]", + "exits": [ + { + "logic": [], + "target": "D17Z01S05[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "openedBotSSLadder" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S05[S]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S04[N]" + ] + }, + { + "name": "D17Z01S13[E]", + "exits": [ + { + "logic": [], + "target": "D17Z01S10[S]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canCrossGap8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S14[-Cherubs2]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S14[-Cherubs3]" + }, + { + "logic": [ + { + "item_requirements": [ + "scapular", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S14[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "canCrossGap11" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S14[-Cherubs1]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "PR203" + } + ], + "locations": [], + "transitions": [ + "D17Z01S13[E]", + "D17Z01S10[W]", + "D17Z01S14[E]", + "D17Z01S13[W]" + ] + }, + { + "name": "D17Z01S11", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "canBeatBrotherhoodBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S11[E]" + }, + { + "logic": [ + { + "item_requirements": [ + "canBeatBrotherhoodBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S05[W]" + } + ], + "locations": [ + "BS13" + ], + "transitions": [] + }, + { + "name": "D17BZ01S01", + "exits": [ + { + "logic": [], + "target": "D17BZ01S01[relic]" + } + ], + "locations": [ + "RE01" + ], + "transitions": [] + }, + { + "name": "D17Z01S03[relic]", + "exits": [ + { + "logic": [], + "target": "D17BZ01S01" + } + ], + "locations": [], + "transitions": [ + "D17Z01S03[relic]" + ] + }, + { + "name": "D17Z01S04[W]", + "exits": [ + { + "logic": [], + "target": "D17Z01S12[E]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S04[W]" + ] + }, + { + "name": "D17Z01S04[FrontL]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "D17Z01S04[FrontL]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17BZ02S01[FrontL]" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "CO25" + }, + { + "logic": [ + { + "item_requirements": [ + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S04[FrontR]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S04[FrontL]" + ] + }, + { + "name": "D17Z01S04[FrontR]", + "exits": [ + { + "logic": [], + "target": "CO25" + }, + { + "logic": [], + "target": "D17Z01S04" + }, + { + "logic": [], + "target": "D17Z01S04[N]" + }, + { + "logic": [ + { + "item_requirements": [ + "blueWax1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB25" + }, + { + "logic": [ + { + "item_requirements": [ + "blueWax1", + "D01Z04S13[SE]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blueWax1", + "D05Z02S12[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB26" + }, + { + "logic": [ + { + "item_requirements": [ + "D17Z01S04[FrontL]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17BZ02S01[FrontL]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S04[FrontR]", + "D17BZ02S01[FrontR]" + ] + }, + { + "name": "D17Z01S04", + "exits": [ + { + "logic": [], + "target": "D17Z01S04[W]" + }, + { + "logic": [], + "target": "D17Z01S04[S]" + }, + { + "logic": [], + "target": "D17Z01S04[FrontL]" + } + ], + "locations": [ + "RE401" + ], + "transitions": [] + }, + { + "name": "D17Z01S05[S]", + "exits": [ + { + "logic": [], + "target": "D17Z01S04" + }, + { + "logic": [], + "target": "D17Z01S04[N]" + }, + { + "logic": [], + "target": "D17Z01S04[FrontR]" + }, + { + "logic": [ + { + "item_requirements": [ + "blueWax1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB25" + }, + { + "logic": [ + { + "item_requirements": [ + "blueWax1", + "D01Z04S13[SE]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blueWax1", + "D05Z02S12[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "RB26" + } + ], + "locations": [], + "transitions": [ + "D17Z01S05[S]" + ] + }, + { + "name": "D17Z01S07[N]", + "exits": [ + { + "logic": [], + "target": "D17Z01S04" + } + ], + "locations": [], + "transitions": [ + "D17Z01S07[N]" + ] + }, + { + "name": "D17Z01S12[E]", + "exits": [ + { + "logic": [], + "target": "D17Z01S04" + } + ], + "locations": [], + "transitions": [ + "D17Z01S12[E]" + ] + }, + { + "name": "D17BZ02S01[FrontL]", + "exits": [ + { + "logic": [], + "target": "D17Z01S04" + } + ], + "locations": [], + "transitions": [ + "D17BZ02S01[FrontL]" + ] + }, + { + "name": "D17Z01S08", + "exits": [ + { + "logic": [], + "target": "D17Z01S08[E]" + } + ], + "locations": [ + "Sword[D17Z01S08]" + ], + "transitions": [] + }, + { + "name": "D17Z01S07[SW]", + "exits": [ + { + "logic": [], + "target": "D17Z01S08" + } + ], + "locations": [], + "transitions": [ + "D17Z01S07[SW]" + ] + }, + { + "name": "D17Z01S15[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "scapular" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S14[W]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S14[-Cherubs1]" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "linen", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S14[-Cherubs2]" + }, + { + "logic": [], + "target": "PR203" + }, + { + "logic": [ + { + "item_requirements": [ + "linen", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S14[-Cherubs3]" + }, + { + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D17Z01S13[E]" + } + ], + "locations": [], + "transitions": [ + "D17Z01S15[E]" + ] + }, + { + "name": "D17Z01S15", + "exits": [ + { + "logic": [], + "target": "D17Z01S15[E]" + } + ], + "locations": [ + "QI204", + "QI301" + ], + "transitions": [] + }, + { + "name": "D17Z01S14[W]", + "exits": [ + { + "logic": [], + "target": "D17Z01S15" + } + ], + "locations": [], + "transitions": [ + "D17Z01S14[W]" + ] + }, + { + "name": "D20Z01S02", + "exits": [ + { + "logic": [], + "target": "D20Z01S02[W]" + }, + { + "logic": [], + "target": "D20Z01S02[E]" + } + ], + "locations": [ + "RB108" + ], + "transitions": [] + }, + { + "name": "D20Z01S01[E]", + "exits": [ + { + "logic": [], + "target": "D20Z01S02" + } + ], + "locations": [], + "transitions": [ + "D20Z01S01[E]" + ] + }, + { + "name": "D20Z01S03[W]", + "exits": [ + { + "logic": [], + "target": "D20Z01S02" + } + ], + "locations": [], + "transitions": [ + "D20Z01S03[W]" + ] + }, + { + "name": "D20Z02S11[NW]", + "exits": [ + { + "logic": [], + "target": "D20Z01S13[E]" + }, + { + "logic": [], + "target": "D20Z01S11[W]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S11[NW]" + ] + }, + { + "name": "D20Z02S11[SW]", + "exits": [ + { + "logic": [], + "target": "D20Z02S12[E]" + }, + { + "logic": [], + "target": "D20Z01S11[W]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S11[SW]" + ] + }, + { + "name": "D20Z02S11", + "exits": [ + { + "logic": [], + "target": "D20Z02S11[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "mourningSkipAllowed", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "mourningSkipAllowed", + "tirana", + "obscureSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S11[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "mourningSkipAllowed", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "HardLogic", + "mourningSkipAllowed", + "tirana", + "obscureSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S11[E]" + } + ], + "locations": [ + "PR202" + ], + "transitions": [] + }, + { + "name": "D20Z01S13[E]", + "exits": [ + { + "logic": [], + "target": "D20Z02S11" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S11[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "mourningSkipAllowed", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S11[E]" + } + ], + "locations": [], + "transitions": [ + "D20Z01S13[E]" + ] + }, + { + "name": "D20Z02S10[W]", + "exits": [ + { + "logic": [], + "target": "D20Z02S11" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic", + "mourningSkipAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S11[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "HardLogic" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S11[E]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S10[W]" + ] + }, + { + "name": "D20Z02S12[E]", + "exits": [ + { + "logic": [], + "target": "D20Z02S11" + } + ], + "locations": [], + "transitions": [ + "D20Z02S12[E]" + ] + }, + { + "name": "D20Z03S01[W]", + "exits": [ + { + "logic": [], + "target": "D20Z01S14[E]" + }, + { + "logic": [], + "target": "D20Z01S11[W]" + } + ], + "locations": [], + "transitions": [ + "D20Z03S01[W]" + ] + }, + { + "name": "D20Z03S01", + "exits": [ + { + "logic": [], + "target": "D20Z03S01[W]" + } + ], + "locations": [ + "QI203" + ], + "transitions": [] + }, + { + "name": "D20Z01S14[E]", + "exits": [ + { + "logic": [], + "target": "D20Z03S01" + } + ], + "locations": [], + "transitions": [ + "D20Z01S14[E]" + ] + }, + { + "name": "D20Z02S02[W]", + "exits": [ + { + "logic": [], + "target": "D20Z02S03[NE]" + }, + { + "logic": [], + "target": "D04Z02S24[NW]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S02[W]" + ] + }, + { + "name": "D20Z02S05[E]", + "exits": [ + { + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D04Z02S24[NW]" + }, + { + "logic": [ + { + "item_requirements": [ + "nail" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S06[NE]" + }, + { + "logic": [], + "target": "D20Z02S06[SW]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S05[E]", + "D20Z02S04[W]", + "D20Z02S06[SE]", + "D20Z02S05[SW]" + ] + }, + { + "name": "D20Z02S02", + "exits": [ + { + "logic": [], + "target": "D20Z02S02[W]" + } + ], + "locations": [ + "RB201" + ], + "transitions": [] + }, + { + "name": "D20Z02S03[NE]", + "exits": [ + { + "logic": [], + "target": "D20Z02S02" + } + ], + "locations": [], + "transitions": [ + "D20Z02S03[NE]" + ] + }, + { + "name": "D20Z02S06[NE]", + "exits": [ + { + "logic": [], + "target": "D20Z02S05[E]" + }, + { + "logic": [], + "target": "D20Z02S06[SW]" + }, + { + "logic": [], + "target": "D20Z02S07[W]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S06[NE]", + "D20Z02S05[NW]", + "D20Z02S07[E]", + "D20Z02S06[NW]" + ] + }, + { + "name": "D20Z02S09[E]", + "exits": [ + { + "logic": [], + "target": "D20Z02S06[SW]" + }, + { + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ], + "target": "D20Z02S06[NE]" + }, + { + "logic": [], + "target": "D20Z02S05[E]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S09[E]" + ] + }, + { + "name": "D20Z02S09", + "exits": [ + { + "logic": [], + "target": "D20Z02S09[W]" + }, + { + "logic": [], + "target": "D20Z02S09[E]" + } + ], + "locations": [], + "transitions": [] + }, + { + "name": "D20Z02S06[SW]", + "exits": [ + { + "logic": [], + "target": "D20Z02S09" + } + ], + "locations": [], + "transitions": [ + "D20Z02S06[SW]" + ] + }, + { + "name": "D20Z02S10[E]", + "exits": [ + { + "logic": [], + "target": "D20Z02S09" + } + ], + "locations": [], + "transitions": [ + "D20Z02S10[E]" + ] + }, + { + "name": "D20Z02S08[E]", + "exits": [ + { + "logic": [], + "target": "D20Z02S07[W]" + }, + { + "logic": [], + "target": "D20Z02S06[NE]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S08[E]" + ] + }, + { + "name": "D20Z02S08", + "exits": [ + { + "logic": [], + "target": "D20Z02S08[E]" + } + ], + "locations": [ + "BossTrigger[5000]", + "QI202" + ], + "transitions": [] + }, + { + "name": "D20Z02S07[W]", + "exits": [ + { + "logic": [], + "target": "D20Z02S08" + } + ], + "locations": [], + "transitions": [ + "D20Z02S07[W]" + ] + }, + { + "name": "D20Z02S09[W]", + "exits": [ + { + "logic": [], + "target": "D20Z02S10[W]" + }, + { + "logic": [], + "target": "D20Z02S10[E]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S09[W]" + ] + }, + { + "name": "D20Z02S11[E]", + "exits": [ + { + "logic": [], + "target": "D20Z02S10[W]" + }, + { + "logic": [], + "target": "D20Z02S10[E]" + } + ], + "locations": [], + "transitions": [ + "D20Z02S11[E]" + ] + }, + { + "name": "RESCUED_CHERUB_08", + "exits": [], + "locations": [ + "RESCUED_CHERUB_08" + ], + "transitions": [] + }, + { + "name": "CO21", + "exits": [], + "locations": [ + "CO21" + ], + "transitions": [] + }, + { + "name": "PR16", + "exits": [], + "locations": [ + "PR16" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_13", + "exits": [], + "locations": [ + "RESCUED_CHERUB_13" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_12", + "exits": [], + "locations": [ + "RESCUED_CHERUB_12" + ], + "transitions": [] + }, + { + "name": "CO32", + "exits": [], + "locations": [ + "CO32" + ], + "transitions": [] + }, + { + "name": "CO44", + "exits": [], + "locations": [ + "CO44" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_22", + "exits": [], + "locations": [ + "RESCUED_CHERUB_22" + ], + "transitions": [] + }, + { + "name": "CO11", + "exits": [], + "locations": [ + "CO11" + ], + "transitions": [] + }, + { + "name": "QI59", + "exits": [], + "locations": [ + "QI59" + ], + "transitions": [] + }, + { + "name": "RB10", + "exits": [], + "locations": [ + "RB10" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_23", + "exits": [], + "locations": [ + "RESCUED_CHERUB_23" + ], + "transitions": [] + }, + { + "name": "QI68", + "exits": [], + "locations": [ + "QI68" + ], + "transitions": [] + }, + { + "name": "CO19", + "exits": [], + "locations": [ + "CO19" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_27", + "exits": [], + "locations": [ + "RESCUED_CHERUB_27" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_24", + "exits": [], + "locations": [ + "RESCUED_CHERUB_24" + ], + "transitions": [] + }, + { + "name": "QI46", + "exits": [], + "locations": [ + "QI46" + ], + "transitions": [] + }, + { + "name": "CO29", + "exits": [], + "locations": [ + "CO29" + ], + "transitions": [] + }, + { + "name": "QI08", + "exits": [], + "locations": [ + "QI08" + ], + "transitions": [] + }, + { + "name": "CO01", + "exits": [], + "locations": [ + "CO01" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_25", + "exits": [], + "locations": [ + "RESCUED_CHERUB_25" + ], + "transitions": [] + }, + { + "name": "RB15", + "exits": [], + "locations": [ + "RB15" + ], + "transitions": [] + }, + { + "name": "CO42", + "exits": [], + "locations": [ + "CO42" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_31", + "exits": [], + "locations": [ + "RESCUED_CHERUB_31" + ], + "transitions": [] + }, + { + "name": "CO05", + "exits": [], + "locations": [ + "CO05" + ], + "transitions": [] + }, + { + "name": "RB08", + "exits": [], + "locations": [ + "RB08" + ], + "transitions": [] + }, + { + "name": "QI47", + "exits": [], + "locations": [ + "QI47" + ], + "transitions": [] + }, + { + "name": "RB22", + "exits": [], + "locations": [ + "RB22" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_16", + "exits": [], + "locations": [ + "RESCUED_CHERUB_16" + ], + "transitions": [] + }, + { + "name": "Amanecida[D03Z01S03]", + "exits": [], + "locations": [ + "Amanecida[D03Z01S03]" + ], + "transitions": [] + }, + { + "name": "PR10", + "exits": [], + "locations": [ + "PR10" + ], + "transitions": [] + }, + { + "name": "CO33", + "exits": [], + "locations": [ + "CO33" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_18", + "exits": [], + "locations": [ + "RESCUED_CHERUB_18" + ], + "transitions": [] + }, + { + "name": "QI41", + "exits": [], + "locations": [ + "QI41" + ], + "transitions": [] + }, + { + "name": "HE06", + "exits": [], + "locations": [ + "HE06" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_37", + "exits": [], + "locations": [ + "RESCUED_CHERUB_37" + ], + "transitions": [] + }, + { + "name": "RB06", + "exits": [], + "locations": [ + "RB06" + ], + "transitions": [] + }, + { + "name": "CO23", + "exits": [], + "locations": [ + "CO23" + ], + "transitions": [] + }, + { + "name": "RE402", + "exits": [], + "locations": [ + "RE402" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_30", + "exits": [], + "locations": [ + "RESCUED_CHERUB_30" + ], + "transitions": [] + }, + { + "name": "CO34", + "exits": [], + "locations": [ + "CO34" + ], + "transitions": [] + }, + { + "name": "CO22", + "exits": [], + "locations": [ + "CO22" + ], + "transitions": [] + }, + { + "name": "RB31", + "exits": [], + "locations": [ + "RB31" + ], + "transitions": [] + }, + { + "name": "RB203", + "exits": [], + "locations": [ + "RB203" + ], + "transitions": [] + }, + { + "name": "CO28", + "exits": [], + "locations": [ + "CO28" + ], + "transitions": [] + }, + { + "name": "QI03", + "exits": [], + "locations": [ + "QI03" + ], + "transitions": [] + }, + { + "name": "CO06", + "exits": [], + "locations": [ + "CO06" + ], + "transitions": [] + }, + { + "name": "PR12", + "exits": [], + "locations": [ + "PR12" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_36", + "exits": [], + "locations": [ + "RESCUED_CHERUB_36" + ], + "transitions": [] + }, + { + "name": "RB11", + "exits": [], + "locations": [ + "RB11" + ], + "transitions": [] + }, + { + "name": "QI72", + "exits": [], + "locations": [ + "QI72" + ], + "transitions": [] + }, + { + "name": "RB16", + "exits": [], + "locations": [ + "RB16" + ], + "transitions": [] + }, + { + "name": "CO27", + "exits": [], + "locations": [ + "CO27" + ], + "transitions": [] + }, + { + "name": "QI69", + "exits": [], + "locations": [ + "QI69" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_34", + "exits": [], + "locations": [ + "RESCUED_CHERUB_34" + ], + "transitions": [] + }, + { + "name": "RESCUED_CHERUB_06", + "exits": [], + "locations": [ + "RESCUED_CHERUB_06" + ], + "transitions": [] + }, + { + "name": "PR203", + "exits": [], + "locations": [ + "PR203" + ], + "transitions": [] + }, + { + "name": "CO25", + "exits": [], + "locations": [ + "CO25" + ], + "transitions": [] + }, + { + "name": "RB202", + "exits": [], + "locations": [ + "RB202" + ], + "transitions": [] + }, + { + "name": "RB18", + "exits": [], + "locations": [ + "RB18" + ], + "transitions": [] + }, + { + "name": "RB25", + "exits": [], + "locations": [ + "RB25" + ], + "transitions": [] + }, + { + "name": "RB26", + "exits": [], + "locations": [ + "RB26" + ], + "transitions": [] + } +] +locations = [ + { + "name": "PR14", + "logic": [] + }, + { + "name": "RB07", + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CO04", + "logic": [] + }, + { + "name": "QI55", + "logic": [ + { + "item_requirements": [ + "blood", + "dash", + "canWaterJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RESCUED_CHERUB_07", + "logic": [] + }, + { + "name": "QI31", + "logic": [] + }, + { + "name": "RE02", + "logic": [ + { + "item_requirements": [ + "hand" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RE04", + "logic": [ + { + "item_requirements": [ + "cloth" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RE10", + "logic": [ + { + "item_requirements": [ + "hatchedEgg" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB01", + "logic": [] + }, + { + "name": "QI66", + "logic": [ + { + "item_requirements": [ + "herbs1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Tirso[500]", + "logic": [ + { + "item_requirements": [ + "herbs2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Tirso[1000]", + "logic": [ + { + "item_requirements": [ + "herbs3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Tirso[2000]", + "logic": [ + { + "item_requirements": [ + "herbs4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Tirso[5000]", + "logic": [ + { + "item_requirements": [ + "herbs5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Tirso[10000]", + "logic": [ + { + "item_requirements": [ + "herbs6" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI56", + "logic": [ + { + "item_requirements": [ + "herbs6", + "canBeatMercyBoss", + "canBeatConventBoss", + "canBeatGrievanceBoss", + "canBeatMothersBoss", + "canBeatCanvasesBoss", + "canBeatPrisonBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RESCUED_CHERUB_08", + "logic": [] + }, + { + "name": "Lvdovico[500]", + "logic": [ + { + "item_requirements": [ + "tentudiaRemains1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Lvdovico[1000]", + "logic": [ + { + "item_requirements": [ + "tentudiaRemains2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "PR03", + "logic": [ + { + "item_requirements": [ + "tentudiaRemains3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI01", + "logic": [] + }, + { + "name": "CO43", + "logic": [] + }, + { + "name": "CO16", + "logic": [] + }, + { + "name": "Sword[D01Z02S06]", + "logic": [] + }, + { + "name": "QI65", + "logic": [] + }, + { + "name": "RB104", + "logic": [] + }, + { + "name": "RB105", + "logic": [] + }, + { + "name": "PR11", + "logic": [ + { + "item_requirements": [ + "marksOfRefuge3", + "cord", + "D06Z01S02[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[250]", + "logic": [ + { + "item_requirements": [ + "bones4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[500]", + "logic": [ + { + "item_requirements": [ + "bones8" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[750]", + "logic": [ + { + "item_requirements": [ + "bones12" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[1000]", + "logic": [ + { + "item_requirements": [ + "bones16" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[1250]", + "logic": [ + { + "item_requirements": [ + "bones20" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[1500]", + "logic": [ + { + "item_requirements": [ + "bones24" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[1750]", + "logic": [ + { + "item_requirements": [ + "bones28" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[2000]", + "logic": [ + { + "item_requirements": [ + "bones32" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[2500]", + "logic": [ + { + "item_requirements": [ + "bones36" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[3000]", + "logic": [ + { + "item_requirements": [ + "bones40" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Undertaker[5000]", + "logic": [ + { + "item_requirements": [ + "bones44" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI201", + "logic": [ + { + "item_requirements": [ + "canBeatOssuaryBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB04", + "logic": [] + }, + { + "name": "CO14", + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CO36", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_10", + "logic": [] + }, + { + "name": "QI06", + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "boots" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB20", + "logic": [ + { + "item_requirements": [ + "redentoRooms3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "HE02", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_38", + "logic": [ + { + "item_requirements": [ + "canCrossGap2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "ruby" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "chargeBeam" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "rangedAttack" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "preciseSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CO30", + "logic": [] + }, + { + "name": "CO03", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_09", + "logic": [] + }, + { + "name": "PR01", + "logic": [] + }, + { + "name": "RB17", + "logic": [] + }, + { + "name": "QI48", + "logic": [] + }, + { + "name": "CO21", + "logic": [] + }, + { + "name": "CO38", + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RESCUED_CHERUB_33", + "logic": [ + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "BS01", + "logic": [ + { + "item_requirements": [ + "canBeatMercyBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI38", + "logic": [] + }, + { + "name": "QI58", + "logic": [] + }, + { + "name": "RB05", + "logic": [] + }, + { + "name": "RB09", + "logic": [] + }, + { + "name": "CO09", + "logic": [] + }, + { + "name": "QI67", + "logic": [ + { + "item_requirements": [ + "dash", + "canWaterJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "PR16", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_13", + "logic": [] + }, + { + "name": "Oil[D01Z05S07]", + "logic": [] + }, + { + "name": "QI12", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_14", + "logic": [] + }, + { + "name": "QI45", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_12", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_11", + "logic": [] + }, + { + "name": "CO41", + "logic": [] + }, + { + "name": "CO32", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_15", + "logic": [] + }, + { + "name": "Lady[D01Z05S22]", + "logic": [] + }, + { + "name": "QI75", + "logic": [] + }, + { + "name": "Sword[D01Z05S24]", + "logic": [] + }, + { + "name": "CO44", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_22", + "logic": [] + }, + { + "name": "Lady[D01Z05S26]", + "logic": [] + }, + { + "name": "RB03", + "logic": [] + }, + { + "name": "QI101", + "logic": [] + }, + { + "name": "CO11", + "logic": [] + }, + { + "name": "QI59", + "logic": [] + }, + { + "name": "RB10", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_23", + "logic": [] + }, + { + "name": "QI20", + "logic": [] + }, + { + "name": "QI68", + "logic": [] + }, + { + "name": "QI07", + "logic": [] + }, + { + "name": "CO19", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_27", + "logic": [] + }, + { + "name": "PR04", + "logic": [ + { + "item_requirements": [ + "driedFlowers" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "HE05", + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap11" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RESCUED_CHERUB_24", + "logic": [] + }, + { + "name": "QI46", + "logic": [] + }, + { + "name": "CO29", + "logic": [] + }, + { + "name": "QI08", + "logic": [] + }, + { + "name": "RB32", + "logic": [] + }, + { + "name": "CO01", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_25", + "logic": [] + }, + { + "name": "RB15", + "logic": [] + }, + { + "name": "RB38", + "logic": [] + }, + { + "name": "CO42", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_31", + "logic": [] + }, + { + "name": "Oil[D02Z02S10]", + "logic": [] + }, + { + "name": "QI53", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_26", + "logic": [] + }, + { + "name": "Lady[D02Z02S12]", + "logic": [] + }, + { + "name": "HE11", + "logic": [] + }, + { + "name": "RB106", + "logic": [] + }, + { + "name": "Amanecida[D02Z02S14]", + "logic": [ + { + "item_requirements": [ + "canBeatGraveyardBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI11", + "logic": [] + }, + { + "name": "RB37", + "logic": [] + }, + { + "name": "RB02", + "logic": [] + }, + { + "name": "CO05", + "logic": [] + }, + { + "name": "RB08", + "logic": [] + }, + { + "name": "CO15", + "logic": [] + }, + { + "name": "HE03", + "logic": [ + { + "item_requirements": [ + "canSurvivePoison1", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Sword[D02Z03S13]", + "logic": [] + }, + { + "name": "Lady[D02Z03S15]", + "logic": [] + }, + { + "name": "RB24", + "logic": [] + }, + { + "name": "QI61", + "logic": [] + }, + { + "name": "BS03", + "logic": [ + { + "item_requirements": [ + "canBeatConventBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI40", + "logic": [] + }, + { + "name": "QI57", + "logic": [ + { + "item_requirements": [ + "emptyThimble" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB107", + "logic": [] + }, + { + "name": "CO13", + "logic": [] + }, + { + "name": "QI47", + "logic": [] + }, + { + "name": "RB22", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_16", + "logic": [] + }, + { + "name": "Amanecida[D03Z01S03]", + "logic": [] + }, + { + "name": "QI63", + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "upwarpSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB13", + "logic": [ + { + "item_requirements": [ + "canBeatPerpetua" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI14", + "logic": [ + { + "item_requirements": [ + "canBeatPerpetua", + "egg" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CO08", + "logic": [] + }, + { + "name": "PR10", + "logic": [] + }, + { + "name": "CO33", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_18", + "logic": [] + }, + { + "name": "QI19", + "logic": [] + }, + { + "name": "CO07", + "logic": [] + }, + { + "name": "QI41", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_17", + "logic": [] + }, + { + "name": "HE06", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_37", + "logic": [] + }, + { + "name": "QI52", + "logic": [] + }, + { + "name": "RB28", + "logic": [ + { + "item_requirements": [ + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI103", + "logic": [] + }, + { + "name": "QI44", + "logic": [ + { + "item_requirements": [ + "canSurvivePoison1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CO12", + "logic": [ + { + "item_requirements": [ + "canSurvivePoison1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RE07", + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RESCUED_CHERUB_19", + "logic": [ + { + "item_requirements": [ + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap11", + "taranto", + "obscureSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI10", + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap11" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap7" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RESCUED_CHERUB_21", + "logic": [ + { + "item_requirements": [ + "blood", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "aubade", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap11", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap11", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap11", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap11", + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap11", + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap11", + "aubade", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap7", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap7", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap7", + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap7", + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap7", + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap7", + "aubade", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RESCUED_CHERUB_20", + "logic": [ + { + "item_requirements": [ + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "lorquiana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "zarabanda" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "tirana" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI13", + "logic": [ + { + "item_requirements": [ + "ceremonyItems3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB06", + "logic": [] + }, + { + "name": "Oil[D03Z03S13]", + "logic": [] + }, + { + "name": "BS04", + "logic": [ + { + "item_requirements": [ + "canBeatGrievanceBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI39", + "logic": [] + }, + { + "name": "CO23", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_35", + "logic": [] + }, + { + "name": "RB14", + "logic": [ + { + "item_requirements": [ + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI37", + "logic": [] + }, + { + "name": "CO39", + "logic": [ + { + "item_requirements": [ + "canClimbOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RESCUED_CHERUB_28", + "logic": [] + }, + { + "name": "RB21", + "logic": [ + { + "item_requirements": [ + "redentoRooms4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Amanecida[D04Z01S04]", + "logic": [ + { + "item_requirements": [ + "canBeatPatioBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI102", + "logic": [] + }, + { + "name": "RE402", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_30", + "logic": [] + }, + { + "name": "CO17", + "logic": [] + }, + { + "name": "CO34", + "logic": [] + }, + { + "name": "CO35", + "logic": [ + { + "item_requirements": [ + "dash", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "dash", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB33", + "logic": [] + }, + { + "name": "CO20", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_29", + "logic": [] + }, + { + "name": "Sword[D04Z02S12]", + "logic": [] + }, + { + "name": "Oil[D04Z02S14]", + "logic": [] + }, + { + "name": "QI60", + "logic": [] + }, + { + "name": "HE01", + "logic": [ + { + "item_requirements": [ + "wallClimb", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "BS05", + "logic": [ + { + "item_requirements": [ + "canBeatMothersBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RE03", + "logic": [] + }, + { + "name": "QI54", + "logic": [ + { + "item_requirements": [ + "redentoRooms5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "HE201", + "logic": [ + { + "item_requirements": [ + "traitorEyes2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "PR201", + "logic": [ + { + "item_requirements": [ + "miriamRooms5", + "dash", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CO18", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_01", + "logic": [] + }, + { + "name": "QI50", + "logic": [ + { + "item_requirements": [ + "canBreakHoles" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CO22", + "logic": [] + }, + { + "name": "RB31", + "logic": [] + }, + { + "name": "PR07", + "logic": [ + { + "item_requirements": [ + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyBounce", + "canCrossGap2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB203", + "logic": [] + }, + { + "name": "CO28", + "logic": [] + }, + { + "name": "RB30", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_02", + "logic": [] + }, + { + "name": "Sword[D05Z01S13]", + "logic": [] + }, + { + "name": "Lady[D05Z01S14]", + "logic": [] + }, + { + "name": "QI62", + "logic": [] + }, + { + "name": "PR15", + "logic": [] + }, + { + "name": "Oil[D05Z01S19]", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_32", + "logic": [ + { + "item_requirements": [ + "blood", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "blood", + "canCrossGap5", + "pillar" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "obscureSkipsAllowed", + "zarabanda" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "obscureSkipsAllowed", + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "obscureSkipsAllowed", + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB301", + "logic": [] + }, + { + "name": "QI64", + "logic": [] + }, + { + "name": "HE07", + "logic": [] + }, + { + "name": "RE05", + "logic": [ + { + "item_requirements": [ + "cherubs20" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "PR05", + "logic": [ + { + "item_requirements": [ + "cherubs38" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CO31", + "logic": [] + }, + { + "name": "BS06", + "logic": [ + { + "item_requirements": [ + "canBeatCanvasesBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI104", + "logic": [ + { + "item_requirements": [ + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB12", + "logic": [] + }, + { + "name": "QI49", + "logic": [] + }, + { + "name": "QI71", + "logic": [] + }, + { + "name": "QI02", + "logic": [ + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI03", + "logic": [] + }, + { + "name": "QI04", + "logic": [ + { + "item_requirements": [ + "canBeatLegionary" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Sword[D06Z01S11]", + "logic": [] + }, + { + "name": "CO06", + "logic": [] + }, + { + "name": "PR12", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_36", + "logic": [] + }, + { + "name": "CO40", + "logic": [ + { + "item_requirements": [ + "wallClimb", + "canCrossGap10" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canClimbOnRoot", + "blood" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canClimbOnRoot", + "preciseSkipsAllowed", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canClimbOnRoot", + "preciseSkipsAllowed", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "canClimbOnRoot", + "doubleJump", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "HE04", + "logic": [] + }, + { + "name": "Lady[D06Z01S24]", + "logic": [] + }, + { + "name": "BS16", + "logic": [ + { + "item_requirements": [ + "canBeatRooftopsBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "PR08", + "logic": [] + }, + { + "name": "BS12", + "logic": [ + { + "item_requirements": [ + "holyWounds3", + "canBeatBridgeBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "PR09", + "logic": [ + { + "item_requirements": [ + "holyWounds3", + "canBeatBridgeBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "HE101", + "logic": [] + }, + { + "name": "QI105", + "logic": [] + }, + { + "name": "LaudesBossTrigger[30000]", + "logic": [ + { + "item_requirements": [ + "canBeatHallBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Amanecida[D09Z01S01]", + "logic": [ + { + "item_requirements": [ + "canBeatWallBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI51", + "logic": [] + }, + { + "name": "RB11", + "logic": [] + }, + { + "name": "BS14", + "logic": [ + { + "item_requirements": [ + "canBeatPrisonBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RESCUED_CHERUB_05", + "logic": [] + }, + { + "name": "QI72", + "logic": [] + }, + { + "name": "RB16", + "logic": [] + }, + { + "name": "QI70", + "logic": [] + }, + { + "name": "CO27", + "logic": [] + }, + { + "name": "Oil[D09Z01S12]", + "logic": [] + }, + { + "name": "CO10", + "logic": [] + }, + { + "name": "QI69", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_03", + "logic": [] + }, + { + "name": "CO24", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_34", + "logic": [] + }, + { + "name": "CO26", + "logic": [] + }, + { + "name": "CO02", + "logic": [ + { + "item_requirements": [ + "blood", + "canClimbOnRoot", + "canSurvivePoison2", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CO37", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_04", + "logic": [ + { + "item_requirements": [ + "canSurvivePoison1", + "dash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "debla" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "taranto" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cante" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "verdiales" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "aubade" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "cantina" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB204", + "logic": [] + }, + { + "name": "RESCUED_CHERUB_06", + "logic": [] + }, + { + "name": "RE401", + "logic": [ + { + "item_requirements": [ + "redentoRooms2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Sword[D17Z01S08]", + "logic": [] + }, + { + "name": "BS13", + "logic": [ + { + "item_requirements": [ + "canBeatBrotherhoodBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "PR203", + "logic": [] + }, + { + "name": "QI204", + "logic": [ + { + "item_requirements": [ + "canBeatBridgeBoss", + "holyWounds3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI301", + "logic": [ + { + "item_requirements": [ + "canBeatRooftopsBoss", + "trueHeart" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RE01", + "logic": [] + }, + { + "name": "CO25", + "logic": [] + }, + { + "name": "RB108", + "logic": [] + }, + { + "name": "RB202", + "logic": [] + }, + { + "name": "RB201", + "logic": [] + }, + { + "name": "BossTrigger[5000]", + "logic": [ + { + "item_requirements": [ + "canBeatMourningBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI202", + "logic": [ + { + "item_requirements": [ + "canBeatMourningBoss" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "PR202", + "logic": [] + }, + { + "name": "QI203", + "logic": [] + }, + { + "name": "QI106", + "logic": [] + }, + { + "name": "RB18", + "logic": [] + }, + { + "name": "RB19", + "logic": [ + { + "item_requirements": [ + "redWax1", + "D02Z03S18[SE]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "redWax1", + "D02Z03S07[NW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB25", + "logic": [] + }, + { + "name": "RB26", + "logic": [] + }, + { + "name": "QI107", + "logic": [ + { + "item_requirements": [ + "amanecidaRooms1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI108", + "logic": [ + { + "item_requirements": [ + "amanecidaRooms2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI109", + "logic": [ + { + "item_requirements": [ + "amanecidaRooms3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI110", + "logic": [ + { + "item_requirements": [ + "amanecidaRooms4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "PR101", + "logic": [ + { + "item_requirements": [ + "amanecidaRooms4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI32", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI33", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI34", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI35", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI79", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI80", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms6" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "QI81", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms7" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Arena_NailManager[1000]", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms1" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "HE10", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms2" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Arena_NailManager[3000]", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB34", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms4" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "Arena_NailManager[5000]", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB35", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms6" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RB36", + "logic": [ + { + "item_requirements": [ + "guiltBead", + "guiltRooms7" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "COMBO_1", + "logic": [ + { + "item_requirements": [ + "swordRooms1", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "COMBO_2", + "logic": [ + { + "item_requirements": [ + "swordRooms2", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "COMBO_3", + "logic": [ + { + "item_requirements": [ + "swordRooms4", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CHARGED_1", + "logic": [ + { + "item_requirements": [ + "swordRooms1", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CHARGED_2", + "logic": [ + { + "item_requirements": [ + "swordRooms3", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "CHARGED_3", + "logic": [ + { + "item_requirements": [ + "swordRooms6", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RANGED_1", + "logic": [ + { + "item_requirements": [ + "swordRooms2", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RANGED_2", + "logic": [ + { + "item_requirements": [ + "swordRooms5", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "RANGED_3", + "logic": [ + { + "item_requirements": [ + "swordRooms7", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "VERTICAL_1", + "logic": [ + { + "item_requirements": [ + "swordRooms1", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "VERTICAL_2", + "logic": [ + { + "item_requirements": [ + "swordRooms3", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "VERTICAL_3", + "logic": [ + { + "item_requirements": [ + "swordRooms6", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "LUNGE_1", + "logic": [ + { + "item_requirements": [ + "swordRooms1", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "LUNGE_2", + "logic": [ + { + "item_requirements": [ + "swordRooms2", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "LUNGE_3", + "logic": [ + { + "item_requirements": [ + "swordRooms4", + "tears0" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + } +] +transitions = [ + { + "name": "D01Z01S01[W]", + "logic": [] + }, + { + "name": "D01Z01S01[E]", + "logic": [] + }, + { + "name": "D01Z01S01[S]", + "logic": [] + }, + { + "name": "D01Z01S02[W]", + "logic": [] + }, + { + "name": "D01Z01S02[E]", + "logic": [] + }, + { + "name": "D01Z01S03[W]", + "logic": [] + }, + { + "name": "D01Z01S03[E]", + "logic": [] + }, + { + "name": "D01Z01S07[W]", + "logic": [] + }, + { + "name": "D01Z01S07[E]", + "logic": [] + }, + { + "name": "D01Z02S01[W]", + "logic": [] + }, + { + "name": "D01Z02S01[E]", + "logic": [] + }, + { + "name": "D01Z02S02[SW]", + "logic": [] + }, + { + "name": "D01Z02S02[SE]", + "logic": [] + }, + { + "name": "D01Z02S02[W]", + "logic": [] + }, + { + "name": "D01Z02S02[E]", + "logic": [] + }, + { + "name": "D01Z02S02[NE]", + "logic": [] + }, + { + "name": "D01Z02S03[W]", + "logic": [] + }, + { + "name": "D01Z02S03[NW]", + "logic": [] + }, + { + "name": "D01Z02S03[E]", + "logic": [] + }, + { + "name": "D01Z02S03[church]", + "logic": [] + }, + { + "name": "D01Z02S04[W]", + "logic": [] + }, + { + "name": "D01Z02S04[E]", + "logic": [] + }, + { + "name": "D01Z02S04[Ossary]", + "logic": [] + }, + { + "name": "D01Z02S05[W]", + "logic": [] + }, + { + "name": "D01Z02S05[E]", + "logic": [] + }, + { + "name": "D01Z02S06[W]", + "logic": [] + }, + { + "name": "D01Z02S06[E]", + "logic": [] + }, + { + "name": "D01Z02S07[E]", + "logic": [] + }, + { + "name": "D01BZ04S01[church]", + "logic": [] + }, + { + "name": "D01BZ06S01[Ossary]", + "logic": [] + }, + { + "name": "D01BZ06S01[E]", + "logic": [] + }, + { + "name": "D01BZ08S01[W]", + "logic": [] + }, + { + "name": "D01Z03S01[W]", + "logic": [] + }, + { + "name": "D01Z03S01[E]", + "logic": [] + }, + { + "name": "D01Z03S01[SE]", + "logic": [] + }, + { + "name": "D01Z03S02[W]", + "logic": [] + }, + { + "name": "D01Z03S02[SW]", + "logic": [] + }, + { + "name": "D01Z03S02[E]", + "logic": [] + }, + { + "name": "D01Z03S02[S]", + "logic": [] + }, + { + "name": "D01Z03S03[W]", + "logic": [] + }, + { + "name": "D01Z03S03[E]", + "logic": [] + }, + { + "name": "D01Z03S03[-Cherubs]", + "logic": [] + }, + { + "name": "D01Z03S04[SW]", + "logic": [] + }, + { + "name": "D01Z03S04[W]", + "logic": [] + }, + { + "name": "D01Z03S04[NW]", + "logic": [] + }, + { + "name": "D01Z03S04[SE]", + "logic": [] + }, + { + "name": "D01Z03S04[E]", + "logic": [] + }, + { + "name": "D01Z03S05[W]", + "logic": [] + }, + { + "name": "D01Z03S05[E]", + "logic": [] + }, + { + "name": "D01Z03S05[Cherubs]", + "logic": [] + }, + { + "name": "D01Z03S06[W]", + "logic": [] + }, + { + "name": "D01Z03S06[E]", + "logic": [] + }, + { + "name": "D01Z03S07[E]", + "logic": [] + }, + { + "name": "D01Z03S07[-Cherubs]", + "logic": [] + }, + { + "name": "D01Z04S01[NW]", + "logic": [] + }, + { + "name": "D01Z04S01[NE]", + "logic": [] + }, + { + "name": "D01Z04S01[W]", + "logic": [] + }, + { + "name": "D01Z04S01[E]", + "logic": [] + }, + { + "name": "D01Z04S01[SE]", + "logic": [] + }, + { + "name": "D01Z04S01[S]", + "logic": [] + }, + { + "name": "D01Z04S02[W]", + "logic": [] + }, + { + "name": "D01Z04S03[E]", + "logic": [] + }, + { + "name": "D01Z04S05[NW]", + "logic": [] + }, + { + "name": "D01Z04S05[SW]", + "logic": [] + }, + { + "name": "D01Z04S06[E]", + "logic": [] + }, + { + "name": "D01Z04S06[NW]", + "logic": [] + }, + { + "name": "D01Z04S06[SW]", + "logic": [] + }, + { + "name": "D01Z04S07[W]", + "logic": [] + }, + { + "name": "D01Z04S08[E]", + "logic": [] + }, + { + "name": "D01Z04S09[W]", + "logic": [] + }, + { + "name": "D01Z04S09[E]", + "logic": [] + }, + { + "name": "D01Z04S09[C]", + "logic": [] + }, + { + "name": "D01Z04S10[NW]", + "logic": [] + }, + { + "name": "D01Z04S10[SW]", + "logic": [] + }, + { + "name": "D01Z04S10[SE]", + "logic": [] + }, + { + "name": "D01Z04S11[NE]", + "logic": [] + }, + { + "name": "D01Z04S12[NW]", + "logic": [] + }, + { + "name": "D01Z04S12[W]", + "logic": [] + }, + { + "name": "D01Z04S12[SE]", + "logic": [] + }, + { + "name": "D01Z04S13[NW]", + "logic": [] + }, + { + "name": "D01Z04S13[NE]", + "logic": [] + }, + { + "name": "D01Z04S13[SW]", + "logic": [] + }, + { + "name": "D01Z04S13[SE]", + "logic": [ + { + "item_requirements": [ + "D01Z04S16[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "canAirStall" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "wheel" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canDiveLaser", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "D01Z04S14[E]", + "logic": [] + }, + { + "name": "D01Z04S15[N]", + "logic": [] + }, + { + "name": "D01Z04S15[NE]", + "logic": [] + }, + { + "name": "D01Z04S15[W]", + "logic": [] + }, + { + "name": "D01Z04S15[E]", + "logic": [] + }, + { + "name": "D01Z04S15[SW]", + "logic": [] + }, + { + "name": "D01Z04S15[SE]", + "logic": [] + }, + { + "name": "D01Z04S16[W]", + "logic": [] + }, + { + "name": "D01Z04S16[E]", + "logic": [] + }, + { + "name": "D01Z04S17[W]", + "logic": [] + }, + { + "name": "D01Z04S18[W]", + "logic": [] + }, + { + "name": "D01Z04S18[E]", + "logic": [] + }, + { + "name": "D01Z04S19[W]", + "logic": [] + }, + { + "name": "D01Z04S19[E]", + "logic": [] + }, + { + "name": "D01BZ02S01[C]", + "logic": [] + }, + { + "name": "D01Z05S01[N]", + "logic": [] + }, + { + "name": "D01Z05S01[W]", + "logic": [] + }, + { + "name": "D01Z05S01[S]", + "logic": [] + }, + { + "name": "D01Z05S02[N]", + "logic": [] + }, + { + "name": "D01Z05S02[W]", + "logic": [] + }, + { + "name": "D01Z05S02[E]", + "logic": [] + }, + { + "name": "D01Z05S02[S]", + "logic": [] + }, + { + "name": "D01Z05S03[NW]", + "logic": [] + }, + { + "name": "D01Z05S03[NE]", + "logic": [] + }, + { + "name": "D01Z05S03[W]", + "logic": [] + }, + { + "name": "D01Z05S03[E]", + "logic": [] + }, + { + "name": "D01Z05S03[S]", + "logic": [] + }, + { + "name": "D01Z05S04[W]", + "logic": [] + }, + { + "name": "D01Z05S04[E]", + "logic": [] + }, + { + "name": "D01Z05S05[N]", + "logic": [] + }, + { + "name": "D01Z05S05[NW]", + "logic": [] + }, + { + "name": "D01Z05S05[NE]", + "logic": [] + }, + { + "name": "D01Z05S05[SW]", + "logic": [] + }, + { + "name": "D01Z05S05[E]", + "logic": [] + }, + { + "name": "D01Z05S06[W]", + "logic": [] + }, + { + "name": "D01Z05S07[E]", + "logic": [] + }, + { + "name": "D01Z05S08[W]", + "logic": [] + }, + { + "name": "D01Z05S09[NW]", + "logic": [] + }, + { + "name": "D01Z05S09[SE]", + "logic": [] + }, + { + "name": "D01Z05S10[W]", + "logic": [] + }, + { + "name": "D01Z05S10[NE]", + "logic": [] + }, + { + "name": "D01Z05S10[SE]", + "logic": [] + }, + { + "name": "D01Z05S10[S]", + "logic": [] + }, + { + "name": "D01Z05S11[W]", + "logic": [] + }, + { + "name": "D01Z05S12[W]", + "logic": [] + }, + { + "name": "D01Z05S12[E]", + "logic": [] + }, + { + "name": "D01Z05S13[SW]", + "logic": [] + }, + { + "name": "D01Z05S13[N]", + "logic": [] + }, + { + "name": "D01Z05S13[E]", + "logic": [] + }, + { + "name": "D01Z05S14[W]", + "logic": [] + }, + { + "name": "D01Z05S14[N]", + "logic": [] + }, + { + "name": "D01Z05S14[SE]", + "logic": [] + }, + { + "name": "D01Z05S15[W]", + "logic": [] + }, + { + "name": "D01Z05S15[SW]", + "logic": [] + }, + { + "name": "D01Z05S15[SE]", + "logic": [] + }, + { + "name": "D01Z05S16[N]", + "logic": [] + }, + { + "name": "D01Z05S16[SW]", + "logic": [] + }, + { + "name": "D01Z05S16[SE]", + "logic": [] + }, + { + "name": "D01Z05S17[W]", + "logic": [] + }, + { + "name": "D01Z05S17[E]", + "logic": [] + }, + { + "name": "D01Z05S18[E]", + "logic": [] + }, + { + "name": "D01Z05S19[W]", + "logic": [] + }, + { + "name": "D01Z05S19[E]", + "logic": [] + }, + { + "name": "D01Z05S20[W]", + "logic": [] + }, + { + "name": "D01Z05S20[N]", + "logic": [] + }, + { + "name": "D01Z05S21[W]", + "logic": [] + }, + { + "name": "D01Z05S21[E]", + "logic": [] + }, + { + "name": "D01Z05S21[Reward]", + "logic": [] + }, + { + "name": "D01Z05S22[E]", + "logic": [] + }, + { + "name": "D01Z05S23[W]", + "logic": [] + }, + { + "name": "D01Z05S23[E]", + "logic": [] + }, + { + "name": "D01Z05S24[W]", + "logic": [] + }, + { + "name": "D01Z05S24[E]", + "logic": [] + }, + { + "name": "D01Z05S25[NE]", + "logic": [] + }, + { + "name": "D01Z05S25[W]", + "logic": [] + }, + { + "name": "D01Z05S25[E]", + "logic": [ + { + "item_requirements": [ + "D01Z05S21[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "tirana", + "obscureSkipsAllowed", + "linen" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "tirana", + "obscureSkipsAllowed", + "D01Z05S23[E]", + "canWalkOnRoot" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "tirana", + "obscureSkipsAllowed", + "D01Z05S23[E]", + "canCrossGap3" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "D01Z05S25[SW]", + "logic": [] + }, + { + "name": "D01Z05S25[SE]", + "logic": [] + }, + { + "name": "D01Z05S25[EchoesW]", + "logic": [] + }, + { + "name": "D01Z05S25[EchoesE]", + "logic": [] + }, + { + "name": "D01Z05S26[W]", + "logic": [] + }, + { + "name": "D01Z05S27[E]", + "logic": [] + }, + { + "name": "D01BZ05S01[Reward]", + "logic": [] + }, + { + "name": "D01BZ09S01[W]", + "logic": [] + }, + { + "name": "D01Z06S01[N]", + "logic": [] + }, + { + "name": "D01Z06S01[Santos]", + "logic": [] + }, + { + "name": "D01BZ07S01[Santos]", + "logic": [] + }, + { + "name": "D02Z01S01[SW]", + "logic": [] + }, + { + "name": "D02Z01S01[W]", + "logic": [] + }, + { + "name": "D02Z01S01[SE]", + "logic": [] + }, + { + "name": "D02Z01S02[W]", + "logic": [] + }, + { + "name": "D02Z01S02[NW]", + "logic": [] + }, + { + "name": "D02Z01S02[E]", + "logic": [] + }, + { + "name": "D02Z01S02[NE]", + "logic": [] + }, + { + "name": "D02Z01S02[]", + "logic": [] + }, + { + "name": "D02Z01S03[SW]", + "logic": [] + }, + { + "name": "D02Z01S03[W]", + "logic": [] + }, + { + "name": "D02Z01S03[SE]", + "logic": [] + }, + { + "name": "D02Z01S04[E]", + "logic": [] + }, + { + "name": "D02Z01S04[-N]", + "logic": [] + }, + { + "name": "D02Z01S05[E]", + "logic": [] + }, + { + "name": "D02Z01S06[W]", + "logic": [] + }, + { + "name": "D02Z01S06[E]", + "logic": [] + }, + { + "name": "D02Z01S08[E]", + "logic": [] + }, + { + "name": "D02Z01S09[W]", + "logic": [] + }, + { + "name": "D02Z01S09[-CherubsL]", + "logic": [] + }, + { + "name": "D02Z01S09[-CherubsR]", + "logic": [] + }, + { + "name": "D02Z02S01[W]", + "logic": [] + }, + { + "name": "D02Z02S01[NW]", + "logic": [] + }, + { + "name": "D02Z02S01[E]", + "logic": [] + }, + { + "name": "D02Z02S02[SE]", + "logic": [] + }, + { + "name": "D02Z02S02[NW]", + "logic": [] + }, + { + "name": "D02Z02S02[NE]", + "logic": [] + }, + { + "name": "D02Z02S02[-CherubsR]", + "logic": [] + }, + { + "name": "D02Z02S03[SW]", + "logic": [] + }, + { + "name": "D02Z02S03[NW]", + "logic": [] + }, + { + "name": "D02Z02S03[NE]", + "logic": [] + }, + { + "name": "D02Z02S03[-Cherubs]", + "logic": [] + }, + { + "name": "D02Z02S04[W]", + "logic": [] + }, + { + "name": "D02Z02S04[SE]", + "logic": [] + }, + { + "name": "D02Z02S04[E]", + "logic": [] + }, + { + "name": "D02Z02S04[NE]", + "logic": [] + }, + { + "name": "D02Z02S04[-CherubsL]", + "logic": [] + }, + { + "name": "D02Z02S05[SW]", + "logic": [] + }, + { + "name": "D02Z02S05[W]", + "logic": [ + { + "item_requirements": [ + "D02Z02S04[NE]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyBounce" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "D02Z02S05[SE]", + "logic": [] + }, + { + "name": "D02Z02S05[E]", + "logic": [] + }, + { + "name": "D02Z02S05[NW]", + "logic": [] + }, + { + "name": "D02Z02S05[-CherubsL]", + "logic": [] + }, + { + "name": "D02Z02S05[-CherubsR]", + "logic": [] + }, + { + "name": "D02Z02S06[E]", + "logic": [] + }, + { + "name": "D02Z02S07[W]", + "logic": [] + }, + { + "name": "D02Z02S07[E]", + "logic": [] + }, + { + "name": "D02Z02S08[W]", + "logic": [] + }, + { + "name": "D02Z02S08[E]", + "logic": [] + }, + { + "name": "D02Z02S08[C]", + "logic": [] + }, + { + "name": "D02Z02S09[E]", + "logic": [] + }, + { + "name": "D02Z02S10[W]", + "logic": [] + }, + { + "name": "D02Z02S11[W]", + "logic": [] + }, + { + "name": "D02Z02S11[SE]", + "logic": [] + }, + { + "name": "D02Z02S11[E]", + "logic": [] + }, + { + "name": "D02Z02S11[NW]", + "logic": [] + }, + { + "name": "D02Z02S11[NE]", + "logic": [] + }, + { + "name": "D02Z02S11[-Cherubs]", + "logic": [] + }, + { + "name": "D02Z02S12[W]", + "logic": [] + }, + { + "name": "D02Z02S13[W]", + "logic": [] + }, + { + "name": "D02Z02S14[W]", + "logic": [] + }, + { + "name": "D02Z02S14[-Cherubs]", + "logic": [] + }, + { + "name": "D02BZ02S01[C]", + "logic": [] + }, + { + "name": "D02Z03S01[W]", + "logic": [] + }, + { + "name": "D02Z03S01[E]", + "logic": [] + }, + { + "name": "D02Z03S02[S]", + "logic": [] + }, + { + "name": "D02Z03S02[W]", + "logic": [] + }, + { + "name": "D02Z03S02[NW]", + "logic": [] + }, + { + "name": "D02Z03S02[NE]", + "logic": [] + }, + { + "name": "D02Z03S02[N]", + "logic": [] + }, + { + "name": "D02Z03S03[W]", + "logic": [] + }, + { + "name": "D02Z03S03[NW]", + "logic": [] + }, + { + "name": "D02Z03S03[E]", + "logic": [] + }, + { + "name": "D02Z03S05[S]", + "logic": [] + }, + { + "name": "D02Z03S05[E]", + "logic": [] + }, + { + "name": "D02Z03S05[NE]", + "logic": [] + }, + { + "name": "D02Z03S06[W]", + "logic": [] + }, + { + "name": "D02Z03S06[S]", + "logic": [] + }, + { + "name": "D02Z03S07[W]", + "logic": [] + }, + { + "name": "D02Z03S07[NWW]", + "logic": [] + }, + { + "name": "D02Z03S07[NW]", + "logic": [] + }, + { + "name": "D02Z03S07[N]", + "logic": [] + }, + { + "name": "D02Z03S07[E]", + "logic": [] + }, + { + "name": "D02Z03S08[SW]", + "logic": [] + }, + { + "name": "D02Z03S08[W]", + "logic": [] + }, + { + "name": "D02Z03S08[SE]", + "logic": [] + }, + { + "name": "D02Z03S08[E]", + "logic": [] + }, + { + "name": "D02Z03S08[NE]", + "logic": [] + }, + { + "name": "D02Z03S09[W]", + "logic": [] + }, + { + "name": "D02Z03S09[E]", + "logic": [] + }, + { + "name": "D02Z03S10[W]", + "logic": [] + }, + { + "name": "D02Z03S10[-W]", + "logic": [] + }, + { + "name": "D02Z03S10[-Cherubs]", + "logic": [] + }, + { + "name": "D02Z03S11[S]", + "logic": [] + }, + { + "name": "D02Z03S11[W]", + "logic": [] + }, + { + "name": "D02Z03S11[NW]", + "logic": [] + }, + { + "name": "D02Z03S11[E]", + "logic": [] + }, + { + "name": "D02Z03S11[NE]", + "logic": [] + }, + { + "name": "D02Z03S12[E]", + "logic": [] + }, + { + "name": "D02Z03S13[W]", + "logic": [] + }, + { + "name": "D02Z03S14[W]", + "logic": [] + }, + { + "name": "D02Z03S14[E]", + "logic": [] + }, + { + "name": "D02Z03S15[E]", + "logic": [] + }, + { + "name": "D02Z03S16[W]", + "logic": [] + }, + { + "name": "D02Z03S16[N]", + "logic": [] + }, + { + "name": "D02Z03S17[E]", + "logic": [] + }, + { + "name": "D02Z03S18[NW]", + "logic": [] + }, + { + "name": "D02Z03S18[SE]", + "logic": [] + }, + { + "name": "D02Z03S18[NE]", + "logic": [] + }, + { + "name": "D02Z03S19[E]", + "logic": [] + }, + { + "name": "D02Z03S20[W]", + "logic": [] + }, + { + "name": "D02Z03S20[E]", + "logic": [] + }, + { + "name": "D02Z03S21[W]", + "logic": [] + }, + { + "name": "D02Z03S21[E]", + "logic": [] + }, + { + "name": "D02Z03S22[W]", + "logic": [] + }, + { + "name": "D02Z03S23[E]", + "logic": [] + }, + { + "name": "D02Z03S24[E]", + "logic": [] + }, + { + "name": "D03Z01S01[W]", + "logic": [] + }, + { + "name": "D03Z01S01[NE]", + "logic": [] + }, + { + "name": "D03Z01S01[S]", + "logic": [] + }, + { + "name": "D03Z01S01[-Cherubs]", + "logic": [] + }, + { + "name": "D03Z01S02[W]", + "logic": [] + }, + { + "name": "D03Z01S02[E]", + "logic": [] + }, + { + "name": "D03Z01S03[W]", + "logic": [] + }, + { + "name": "D03Z01S03[E]", + "logic": [] + }, + { + "name": "D03Z01S03[SW]", + "logic": [] + }, + { + "name": "D03Z01S03[SE]", + "logic": [] + }, + { + "name": "D03Z01S03[-WestL]", + "logic": [] + }, + { + "name": "D03Z01S03[-WestR]", + "logic": [] + }, + { + "name": "D03Z01S03[-EastL]", + "logic": [] + }, + { + "name": "D03Z01S03[-EastR]", + "logic": [] + }, + { + "name": "D03Z01S04[NW]", + "logic": [] + }, + { + "name": "D03Z01S04[E]", + "logic": [] + }, + { + "name": "D03Z01S05[W]", + "logic": [] + }, + { + "name": "D03Z01S05[E]", + "logic": [] + }, + { + "name": "D03Z01S06[W]", + "logic": [] + }, + { + "name": "D03Z01S06[E]", + "logic": [] + }, + { + "name": "D03Z02S01[W]", + "logic": [] + }, + { + "name": "D03Z02S01[N]", + "logic": [] + }, + { + "name": "D03Z02S02[W]", + "logic": [] + }, + { + "name": "D03Z02S02[E]", + "logic": [] + }, + { + "name": "D03Z02S02[S]", + "logic": [] + }, + { + "name": "D03Z02S03[W]", + "logic": [] + }, + { + "name": "D03Z02S03[E]", + "logic": [] + }, + { + "name": "D03Z02S03[N]", + "logic": [] + }, + { + "name": "D03Z02S03[SE2]", + "logic": [] + }, + { + "name": "D03Z02S03[SW]", + "logic": [] + }, + { + "name": "D03Z02S03[SE]", + "logic": [] + }, + { + "name": "D03Z02S03[SSL]", + "logic": [] + }, + { + "name": "D03Z02S03[SSC]", + "logic": [] + }, + { + "name": "D03Z02S03[SSR]", + "logic": [] + }, + { + "name": "D03Z02S04[NW]", + "logic": [] + }, + { + "name": "D03Z02S04[NE]", + "logic": [] + }, + { + "name": "D03Z02S04[S]", + "logic": [] + }, + { + "name": "D03Z02S05[W]", + "logic": [] + }, + { + "name": "D03Z02S05[E]", + "logic": [] + }, + { + "name": "D03Z02S05[S]", + "logic": [] + }, + { + "name": "D03Z02S06[W]", + "logic": [] + }, + { + "name": "D03Z02S06[N]", + "logic": [] + }, + { + "name": "D03Z02S07[W]", + "logic": [] + }, + { + "name": "D03Z02S07[E]", + "logic": [] + }, + { + "name": "D03Z02S07[N]", + "logic": [] + }, + { + "name": "D03Z02S08[W]", + "logic": [] + }, + { + "name": "D03Z02S08[E]", + "logic": [] + }, + { + "name": "D03Z02S08[N]", + "logic": [] + }, + { + "name": "D03Z02S09[W]", + "logic": [] + }, + { + "name": "D03Z02S09[N]", + "logic": [] + }, + { + "name": "D03Z02S09[S]", + "logic": [] + }, + { + "name": "D03Z02S10[W]", + "logic": [] + }, + { + "name": "D03Z02S10[N]", + "logic": [] + }, + { + "name": "D03Z02S10[S]", + "logic": [] + }, + { + "name": "D03Z02S10[E]", + "logic": [] + }, + { + "name": "D03Z02S10[-Cherubs]", + "logic": [] + }, + { + "name": "D03Z02S11[W]", + "logic": [] + }, + { + "name": "D03Z02S11[E]", + "logic": [] + }, + { + "name": "D03Z02S12[E]", + "logic": [] + }, + { + "name": "D03Z02S13[E]", + "logic": [] + }, + { + "name": "D03Z02S13[-Cherubs]", + "logic": [] + }, + { + "name": "D03Z02S14[E]", + "logic": [] + }, + { + "name": "D03Z02S15[W]", + "logic": [] + }, + { + "name": "D03Z02S15[E]", + "logic": [] + }, + { + "name": "D03Z03S01[W]", + "logic": [] + }, + { + "name": "D03Z03S01[S]", + "logic": [] + }, + { + "name": "D03Z03S01[NL]", + "logic": [] + }, + { + "name": "D03Z03S01[NR]", + "logic": [] + }, + { + "name": "D03Z03S02[W]", + "logic": [] + }, + { + "name": "D03Z03S02[NE]", + "logic": [] + }, + { + "name": "D03Z03S02[E]", + "logic": [] + }, + { + "name": "D03Z03S03[W]", + "logic": [] + }, + { + "name": "D03Z03S03[NE]", + "logic": [] + }, + { + "name": "D03Z03S03[SE]", + "logic": [] + }, + { + "name": "D03Z03S04[NW]", + "logic": [] + }, + { + "name": "D03Z03S04[NE]", + "logic": [] + }, + { + "name": "D03Z03S04[E]", + "logic": [] + }, + { + "name": "D03Z03S04[SW]", + "logic": [] + }, + { + "name": "D03Z03S04[SE]", + "logic": [] + }, + { + "name": "D03Z03S04[-Cherubs]", + "logic": [] + }, + { + "name": "D03Z03S05[NW]", + "logic": [] + }, + { + "name": "D03Z03S05[NE]", + "logic": [] + }, + { + "name": "D03Z03S05[SW]", + "logic": [] + }, + { + "name": "D03Z03S05[SE]", + "logic": [] + }, + { + "name": "D03Z03S06[W]", + "logic": [] + }, + { + "name": "D03Z03S07[NW]", + "logic": [] + }, + { + "name": "D03Z03S07[NE]", + "logic": [] + }, + { + "name": "D03Z03S07[SW]", + "logic": [] + }, + { + "name": "D03Z03S07[E]", + "logic": [] + }, + { + "name": "D03Z03S07[S]", + "logic": [] + }, + { + "name": "D03Z03S08[W]", + "logic": [] + }, + { + "name": "D03Z03S08[-CherubsL]", + "logic": [] + }, + { + "name": "D03Z03S08[-CherubsR]", + "logic": [] + }, + { + "name": "D03Z03S09[SW]", + "logic": [] + }, + { + "name": "D03Z03S09[N]", + "logic": [] + }, + { + "name": "D03Z03S10[E]", + "logic": [] + }, + { + "name": "D03Z03S11[W]", + "logic": [] + }, + { + "name": "D03Z03S11[E]", + "logic": [] + }, + { + "name": "D03Z03S12[W]", + "logic": [] + }, + { + "name": "D03Z03S12[E]", + "logic": [] + }, + { + "name": "D03Z03S13[W]", + "logic": [] + }, + { + "name": "D03Z03S14[W]", + "logic": [] + }, + { + "name": "D03Z03S15[W]", + "logic": [] + }, + { + "name": "D03Z03S15[E]", + "logic": [] + }, + { + "name": "D03Z03S16[W]", + "logic": [] + }, + { + "name": "D03Z03S16[E]", + "logic": [] + }, + { + "name": "D03Z03S17[W]", + "logic": [] + }, + { + "name": "D03Z03S17[E]", + "logic": [] + }, + { + "name": "D03Z03S18[E]", + "logic": [] + }, + { + "name": "D03Z03S19[E]", + "logic": [] + }, + { + "name": "D04Z01S01[W]", + "logic": [] + }, + { + "name": "D04Z01S01[E]", + "logic": [] + }, + { + "name": "D04Z01S01[NE]", + "logic": [] + }, + { + "name": "D04Z01S01[N]", + "logic": [] + }, + { + "name": "D04Z01S02[W]", + "logic": [] + }, + { + "name": "D04Z01S02[NW]", + "logic": [] + }, + { + "name": "D04Z01S02[E]", + "logic": [] + }, + { + "name": "D04Z01S03[W]", + "logic": [] + }, + { + "name": "D04Z01S03[E]", + "logic": [] + }, + { + "name": "D04Z01S03[S]", + "logic": [] + }, + { + "name": "D04Z01S04[W]", + "logic": [] + }, + { + "name": "D04Z01S04[E]", + "logic": [] + }, + { + "name": "D04Z01S05[S]", + "logic": [] + }, + { + "name": "D04Z01S05[N]", + "logic": [] + }, + { + "name": "D04Z01S05[-Cherubs]", + "logic": [] + }, + { + "name": "D04Z01S06[S]", + "logic": [] + }, + { + "name": "D04Z01S06[E]", + "logic": [ + { + "item_requirements": [ + "D09Z01S09[SW]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "D04Z01S06[Cherubs]", + "logic": [] + }, + { + "name": "D04Z02S01[W]", + "logic": [] + }, + { + "name": "D04Z02S01[N]", + "logic": [] + }, + { + "name": "D04Z02S01[E]", + "logic": [] + }, + { + "name": "D04Z02S01[NE]", + "logic": [] + }, + { + "name": "D04Z02S02[S]", + "logic": [] + }, + { + "name": "D04Z02S02[SE]", + "logic": [] + }, + { + "name": "D04Z02S02[NE]", + "logic": [ + { + "item_requirements": [ + "D04Z02S15[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "upwarpSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "doubleJump", + "canEnemyUpslash" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyUpslash", + "upwarpSkipsAllowed", + "wallClimb" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "canEnemyUpslash", + "upwarpSkipsAllowed", + "D06Z01S02[S]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "D04Z02S02[N]", + "logic": [] + }, + { + "name": "D04Z02S03[W]", + "logic": [] + }, + { + "name": "D04Z02S03[E]", + "logic": [] + }, + { + "name": "D04Z02S04[SW]", + "logic": [] + }, + { + "name": "D04Z02S04[SE]", + "logic": [] + }, + { + "name": "D04Z02S04[W]", + "logic": [] + }, + { + "name": "D04Z02S04[E]", + "logic": [] + }, + { + "name": "D04Z02S04[NW]", + "logic": [] + }, + { + "name": "D04Z02S04[NE]", + "logic": [] + }, + { + "name": "D04Z02S04[N]", + "logic": [] + }, + { + "name": "D04Z02S05[W]", + "logic": [] + }, + { + "name": "D04Z02S05[E]", + "logic": [] + }, + { + "name": "D04Z02S06[S]", + "logic": [] + }, + { + "name": "D04Z02S06[NW]", + "logic": [] + }, + { + "name": "D04Z02S06[N]", + "logic": [] + }, + { + "name": "D04Z02S06[NE]", + "logic": [] + }, + { + "name": "D04Z02S06[E]", + "logic": [] + }, + { + "name": "D04Z02S06[-Cherubs]", + "logic": [] + }, + { + "name": "D04Z02S07[SW]", + "logic": [] + }, + { + "name": "D04Z02S07[W]", + "logic": [] + }, + { + "name": "D04Z02S07[N]", + "logic": [] + }, + { + "name": "D04Z02S07[NE]", + "logic": [] + }, + { + "name": "D04Z02S07[SE]", + "logic": [] + }, + { + "name": "D04Z02S08[W]", + "logic": [] + }, + { + "name": "D04Z02S08[E]", + "logic": [] + }, + { + "name": "D04Z02S08[S]", + "logic": [] + }, + { + "name": "D04Z02S09[W]", + "logic": [] + }, + { + "name": "D04Z02S09[E]", + "logic": [] + }, + { + "name": "D04Z02S09[NE]", + "logic": [] + }, + { + "name": "D04Z02S10[W]", + "logic": [] + }, + { + "name": "D04Z02S11[W]", + "logic": [] + }, + { + "name": "D04Z02S11[E]", + "logic": [] + }, + { + "name": "D04Z02S12[W]", + "logic": [] + }, + { + "name": "D04Z02S13[W]", + "logic": [] + }, + { + "name": "D04Z02S14[E]", + "logic": [] + }, + { + "name": "D04Z02S15[W]", + "logic": [] + }, + { + "name": "D04Z02S15[E]", + "logic": [] + }, + { + "name": "D04Z02S16[W]", + "logic": [] + }, + { + "name": "D04Z02S16[-Cherubs]", + "logic": [] + }, + { + "name": "D04Z02S17[W]", + "logic": [] + }, + { + "name": "D04Z02S19[W]", + "logic": [] + }, + { + "name": "D04Z02S19[E]", + "logic": [] + }, + { + "name": "D04Z02S20[W]", + "logic": [] + }, + { + "name": "D04Z02S20[Redento]", + "logic": [] + }, + { + "name": "D04Z02S21[W]", + "logic": [] + }, + { + "name": "D04Z02S21[SE]", + "logic": [] + }, + { + "name": "D04Z02S21[NE]", + "logic": [] + }, + { + "name": "D04Z02S22[W]", + "logic": [] + }, + { + "name": "D04Z02S22[E]", + "logic": [] + }, + { + "name": "D04Z02S23[W]", + "logic": [] + }, + { + "name": "D04Z02S23[SE]", + "logic": [] + }, + { + "name": "D04Z02S23[NE]", + "logic": [] + }, + { + "name": "D04Z02S24[NW]", + "logic": [] + }, + { + "name": "D04Z02S24[SW]", + "logic": [] + }, + { + "name": "D04Z02S24[SE]", + "logic": [] + }, + { + "name": "D04Z02S25[W]", + "logic": [] + }, + { + "name": "D04BZ02S01[Redento]", + "logic": [] + }, + { + "name": "D04Z03S01[W]", + "logic": [] + }, + { + "name": "D04Z03S01[E]", + "logic": [] + }, + { + "name": "D04Z03S02[W]", + "logic": [] + }, + { + "name": "D04Z04S01[W]", + "logic": [] + }, + { + "name": "D04Z04S01[E]", + "logic": [] + }, + { + "name": "D04Z04S02[W]", + "logic": [] + }, + { + "name": "D05Z01S01[W]", + "logic": [] + }, + { + "name": "D05Z01S01[NW]", + "logic": [] + }, + { + "name": "D05Z01S01[E]", + "logic": [] + }, + { + "name": "D05Z01S02[W]", + "logic": [] + }, + { + "name": "D05Z01S02[NW]", + "logic": [] + }, + { + "name": "D05Z01S02[E]", + "logic": [] + }, + { + "name": "D05Z01S03[W]", + "logic": [] + }, + { + "name": "D05Z01S03[E]", + "logic": [] + }, + { + "name": "D05Z01S03[Frontal]", + "logic": [] + }, + { + "name": "D05Z01S04[W]", + "logic": [] + }, + { + "name": "D05Z01S04[E]", + "logic": [] + }, + { + "name": "D05Z01S05[SW]", + "logic": [] + }, + { + "name": "D05Z01S05[E]", + "logic": [] + }, + { + "name": "D05Z01S05[NE]", + "logic": [] + }, + { + "name": "D05Z01S06[W]", + "logic": [] + }, + { + "name": "D05Z01S06[E]", + "logic": [] + }, + { + "name": "D05Z01S07[SW]", + "logic": [] + }, + { + "name": "D05Z01S07[NW]", + "logic": [] + }, + { + "name": "D05Z01S07[E]", + "logic": [] + }, + { + "name": "D05Z01S08[W]", + "logic": [] + }, + { + "name": "D05Z01S08[NW]", + "logic": [] + }, + { + "name": "D05Z01S08[E]", + "logic": [] + }, + { + "name": "D05Z01S08[Health]", + "logic": [] + }, + { + "name": "D05Z01S08[NE]", + "logic": [] + }, + { + "name": "D05Z01S09[W]", + "logic": [] + }, + { + "name": "D05Z01S09[E]", + "logic": [] + }, + { + "name": "D05Z01S10[W]", + "logic": [] + }, + { + "name": "D05Z01S10[NW]", + "logic": [] + }, + { + "name": "D05Z01S10[E]", + "logic": [] + }, + { + "name": "D05Z01S11[SW]", + "logic": [ + { + "item_requirements": [ + "D05Z01S19[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "tirana", + "obscureSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "D05Z01S11[NW]", + "logic": [] + }, + { + "name": "D05Z01S11[NE]", + "logic": [] + }, + { + "name": "D05Z01S11[SE]", + "logic": [] + }, + { + "name": "D05Z01S11[E]", + "logic": [] + }, + { + "name": "D05Z01S12[E]", + "logic": [] + }, + { + "name": "D05Z01S13[E]", + "logic": [] + }, + { + "name": "D05Z01S14[W]", + "logic": [] + }, + { + "name": "D05Z01S15[W]", + "logic": [] + }, + { + "name": "D05Z01S15[E]", + "logic": [] + }, + { + "name": "D05Z01S16[W]", + "logic": [] + }, + { + "name": "D05Z01S17[W]", + "logic": [] + }, + { + "name": "D05Z01S18[W]", + "logic": [] + }, + { + "name": "D05Z01S19[W]", + "logic": [] + }, + { + "name": "D05Z01S19[E]", + "logic": [] + }, + { + "name": "D05Z01S20[W]", + "logic": [] + }, + { + "name": "D05Z01S20[E]", + "logic": [] + }, + { + "name": "D05Z01S20[N]", + "logic": [] + }, + { + "name": "D05Z01S21[SW]", + "logic": [] + }, + { + "name": "D05Z01S21[NW]", + "logic": [] + }, + { + "name": "D05Z01S21[NE]", + "logic": [] + }, + { + "name": "D05Z01S21[-Cherubs]", + "logic": [] + }, + { + "name": "D05Z01S22[FrontalN]", + "logic": [] + }, + { + "name": "D05Z01S22[E]", + "logic": [] + }, + { + "name": "D05Z01S23[E]", + "logic": [] + }, + { + "name": "D05Z01S24[E]", + "logic": [] + }, + { + "name": "D05BZ01S01[FrontalS]", + "logic": [] + }, + { + "name": "D05BZ01S01[FrontalN]", + "logic": [] + }, + { + "name": "D05Z02S01[W]", + "logic": [] + }, + { + "name": "D05Z02S01[E]", + "logic": [] + }, + { + "name": "D05Z02S02[SW]", + "logic": [] + }, + { + "name": "D05Z02S02[NW]", + "logic": [] + }, + { + "name": "D05Z02S02[SE]", + "logic": [] + }, + { + "name": "D05Z02S02[NE]", + "logic": [] + }, + { + "name": "D05Z02S03[W]", + "logic": [] + }, + { + "name": "D05Z02S03[E]", + "logic": [] + }, + { + "name": "D05Z02S04[W]", + "logic": [] + }, + { + "name": "D05Z02S04[E]", + "logic": [] + }, + { + "name": "D05Z02S04[C]", + "logic": [] + }, + { + "name": "D05Z02S05[W]", + "logic": [] + }, + { + "name": "D05Z02S05[E]", + "logic": [] + }, + { + "name": "D05Z02S06[SW]", + "logic": [] + }, + { + "name": "D05Z02S06[NW]", + "logic": [] + }, + { + "name": "D05Z02S06[SE]", + "logic": [] + }, + { + "name": "D05Z02S06[NE]", + "logic": [] + }, + { + "name": "D05Z02S07[W]", + "logic": [] + }, + { + "name": "D05Z02S07[E]", + "logic": [] + }, + { + "name": "D05Z02S08[W]", + "logic": [] + }, + { + "name": "D05Z02S09[W]", + "logic": [] + }, + { + "name": "D05Z02S09[E]", + "logic": [] + }, + { + "name": "D05Z02S10[W]", + "logic": [] + }, + { + "name": "D05Z02S10[E]", + "logic": [] + }, + { + "name": "D05Z02S11[W]", + "logic": [] + }, + { + "name": "D05Z02S12[W]", + "logic": [] + }, + { + "name": "D05Z02S12[E]", + "logic": [] + }, + { + "name": "D05Z02S12[N]", + "logic": [] + }, + { + "name": "D05Z02S13[E]", + "logic": [] + }, + { + "name": "D05Z02S14[W]", + "logic": [] + }, + { + "name": "D05Z02S14[E]", + "logic": [] + }, + { + "name": "D05Z02S15[S]", + "logic": [] + }, + { + "name": "D05Z02S15[E]", + "logic": [] + }, + { + "name": "D05BZ02S01[C]", + "logic": [] + }, + { + "name": "D06Z01S01[SW]", + "logic": [] + }, + { + "name": "D06Z01S01[SE]", + "logic": [] + }, + { + "name": "D06Z01S01[W]", + "logic": [] + }, + { + "name": "D06Z01S01[E]", + "logic": [] + }, + { + "name": "D06Z01S01[NW]", + "logic": [] + }, + { + "name": "D06Z01S01[NE]", + "logic": [] + }, + { + "name": "D06Z01S01[NNW]", + "logic": [] + }, + { + "name": "D06Z01S01[NNE]", + "logic": [] + }, + { + "name": "D06Z01S01[N]", + "logic": [] + }, + { + "name": "D06Z01S01[-Cherubs]", + "logic": [] + }, + { + "name": "D06Z01S02[W]", + "logic": [] + }, + { + "name": "D06Z01S02[E]", + "logic": [] + }, + { + "name": "D06Z01S02[S]", + "logic": [] + }, + { + "name": "D06Z01S03[W]", + "logic": [] + }, + { + "name": "D06Z01S03[E]", + "logic": [] + }, + { + "name": "D06Z01S04[SW]", + "logic": [] + }, + { + "name": "D06Z01S04[W]", + "logic": [] + }, + { + "name": "D06Z01S04[Health]", + "logic": [] + }, + { + "name": "D06Z01S04[NW]", + "logic": [] + }, + { + "name": "D06Z01S04[NE]", + "logic": [] + }, + { + "name": "D06Z01S05[E]", + "logic": [] + }, + { + "name": "D06Z01S06[WW]", + "logic": [] + }, + { + "name": "D06Z01S06[E]", + "logic": [] + }, + { + "name": "D06Z01S06[W]", + "logic": [] + }, + { + "name": "D06Z01S06[EE]", + "logic": [] + }, + { + "name": "D06Z01S07[W]", + "logic": [] + }, + { + "name": "D06Z01S07[E]", + "logic": [] + }, + { + "name": "D06Z01S08[W]", + "logic": [] + }, + { + "name": "D06Z01S08[E]", + "logic": [] + }, + { + "name": "D06Z01S08[N]", + "logic": [ + { + "item_requirements": [ + "D06Z01S13[S]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "wallClimb", + "doubleJump", + "canEnemyBounce", + "preciseSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "D06Z01S09[W]", + "logic": [] + }, + { + "name": "D06Z01S09[E]", + "logic": [] + }, + { + "name": "D06Z01S09[-CherubsL]", + "logic": [] + }, + { + "name": "D06Z01S09[-CherubsR]", + "logic": [] + }, + { + "name": "D06Z01S10[W]", + "logic": [] + }, + { + "name": "D06Z01S10[E]", + "logic": [] + }, + { + "name": "D06Z01S10[-CherubsL]", + "logic": [] + }, + { + "name": "D06Z01S10[-CherubsR]", + "logic": [] + }, + { + "name": "D06Z01S11[W]", + "logic": [] + }, + { + "name": "D06Z01S12[S]", + "logic": [] + }, + { + "name": "D06Z01S12[W]", + "logic": [] + }, + { + "name": "D06Z01S12[E]", + "logic": [] + }, + { + "name": "D06Z01S12[NW]", + "logic": [] + }, + { + "name": "D06Z01S12[NE]", + "logic": [] + }, + { + "name": "D06Z01S12[NE2]", + "logic": [] + }, + { + "name": "D06Z01S13[W]", + "logic": [] + }, + { + "name": "D06Z01S13[E]", + "logic": [] + }, + { + "name": "D06Z01S13[S]", + "logic": [] + }, + { + "name": "D06Z01S14[W]", + "logic": [] + }, + { + "name": "D06Z01S14[E]", + "logic": [] + }, + { + "name": "D06Z01S14[N]", + "logic": [] + }, + { + "name": "D06Z01S15[SW]", + "logic": [] + }, + { + "name": "D06Z01S15[NW]", + "logic": [] + }, + { + "name": "D06Z01S15[NE]", + "logic": [] + }, + { + "name": "D06Z01S16[W]", + "logic": [] + }, + { + "name": "D06Z01S16[E]", + "logic": [] + }, + { + "name": "D06Z01S16[-CherubsL]", + "logic": [] + }, + { + "name": "D06Z01S16[-CherubsR]", + "logic": [] + }, + { + "name": "D06Z01S17[W]", + "logic": [] + }, + { + "name": "D06Z01S17[E]", + "logic": [] + }, + { + "name": "D06Z01S17[-Cherubs]", + "logic": [] + }, + { + "name": "D06Z01S18[E]", + "logic": [] + }, + { + "name": "D06Z01S18[-Cherubs]", + "logic": [] + }, + { + "name": "D06Z01S19[S]", + "logic": [] + }, + { + "name": "D06Z01S19[E]", + "logic": [] + }, + { + "name": "D06Z01S20[W]", + "logic": [] + }, + { + "name": "D06Z01S20[E]", + "logic": [] + }, + { + "name": "D06Z01S21[W]", + "logic": [] + }, + { + "name": "D06Z01S21[E]", + "logic": [] + }, + { + "name": "D06Z01S22[Sword]", + "logic": [] + }, + { + "name": "D06Z01S23[Sword]", + "logic": [] + }, + { + "name": "D06Z01S23[E]", + "logic": [] + }, + { + "name": "D06Z01S23[S]", + "logic": [] + }, + { + "name": "D06Z01S24[W]", + "logic": [] + }, + { + "name": "D06Z01S25[W]", + "logic": [] + }, + { + "name": "D06Z01S25[E]", + "logic": [] + }, + { + "name": "D06Z01S26[W]", + "logic": [] + }, + { + "name": "D07Z01S01[W]", + "logic": [] + }, + { + "name": "D07Z01S01[E]", + "logic": [] + }, + { + "name": "D07Z01S02[W]", + "logic": [] + }, + { + "name": "D07Z01S02[E]", + "logic": [] + }, + { + "name": "D07Z01S03[W]", + "logic": [] + }, + { + "name": "D08Z01S01[W]", + "logic": [] + }, + { + "name": "D08Z01S01[E]", + "logic": [] + }, + { + "name": "D08Z01S02[NE]", + "logic": [] + }, + { + "name": "D08Z01S02[SE]", + "logic": [] + }, + { + "name": "D08Z01S02[-Cherubs]", + "logic": [] + }, + { + "name": "D08Z02S01[W]", + "logic": [] + }, + { + "name": "D08Z02S01[SE]", + "logic": [] + }, + { + "name": "D08Z02S01[E]", + "logic": [] + }, + { + "name": "D08Z02S01[N]", + "logic": [] + }, + { + "name": "D08Z02S02[W]", + "logic": [] + }, + { + "name": "D08Z02S03[W]", + "logic": [] + }, + { + "name": "D08Z02S03[E]", + "logic": [] + }, + { + "name": "D08Z02S03[S]", + "logic": [] + }, + { + "name": "D08Z03S01[W]", + "logic": [] + }, + { + "name": "D08Z03S01[E]", + "logic": [] + }, + { + "name": "D08Z03S02[SW]", + "logic": [] + }, + { + "name": "D08Z03S02[NW]", + "logic": [] + }, + { + "name": "D08Z03S03[W]", + "logic": [] + }, + { + "name": "D08Z03S03[E]", + "logic": [] + }, + { + "name": "D09Z01S01[W]", + "logic": [] + }, + { + "name": "D09Z01S01[E]", + "logic": [] + }, + { + "name": "D09Z01S02[SW]", + "logic": [] + }, + { + "name": "D09Z01S02[NW]", + "logic": [] + }, + { + "name": "D09Z01S02[N]", + "logic": [] + }, + { + "name": "D09Z01S03[W]", + "logic": [] + }, + { + "name": "D09Z01S04[W]", + "logic": [] + }, + { + "name": "D09Z01S04[E]", + "logic": [] + }, + { + "name": "D09Z01S04[S]", + "logic": [] + }, + { + "name": "D09Z01S05[W]", + "logic": [] + }, + { + "name": "D09Z01S05[SE]", + "logic": [] + }, + { + "name": "D09Z01S05[NE]", + "logic": [] + }, + { + "name": "D09Z01S06[-E]", + "logic": [] + }, + { + "name": "D09Z01S06[E]", + "logic": [] + }, + { + "name": "D09Z01S07[SW]", + "logic": [] + }, + { + "name": "D09Z01S07[SE]", + "logic": [] + }, + { + "name": "D09Z01S07[W]", + "logic": [] + }, + { + "name": "D09Z01S07[E]", + "logic": [] + }, + { + "name": "D09Z01S07[NW]", + "logic": [] + }, + { + "name": "D09Z01S07[N]", + "logic": [] + }, + { + "name": "D09Z01S07[NE]", + "logic": [] + }, + { + "name": "D09Z01S08[W]", + "logic": [] + }, + { + "name": "D09Z01S08[S]", + "logic": [] + }, + { + "name": "D09Z01S08[SE]", + "logic": [] + }, + { + "name": "D09Z01S08[NE]", + "logic": [] + }, + { + "name": "D09Z01S09[SW]", + "logic": [] + }, + { + "name": "D09Z01S09[NW]", + "logic": [] + }, + { + "name": "D09Z01S09[E]", + "logic": [] + }, + { + "name": "D09Z01S10[W]", + "logic": [] + }, + { + "name": "D09Z01S11[W]", + "logic": [] + }, + { + "name": "D09Z01S11[E]", + "logic": [] + }, + { + "name": "D09Z01S11[S]", + "logic": [] + }, + { + "name": "D09Z01S12[E]", + "logic": [] + }, + { + "name": "D09Z01S13[E]", + "logic": [] + }, + { + "name": "D17Z01S01[E]", + "logic": [] + }, + { + "name": "D17Z01S02[W]", + "logic": [] + }, + { + "name": "D17Z01S02[E]", + "logic": [] + }, + { + "name": "D17Z01S02[N]", + "logic": [] + }, + { + "name": "D17Z01S03[W]", + "logic": [] + }, + { + "name": "D17Z01S03[E]", + "logic": [] + }, + { + "name": "D17Z01S03[relic]", + "logic": [] + }, + { + "name": "D17Z01S04[W]", + "logic": [] + }, + { + "name": "D17Z01S04[S]", + "logic": [] + }, + { + "name": "D17Z01S04[FrontL]", + "logic": [] + }, + { + "name": "D17Z01S04[N]", + "logic": [] + }, + { + "name": "D17Z01S04[FrontR]", + "logic": [] + }, + { + "name": "D17Z01S05[W]", + "logic": [] + }, + { + "name": "D17Z01S05[E]", + "logic": [] + }, + { + "name": "D17Z01S05[S]", + "logic": [] + }, + { + "name": "D17Z01S06[E]", + "logic": [] + }, + { + "name": "D17Z01S07[SW]", + "logic": [] + }, + { + "name": "D17Z01S07[SE]", + "logic": [] + }, + { + "name": "D17Z01S07[W]", + "logic": [] + }, + { + "name": "D17Z01S07[NW]", + "logic": [] + }, + { + "name": "D17Z01S07[N]", + "logic": [] + }, + { + "name": "D17Z01S08[E]", + "logic": [] + }, + { + "name": "D17Z01S09[E]", + "logic": [] + }, + { + "name": "D17Z01S10[W]", + "logic": [] + }, + { + "name": "D17Z01S10[S]", + "logic": [] + }, + { + "name": "D17Z01S11[W]", + "logic": [] + }, + { + "name": "D17Z01S11[E]", + "logic": [] + }, + { + "name": "D17Z01S12[E]", + "logic": [] + }, + { + "name": "D17Z01S13[W]", + "logic": [] + }, + { + "name": "D17Z01S13[E]", + "logic": [] + }, + { + "name": "D17Z01S14[W]", + "logic": [] + }, + { + "name": "D17Z01S14[E]", + "logic": [] + }, + { + "name": "D17Z01S14[-Cherubs1]", + "logic": [] + }, + { + "name": "D17Z01S14[-Cherubs2]", + "logic": [] + }, + { + "name": "D17Z01S14[-Cherubs3]", + "logic": [] + }, + { + "name": "D17Z01S15[E]", + "logic": [] + }, + { + "name": "D17BZ01S01[relic]", + "logic": [] + }, + { + "name": "D17BZ02S01[FrontL]", + "logic": [] + }, + { + "name": "D17BZ02S01[FrontR]", + "logic": [] + }, + { + "name": "D20Z01S01[W]", + "logic": [] + }, + { + "name": "D20Z01S01[E]", + "logic": [] + }, + { + "name": "D20Z01S01[S]", + "logic": [] + }, + { + "name": "D20Z01S02[W]", + "logic": [] + }, + { + "name": "D20Z01S02[E]", + "logic": [] + }, + { + "name": "D20Z01S03[W]", + "logic": [] + }, + { + "name": "D20Z01S03[N]", + "logic": [] + }, + { + "name": "D20Z01S04[W]", + "logic": [] + }, + { + "name": "D20Z01S04[E]", + "logic": [] + }, + { + "name": "D20Z01S04[N]", + "logic": [] + }, + { + "name": "D20Z01S05[W]", + "logic": [] + }, + { + "name": "D20Z01S05[E]", + "logic": [] + }, + { + "name": "D20Z01S06[NE]", + "logic": [] + }, + { + "name": "D20Z01S06[SE]", + "logic": [] + }, + { + "name": "D20Z01S07[NW]", + "logic": [] + }, + { + "name": "D20Z01S07[NE]", + "logic": [] + }, + { + "name": "D20Z01S07[SE]", + "logic": [] + }, + { + "name": "D20Z01S08[W]", + "logic": [] + }, + { + "name": "D20Z01S09[W]", + "logic": [] + }, + { + "name": "D20Z01S09[E]", + "logic": [] + }, + { + "name": "D20Z01S10[W]", + "logic": [] + }, + { + "name": "D20Z01S10[E]", + "logic": [] + }, + { + "name": "D20Z01S11[W]", + "logic": [] + }, + { + "name": "D20Z01S11[NW]", + "logic": [] + }, + { + "name": "D20Z01S11[NE]", + "logic": [] + }, + { + "name": "D20Z01S11[SE]", + "logic": [] + }, + { + "name": "D20Z01S12[E]", + "logic": [] + }, + { + "name": "D20Z01S13[W]", + "logic": [] + }, + { + "name": "D20Z01S13[E]", + "logic": [] + }, + { + "name": "D20Z01S13[N]", + "logic": [] + }, + { + "name": "D20Z01S14[S]", + "logic": [] + }, + { + "name": "D20Z01S14[E]", + "logic": [] + }, + { + "name": "D20Z02S01[W]", + "logic": [] + }, + { + "name": "D20Z02S01[E]", + "logic": [] + }, + { + "name": "D20Z02S02[W]", + "logic": [] + }, + { + "name": "D20Z02S03[W]", + "logic": [] + }, + { + "name": "D20Z02S03[NE]", + "logic": [] + }, + { + "name": "D20Z02S03[SE]", + "logic": [] + }, + { + "name": "D20Z02S04[W]", + "logic": [] + }, + { + "name": "D20Z02S04[E]", + "logic": [] + }, + { + "name": "D20Z02S05[SW]", + "logic": [] + }, + { + "name": "D20Z02S05[NW]", + "logic": [] + }, + { + "name": "D20Z02S05[E]", + "logic": [] + }, + { + "name": "D20Z02S06[SW]", + "logic": [] + }, + { + "name": "D20Z02S06[SE]", + "logic": [] + }, + { + "name": "D20Z02S06[NW]", + "logic": [] + }, + { + "name": "D20Z02S06[NE]", + "logic": [] + }, + { + "name": "D20Z02S07[W]", + "logic": [] + }, + { + "name": "D20Z02S07[E]", + "logic": [] + }, + { + "name": "D20Z02S08[E]", + "logic": [] + }, + { + "name": "D20Z02S09[W]", + "logic": [] + }, + { + "name": "D20Z02S09[E]", + "logic": [] + }, + { + "name": "D20Z02S10[W]", + "logic": [] + }, + { + "name": "D20Z02S10[E]", + "logic": [] + }, + { + "name": "D20Z02S11[SW]", + "logic": [] + }, + { + "name": "D20Z02S11[NW]", + "logic": [ + { + "item_requirements": [ + "D20Z01S13[E]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "mourningSkipAllowed", + "D20Z02S10[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "mourningSkipAllowed", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "mourningSkipAllowed", + "tirana", + "obscureSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "D20Z02S11[E]", + "logic": [ + { + "item_requirements": [ + "D20Z02S10[W]" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "mourningSkipAllowed", + "D20Z01S13[E]", + "canCrossGap5" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "mourningSkipAllowed", + "doubleJump" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + }, + { + "item_requirements": [ + "mourningSkipAllowed", + "tirana", + "obscureSkipsAllowed" + ], + "location_requirements": [], + "region_requirements": [], + "state_modifiers": [] + } + ] + }, + { + "name": "D20Z02S12[W]", + "logic": [] + }, + { + "name": "D20Z02S12[E]", + "logic": [] + }, + { + "name": "D20Z03S01[W]", + "logic": [] + } +] +transition_to_region_map = { + "D01Z01S01[W]": "D01Z01S01[W]", + "D17Z01S03[E]": "D17Z01S03[E]", + "D01Z01S01[E]": "D01Z01S01[E]", + "D01Z01S03[W]": "D01Z01S03[W]", + "D01Z01S01[S]": "D01Z01S01[S]", + "D01BZ07S01[Santos]": "D01BZ07S01[Santos]", + "D01Z01S02[W]": "D01Z01S02[W]", + "D01Z01S07[E]": "D01Z01S07[E]", + "D01Z06S01[N]": "D01Z06S01[N]", + "D01Z01S02[E]": "D01Z01S02[E]", + "D01Z02S01[W]": "D01Z02S01[W]", + "D01Z01S03[E]": "D01Z01S03[E]", + "D01Z02S02[W]": "D01Z02S02[W]", + "D01Z01S07[W]": "D01Z01S07[W]", + "D17Z01S11[E]": "D17Z01S11[E]", + "D17Z01S03[W]": "D17Z01S11[E]", + "D17BZ01S01[relic]": "D17BZ01S01[relic]", + "D01Z02S01[E]": "D01Z02S01[E]", + "D01Z02S03[W]": "D01Z02S03[W]", + "D01Z02S03[NW]": "D01Z02S03[NW]", + "D01Z02S04[W]": "D01Z02S04[W]", + "D01Z02S06[E]": "D01Z02S06[E]", + "D01Z02S02[SW]": "D01Z02S02[SW]", + "D01Z02S07[E]": "D01Z02S07[E]", + "D01Z02S02[SE]": "D01Z02S02[SE]", + "D01BZ06S01[Ossary]": "D01BZ06S01[Ossary]", + "D01Z05S01[N]": "D01Z05S01[N]", + "D01Z02S02[E]": "D01Z02S02[E]", + "D01Z02S02[NE]": "D01Z02S02[NE]", + "D01Z02S05[W]": "D01Z02S05[W]", + "D01BZ04S01[church]": "D01BZ04S01[church]", + "D02Z02S11[-Cherubs]": "D02Z02S11[-Cherubs]", + "D01Z02S03[E]": "D01Z02S03[E]", + "D01Z03S01[W]": "D01Z03S01[W]", + "D01Z02S03[church]": "D01Z02S03[church]", + "D01Z02S04[E]": "D01Z02S04[E]", + "D01Z05S02[N]": "D01Z05S02[N]", + "D01Z05S01[S]": "D01Z05S02[N]", + "D01Z05S27[E]": "D01Z05S02[N]", + "D01Z05S01[W]": "D01Z05S02[N]", + "D01Z02S04[Ossary]": "D01Z02S04[Ossary]", + "D01BZ08S01[W]": "D01BZ08S01[W]", + "D01Z02S05[E]": "D01Z02S05[E]", + "D01Z03S02[W]": "D01Z03S02[W]", + "D01Z03S02[SW]": "D01Z03S02[SW]", + "D01Z02S06[W]": "D01Z02S06[W]", + "D01BZ06S01[E]": "D01BZ06S01[E]", + "D01Z03S01[E]": "D01Z03S01[E]", + "D01Z03S01[SE]": "D01Z03S01[SE]", + "D01Z03S03[W]": "D01Z03S03[W]", + "D01Z05S05[N]": "D01Z05S05[N]", + "D01Z03S02[E]": "D01Z03S02[E]", + "D01Z03S04[SW]": "D01Z03S04[SW]", + "D01Z03S07[-Cherubs]": "D01Z03S07[-Cherubs]", + "D01Z03S02[S]": "D01Z03S02[S]", + "D01Z05S04[E]": "D01Z05S04[E]", + "D01Z05S06[W]": "D01Z05S06[W]", + "D01Z05S09[NW]": "D01Z05S09[NW]", + "D01Z05S18[E]": "D01Z05S18[E]", + "D01Z03S03[E]": "D01Z03S03[E]", + "D01Z03S05[W]": "D01Z03S05[W]", + "D01Z03S06[W]": "D01Z03S06[W]", + "D01Z03S07[E]": "D01Z03S07[E]", + "D02Z01S01[SE]": "D02Z01S01[SE]", + "D01Z03S04[NW]": "D02Z01S01[SE]", + "D01Z03S03[-Cherubs]": "D01Z03S03[-Cherubs]", + "D01Z05S05[NE]": "D01Z05S05[NE]", + "D01Z03S04[W]": "D01Z03S04[W]", + "D02Z01S02[E]": "D02Z01S02[E]", + "D02Z01S01[W]": "D02Z01S02[E]", + "D02Z01S06[E]": "D02Z01S06[E]", + "D02Z01S09[-CherubsL]": "D02Z01S09[-CherubsL]", + "D02Z01S09[-CherubsR]": "D02Z01S09[-CherubsR]", + "D01Z03S04[SE]": "D01Z03S04[SE]", + "D01Z04S01[NW]": "D01Z04S01[NW]", + "D01Z03S04[E]": "D01Z03S04[E]", + "D08Z01S01[W]": "D08Z01S01[W]", + "D01Z03S05[E]": "D01Z03S05[E]", + "D01Z04S03[E]": "D01Z04S03[E]", + "D01Z04S01[W]": "D01Z04S03[E]", + "D01Z04S17[W]": "D01Z04S03[E]", + "D01Z04S01[NE]": "D01Z04S03[E]", + "D01Z04S05[NW]": "D01Z04S05[NW]", + "D01Z04S05[SW]": "D01Z04S05[SW]", + "D01Z04S15[N]": "D01Z04S15[N]", + "D01Z04S01[S]": "D01Z04S15[N]", + "D01Z03S05[Cherubs]": "D01Z03S05[Cherubs]", + "D01Z05S10[NE]": "D01Z05S10[NE]", + "D01Z03S06[E]": "D01Z03S06[E]", + "D08Z01S02[-Cherubs]": "D08Z01S02[-Cherubs]", + "D08Z02S01[W]": "D08Z02S01[W]", + "D01Z04S01[E]": "D01Z04S01[E]", + "D01Z04S01[SE]": "D01Z04S01[SE]", + "D01Z04S06[NW]": "D01Z04S06[NW]", + "D01Z04S06[SW]": "D01Z04S06[SW]", + "D01Z04S08[E]": "D01Z04S08[E]", + "D01Z04S09[E]": "D01Z04S09[E]", + "D01Z04S15[SW]": "D01Z04S09[E]", + "D01Z04S10[NW]": "D01Z04S09[E]", + "D01Z04S15[SE]": "D01Z04S09[E]", + "D01Z04S10[SE]": "D01Z04S09[E]", + "D01Z04S12[NW]": "D01Z04S09[E]", + "D01Z04S12[SE]": "D01Z04S09[E]", + "D01Z04S13[NW]": "D01Z04S09[E]", + "D01Z04S18[E]": "D01Z04S09[E]", + "D01Z04S12[W]": "D01Z04S09[E]", + "D01Z04S02[W]": "D01Z04S09[E]", + "D01Z04S13[NE]": "D01Z04S09[E]", + "D01Z04S14[E]": "D01Z04S14[E]", + "D01Z04S16[W]": "D01Z04S16[W]", + "D01Z04S06[E]": "D01Z04S06[E]", + "D01Z04S07[W]": "D01Z04S07[W]", + "D01Z04S15[NE]": "D01Z04S15[NE]", + "D01Z04S15[E]": "D01Z04S15[E]", + "D01Z04S09[W]": "D01Z04S09[W]", + "D01Z05S10[SE]": "D01Z05S10[SE]", + "D01Z05S12[W]": "D01Z05S10[SE]", + "D01Z05S10[W]": "D01Z05S10[SE]", + "D01Z05S09[SE]": "D01Z05S10[SE]", + "D01Z04S09[C]": "D01Z04S09[C]", + "D01Z04S10[SW]": "D01Z04S10[SW]", + "D01Z04S11[NE]": "D01Z04S11[NE]", + "D01Z04S19[E]": "D01Z04S19[E]", + "D01Z04S13[SW]": "D01Z04S13[SW]", + "D01Z04S13[SE]": "D01Z04S13[SE]", + "D05Z02S12[W]": "D05Z02S12[W]", + "D01Z04S15[W]": "D01Z04S15[W]", + "D01BZ02S01[C]": "D01BZ02S01[C]", + "D01Z05S12[E]": "D01Z05S12[E]", + "D01Z04S16[E]": "D01Z04S16[E]", + "D05Z02S04[W]": "D05Z02S04[W]", + "D05Z02S12[E]": "D05Z02S04[W]", + "D05Z02S04[E]": "D05Z02S04[W]", + "D05Z02S03[W]": "D05Z02S04[W]", + "D05Z02S15[S]": "D05Z02S15[S]", + "D01Z04S18[W]": "D01Z04S18[W]", + "D01Z05S19[E]": "D01Z05S19[E]", + "D01Z04S19[W]": "D01Z04S19[W]", + "D01Z05S15[SE]": "D01Z05S15[SE]", + "D01Z05S03[NW]": "D01Z05S03[NW]", + "D01Z05S20[N]": "D01Z05S20[N]", + "D03Z01S01[NE]": "D03Z01S01[NE]", + "D01Z05S02[W]": "D01Z05S02[W]", + "D03Z01S02[E]": "D03Z01S02[E]", + "D20Z01S03[N]": "D20Z01S03[N]", + "D01Z05S02[E]": "D01Z05S02[E]", + "D01Z05S04[W]": "D01Z05S04[W]", + "D01Z05S03[NE]": "D01Z05S04[W]", + "D01Z05S13[N]": "D01Z05S04[W]", + "D01Z05S03[S]": "D01Z05S04[W]", + "D01Z05S07[E]": "D01Z05S07[E]", + "D01Z05S08[W]": "D01Z05S08[W]", + "D01Z05S02[S]": "D01Z05S02[S]", + "D01Z05S25[NE]": "D01Z05S25[NE]", + "D01Z05S05[NW]": "D01Z05S05[NW]", + "D01Z05S03[W]": "D01Z05S03[W]", + "D01Z05S03[E]": "D01Z05S03[E]", + "D01Z05S14[W]": "D01Z05S14[W]", + "D01Z05S16[N]": "D01Z05S16[N]", + "D01Z05S13[SW]": "D01Z05S16[N]", + "D01Z05S21[E]": "D01Z05S16[N]", + "D01Z05S16[SW]": "D01Z05S16[N]", + "D01Z05S17[W]": "D01Z05S16[N]", + "D01Z05S16[SE]": "D01Z05S16[N]", + "D01Z05S05[SW]": "D01Z05S05[SW]", + "D01Z05S05[E]": "D01Z05S05[E]", + "D01Z05S11[W]": "D01Z05S11[W]", + "D01Z05S14[N]": "D01Z05S14[N]", + "D01Z05S10[S]": "D01Z05S10[S]", + "D01Z05S13[E]": "D01Z05S13[E]", + "D01Z05S15[W]": "D01Z05S15[W]", + "D01Z05S14[SE]": "D01Z05S14[SE]", + "D01Z05S19[W]": "D01Z05S19[W]", + "D01Z05S22[E]": "D01Z05S22[E]", + "D01Z05S15[SW]": "D01Z05S15[SW]", + "D01Z05S25[E]": "D01Z05S25[E]", + "D01BZ05S01[Reward]": "D01BZ05S01[Reward]", + "D01BZ09S01[W]": "D01BZ09S01[W]", + "D01Z05S17[E]": "D01Z05S17[E]", + "D01Z05S20[W]": "D01Z05S20[W]", + "D01Z05S21[W]": "D01Z05S21[W]", + "D01Z05S23[E]": "D01Z05S23[E]", + "D01Z05S26[W]": "D01Z05S26[W]", + "D03Z03S17[E]": "D03Z03S17[E]", + "D01Z05S25[SW]": "D03Z03S17[E]", + "D20Z01S09[E]": "D20Z01S09[E]", + "D01Z05S25[EchoesW]": "D20Z01S09[E]", + "D20Z01S10[W]": "D20Z01S10[W]", + "D01Z05S25[EchoesE]": "D20Z01S10[W]", + "D01Z05S21[Reward]": "D01Z05S21[Reward]", + "D01Z05S23[W]": "D01Z05S23[W]", + "D20Z01S04[E]": "D20Z01S04[E]", + "D01Z05S24[W]": "D01Z05S24[W]", + "D20Z01S01[S]": "D20Z01S01[S]", + "D20Z01S04[N]": "D20Z01S01[S]", + "D20Z01S05[E]": "D20Z01S01[S]", + "D20Z01S04[W]": "D20Z01S01[S]", + "D20Z01S06[NE]": "D20Z01S01[S]", + "D20Z01S05[W]": "D20Z01S01[S]", + "D20Z01S07[NW]": "D20Z01S01[S]", + "D20Z01S06[SE]": "D20Z01S01[S]", + "D20Z01S07[SE]": "D20Z01S01[S]", + "D20Z01S09[W]": "D20Z01S01[S]", + "D20Z01S08[W]": "D20Z01S01[S]", + "D20Z01S07[NE]": "D20Z01S01[S]", + "D01Z05S24[E]": "D01Z05S24[E]", + "D01Z05S25[W]": "D01Z05S25[W]", + "D03Z03S16[E]": "D03Z03S16[E]", + "D01Z05S25[SE]": "D01Z05S25[SE]", + "D20Z01S11[W]": "D20Z01S11[W]", + "D20Z01S10[E]": "D20Z01S11[W]", + "D20Z01S12[E]": "D20Z01S11[W]", + "D20Z01S11[NW]": "D20Z01S11[W]", + "D20Z01S13[W]": "D20Z01S11[W]", + "D20Z01S11[NE]": "D20Z01S11[W]", + "D20Z02S12[W]": "D20Z01S11[W]", + "D20Z01S11[SE]": "D20Z01S11[W]", + "D20Z01S14[S]": "D20Z01S11[W]", + "D20Z01S13[N]": "D20Z01S11[W]", + "D01Z06S01[Santos]": "D01Z06S01[Santos]", + "D02Z01S01[SW]": "D02Z01S01[SW]", + "D02Z01S02[]": "D02Z01S02[]", + "D02Z01S08[E]": "D02Z01S08[E]", + "D02Z01S03[SE]": "D02Z01S03[SE]", + "D02Z01S02[NW]": "D02Z01S03[SE]", + "D02Z02S01[E]": "D02Z01S03[SE]", + "D02Z01S03[W]": "D02Z01S03[SE]", + "D02Z01S04[E]": "D02Z01S04[E]", + "D02Z01S09[W]": "D02Z01S09[W]", + "D02Z01S02[W]": "D02Z01S02[W]", + "D02Z01S05[E]": "D02Z01S05[E]", + "D02Z02S14[-Cherubs]": "D02Z02S14[-Cherubs]", + "D02Z01S02[NE]": "D02Z01S02[NE]", + "D02Z01S03[SW]": "D02Z01S03[SW]", + "D02Z02S02[SE]": "D02Z02S02[SE]", + "D02Z02S01[NW]": "D02Z02S02[SE]", + "D02Z02S03[-Cherubs]": "D02Z02S03[-Cherubs]", + "D02Z02S08[E]": "D02Z02S08[E]", + "D02Z02S01[W]": "D02Z02S08[E]", + "D02Z01S04[-N]": "D02Z01S04[-N]", + "D02Z01S06[W]": "D02Z01S06[W]", + "D02Z02S02[-CherubsR]": "D02Z02S02[-CherubsR]", + "D02Z02S04[-CherubsL]": "D02Z02S04[-CherubsL]", + "D02Z02S11[SE]": "D02Z02S11[SE]", + "D02BZ02S01[C]": "D02BZ02S01[C]", + "D02Z02S03[SW]": "D02Z02S03[SW]", + "D02Z02S02[NE]": "D02Z02S03[SW]", + "D02Z02S04[SE]": "D02Z02S03[SW]", + "D02Z02S02[NW]": "D02Z02S03[SW]", + "D02Z02S05[-CherubsL]": "D02Z02S05[-CherubsL]", + "D02Z02S05[-CherubsR]": "D02Z02S05[-CherubsR]", + "D02Z02S05[SW]": "D02Z02S05[SW]", + "D02Z02S05[W]": "D02Z02S05[W]", + "D02Z02S09[E]": "D02Z02S09[E]", + "D02Z02S04[W]": "D02Z02S09[E]", + "D02Z02S05[SE]": "D02Z02S05[SE]", + "D02Z02S03[NW]": "D02Z02S05[SE]", + "D02Z02S14[W]": "D02Z02S14[W]", + "D02Z02S04[E]": "D02Z02S04[E]", + "D02Z02S04[NE]": "D02Z02S04[NE]", + "D02Z02S07[E]": "D02Z02S07[E]", + "D02Z02S05[NW]": "D02Z02S07[E]", + "D02Z03S01[E]": "D02Z02S07[E]", + "D02Z02S07[W]": "D02Z02S07[E]", + "D02Z03S08[E]": "D02Z02S07[E]", + "D02Z03S01[W]": "D02Z02S07[E]", + "D02Z03S08[SE]": "D02Z02S07[E]", + "D02Z03S14[W]": "D02Z02S07[E]", + "D02Z03S14[E]": "D02Z02S07[E]", + "D02Z02S11[NW]": "D02Z02S07[E]", + "D02Z03S16[W]": "D02Z02S07[E]", + "D02Z03S08[NE]": "D02Z02S07[E]", + "D02Z03S02[S]": "D02Z02S07[E]", + "D02Z03S16[N]": "D02Z02S07[E]", + "D02Z02S10[W]": "D02Z02S10[W]", + "D02Z02S03[NE]": "D02Z02S03[NE]", + "D02Z02S05[E]": "D02Z02S05[E]", + "D02Z03S10[-Cherubs]": "D02Z03S10[-Cherubs]", + "D02Z02S06[E]": "D02Z02S06[E]", + "D02Z02S08[W]": "D02Z02S08[W]", + "D02Z02S12[W]": "D02Z02S12[W]", + "D02Z02S13[W]": "D02Z02S13[W]", + "D02Z02S08[C]": "D02Z02S08[C]", + "D02Z02S11[W]": "D02Z02S11[W]", + "D02Z02S11[E]": "D02Z02S11[E]", + "D02Z02S11[NE]": "D02Z02S11[NE]", + "D02Z03S07[E]": "D02Z03S07[E]", + "D02Z03S12[E]": "D02Z03S12[E]", + "D02Z03S02[W]": "D02Z03S02[W]", + "D02Z03S03[E]": "D02Z03S02[W]", + "D02Z03S05[E]": "D02Z03S02[W]", + "D02Z03S03[W]": "D02Z03S02[W]", + "D02Z03S05[NE]": "D02Z03S05[NE]", + "D02Z03S03[NW]": "D02Z03S05[NE]", + "D02Z03S02[NW]": "D02Z03S02[NW]", + "D02Z03S20[E]": "D02Z03S20[E]", + "D02Z03S02[NE]": "D02Z03S02[NE]", + "D02Z03S02[N]": "D02Z03S02[N]", + "D02Z03S10[W]": "D02Z03S10[W]", + "D02Z03S11[E]": "D02Z03S10[W]", + "D02Z03S22[W]": "D02Z03S10[W]", + "D02Z03S11[NE]": "D02Z03S10[W]", + "D02Z03S15[E]": "D02Z03S15[E]", + "D02Z03S19[E]": "D02Z03S19[E]", + "D02Z03S07[N]": "D02Z03S07[N]", + "D02Z03S11[S]": "D02Z03S11[S]", + "D02Z03S13[W]": "D02Z03S13[W]", + "D02Z03S21[E]": "D02Z03S21[E]", + "D02Z03S05[S]": "D02Z03S05[S]", + "D02Z03S06[S]": "D02Z03S06[S]", + "D02Z03S08[W]": "D02Z03S08[W]", + "D02Z03S17[E]": "D02Z03S17[E]", + "D02Z03S24[E]": "D02Z03S24[E]", + "D02Z03S06[W]": "D02Z03S06[W]", + "D02Z03S18[SE]": "D02Z03S06[W]", + "D02Z03S09[W]": "D02Z03S09[W]", + "D02Z03S23[E]": "D02Z03S23[E]", + "D02Z03S07[W]": "D02Z03S07[W]", + "D02Z03S07[NWW]": "D02Z03S07[NWW]", + "D02Z03S07[NW]": "D02Z03S07[NW]", + "D02Z03S08[SW]": "D02Z03S08[SW]", + "D02Z03S09[E]": "D02Z03S09[E]", + "D02Z03S21[W]": "D02Z03S21[W]", + "D02Z03S10[-W]": "D02Z03S10[-W]", + "D09Z01S04[W]": "D09Z01S04[W]", + "D02Z03S11[W]": "D02Z03S11[W]", + "D02Z03S11[NW]": "D02Z03S11[NW]", + "D09Z01S06[-E]": "D09Z01S06[-E]", + "D02Z03S18[NW]": "D02Z03S18[NW]", + "D02Z03S18[NE]": "D02Z03S18[NE]", + "D02Z03S20[W]": "D02Z03S20[W]", + "D03Z01S01[W]": "D03Z01S01[W]", + "D03Z01S06[E]": "D03Z01S06[E]", + "D03Z01S02[W]": "D03Z01S06[E]", + "D03Z01S01[S]": "D03Z01S01[S]", + "D20Z01S02[E]": "D20Z01S02[E]", + "D03Z01S01[-Cherubs]": "D03Z01S01[-Cherubs]", + "D03Z02S15[E]": "D03Z02S15[E]", + "D20Z01S02[W]": "D20Z01S02[W]", + "D03Z01S03[E]": "D03Z01S03[E]", + "D03Z01S06[W]": "D03Z01S03[E]", + "D03Z01S03[W]": "D03Z01S03[W]", + "D03Z01S05[E]": "D03Z01S05[E]", + "D03Z01S03[SW]": "D03Z01S03[SW]", + "D03Z01S03[-WestL]": "D03Z01S03[-WestL]", + "D03Z02S02[W]": "D03Z02S02[W]", + "D03Z02S09[N]": "D03Z02S09[N]", + "D03Z02S13[E]": "D03Z02S13[E]", + "D03Z01S03[SE]": "D03Z01S03[SE]", + "D03Z02S01[N]": "D03Z01S03[SE]", + "D03Z01S03[-EastR]": "D03Z01S03[-EastR]", + "D03Z02S02[E]": "D03Z02S02[E]", + "D03Z02S01[W]": "D03Z02S02[E]", + "D03Z01S03[-WestR]": "D03Z01S03[-WestR]", + "D03Z01S03[-EastL]": "D03Z01S03[-EastL]", + "D03Z02S03[N]": "D03Z02S03[N]", + "D03Z02S02[S]": "D03Z02S03[N]", + "D03Z02S04[NW]": "D03Z02S03[N]", + "D03Z02S03[SE2]": "D03Z02S03[N]", + "D03Z02S10[E]": "D03Z02S10[E]", + "D03Z01S04[NW]": "D03Z01S04[NW]", + "D17Z01S07[SE]": "D17Z01S07[SE]", + "D03Z01S05[W]": "D17Z01S07[SE]", + "D17Z01S06[E]": "D17Z01S07[SE]", + "D17Z01S07[W]": "D17Z01S07[SE]", + "D17Z01S09[E]": "D17Z01S07[SE]", + "D17Z01S07[NW]": "D17Z01S07[SE]", + "D03Z01S04[E]": "D03Z01S04[E]", + "D03Z02S10[N]": "D03Z02S10[N]", + "D17Z01S04[S]": "D17Z01S04[S]", + "D17Z01S08[E]": "D17Z01S08[E]", + "D03Z02S05[W]": "D03Z02S05[W]", + "D03Z02S03[E]": "D03Z02S05[W]", + "D03Z02S06[W]": "D03Z02S06[W]", + "D03Z02S07[E]": "D03Z02S07[E]", + "D03Z02S07[N]": "D03Z02S07[N]", + "D03Z03S01[NL]": "D03Z03S01[NL]", + "D03Z02S03[SSL]": "D03Z03S01[NL]", + "D03Z02S03[SSC]": "D03Z03S01[NL]", + "D03Z02S03[SSR]": "D03Z03S01[NL]", + "D03Z03S01[NR]": "D03Z03S01[NL]", + "D03Z02S03[W]": "D03Z02S03[W]", + "D03Z02S03[SW]": "D03Z02S03[SW]", + "D03Z02S08[E]": "D03Z02S08[E]", + "D03Z02S04[NE]": "D03Z02S04[NE]", + "D03Z02S05[S]": "D03Z02S04[NE]", + "D03Z02S11[W]": "D03Z02S04[NE]", + "D03Z02S05[E]": "D03Z02S04[NE]", + "D03Z02S06[N]": "D03Z02S06[N]", + "D03Z02S03[SE]": "D03Z02S03[SE]", + "D03Z02S04[S]": "D03Z02S04[S]", + "D03Z03S12[W]": "D03Z03S12[W]", + "D03Z03S01[S]": "D03Z03S12[W]", + "D03Z03S18[E]": "D03Z03S12[W]", + "D03Z03S01[W]": "D03Z03S12[W]", + "D03Z03S02[W]": "D03Z03S12[W]", + "D03Z03S12[E]": "D03Z03S12[W]", + "D03Z02S15[W]": "D03Z02S15[W]", + "D03Z02S07[W]": "D03Z02S07[W]", + "D03Z02S09[S]": "D03Z02S09[S]", + "D03Z02S08[N]": "D03Z02S09[S]", + "D03Z02S14[E]": "D03Z02S09[S]", + "D03Z02S08[W]": "D03Z02S09[S]", + "D03Z02S10[S]": "D03Z02S10[S]", + "D03Z02S10[-Cherubs]": "D03Z02S10[-Cherubs]", + "D03Z02S12[E]": "D03Z02S12[E]", + "D03Z02S09[W]": "D03Z02S09[W]", + "D03Z02S13[-Cherubs]": "D03Z02S13[-Cherubs]", + "D03Z02S10[W]": "D03Z02S10[W]", + "D03Z02S11[E]": "D03Z02S11[E]", + "D20Z01S01[W]": "D20Z01S01[W]", + "D03Z03S02[NE]": "D03Z03S02[NE]", + "D03Z03S14[W]": "D03Z03S02[NE]", + "D03Z03S02[E]": "D03Z03S02[E]", + "D03Z03S04[NW]": "D03Z03S04[NW]", + "D03Z03S03[NE]": "D03Z03S04[NW]", + "D03Z03S04[SW]": "D03Z03S04[SW]", + "D03Z03S03[W]": "D03Z03S03[W]", + "D03Z03S03[SE]": "D03Z03S03[SE]", + "D03Z03S05[NW]": "D03Z03S05[NW]", + "D03Z03S04[NE]": "D03Z03S05[NW]", + "D03Z03S05[SW]": "D03Z03S05[SW]", + "D03Z03S04[E]": "D03Z03S05[SW]", + "D03Z03S07[SW]": "D03Z03S05[SW]", + "D03Z03S05[SE]": "D03Z03S05[SW]", + "D03Z03S13[W]": "D03Z03S13[W]", + "D03Z03S06[W]": "D03Z03S06[W]", + "D03Z03S04[SE]": "D03Z03S04[SE]", + "D03Z03S04[-Cherubs]": "D03Z03S04[-Cherubs]", + "D03Z03S09[SW]": "D03Z03S09[SW]", + "D03Z03S05[NE]": "D03Z03S05[NE]", + "D03Z03S08[W]": "D03Z03S08[W]", + "D03Z03S09[N]": "D03Z03S09[N]", + "D03Z03S11[W]": "D03Z03S11[W]", + "D03Z03S19[E]": "D03Z03S19[E]", + "D03Z03S07[NW]": "D03Z03S19[E]", + "D03Z03S07[NE]": "D03Z03S07[NE]", + "D03Z03S07[E]": "D03Z03S07[E]", + "D03Z03S08[-CherubsL]": "D03Z03S08[-CherubsL]", + "D03Z03S08[-CherubsR]": "D03Z03S08[-CherubsR]", + "D03Z03S15[W]": "D03Z03S15[W]", + "D03Z03S07[S]": "D03Z03S07[S]", + "D03Z03S10[E]": "D03Z03S10[E]", + "D03Z03S11[E]": "D03Z03S11[E]", + "D03Z03S16[W]": "D03Z03S16[W]", + "D03Z03S15[E]": "D03Z03S15[E]", + "D03Z03S17[W]": "D03Z03S17[W]", + "D04Z01S01[W]": "D04Z01S01[W]", + "D08Z01S01[E]": "D08Z01S01[E]", + "D08Z02S02[W]": "D08Z02S02[W]", + "D08Z02S01[SE]": "D08Z02S02[W]", + "D08Z02S03[S]": "D08Z02S02[W]", + "D08Z02S01[N]": "D08Z02S02[W]", + "D04Z01S01[E]": "D04Z01S01[E]", + "D04Z01S01[NE]": "D04Z01S01[NE]", + "D04Z01S03[W]": "D04Z01S03[W]", + "D04Z01S01[N]": "D04Z01S01[N]", + "D04Z01S05[S]": "D04Z01S01[N]", + "D04Z01S06[S]": "D04Z01S06[S]", + "D04Z01S06[Cherubs]": "D04Z01S06[Cherubs]", + "D04Z01S02[W]": "D04Z01S02[W]", + "D04Z01S02[NW]": "D04Z01S02[NW]", + "D04Z01S05[-Cherubs]": "D04Z01S05[-Cherubs]", + "D08Z02S01[E]": "D08Z02S01[E]", + "D04Z01S02[E]": "D04Z01S02[E]", + "D04Z01S04[W]": "D04Z01S04[W]", + "D05Z01S20[N]": "D05Z01S20[N]", + "D04Z01S03[E]": "D04Z01S03[E]", + "D04Z02S01[W]": "D04Z02S01[W]", + "D06Z01S18[-Cherubs]": "D06Z01S18[-Cherubs]", + "D04Z01S03[S]": "D04Z01S03[S]", + "D05Z01S06[E]": "D05Z01S06[E]", + "D05Z01S20[W]": "D05Z01S06[E]", + "D05Z01S07[NW]": "D05Z01S06[E]", + "D05Z01S20[E]": "D05Z01S06[E]", + "D04Z01S04[E]": "D04Z01S04[E]", + "D04Z02S02[S]": "D04Z02S02[S]", + "D04Z02S03[W]": "D04Z02S03[W]", + "D04Z02S01[NE]": "D04Z02S03[W]", + "D04Z02S04[NW]": "D04Z02S03[W]", + "D04Z02S03[E]": "D04Z02S03[W]", + "D04Z02S19[W]": "D04Z02S03[W]", + "D04Z02S04[NE]": "D04Z02S03[W]", + "D04Z03S01[W]": "D04Z03S01[W]", + "D04Z01S05[N]": "D04Z01S05[N]", + "D09Z01S09[SW]": "D09Z01S09[SW]", + "D04Z01S06[E]": "D04Z01S06[E]", + "D09Z01S07[SW]": "D09Z01S07[SW]", + "D09Z01S09[E]": "D09Z01S07[SW]", + "D09Z01S02[SW]": "D09Z01S07[SW]", + "D09Z01S07[E]": "D09Z01S07[SW]", + "D09Z01S08[SE]": "D09Z01S07[SW]", + "D09Z01S07[W]": "D09Z01S07[SW]", + "D09Z01S10[W]": "D09Z01S07[SW]", + "D09Z01S07[SE]": "D09Z01S07[SW]", + "D09Z01S12[E]": "D09Z01S12[E]", + "D04Z02S01[N]": "D04Z02S01[N]", + "D04Z02S15[W]": "D04Z02S15[W]", + "D04Z02S17[W]": "D04Z02S17[W]", + "D06Z01S02[S]": "D06Z01S02[S]", + "D04Z02S02[N]": "D06Z01S02[S]", + "D06Z01S18[E]": "D06Z01S02[S]", + "D06Z01S02[W]": "D06Z01S02[S]", + "D06Z01S08[W]": "D06Z01S02[S]", + "D06Z01S02[E]": "D06Z01S02[S]", + "D04Z02S01[E]": "D04Z02S01[E]", + "D04Z02S04[W]": "D04Z02S04[W]", + "D04Z02S02[SE]": "D04Z02S02[SE]", + "D04Z02S02[NE]": "D04Z02S02[NE]", + "D04Z02S22[W]": "D04Z02S22[W]", + "D04Z02S05[W]": "D04Z02S05[W]", + "D04Z02S04[E]": "D04Z02S05[W]", + "D05Z01S01[NW]": "D04Z02S05[W]", + "D04Z02S04[SE]": "D04Z02S05[W]", + "D05Z01S02[E]": "D04Z02S05[W]", + "D05Z01S01[W]": "D04Z02S05[W]", + "D05Z01S16[W]": "D04Z02S05[W]", + "D05Z01S01[E]": "D04Z02S05[W]", + "D05Z01S03[E]": "D04Z02S05[W]", + "D05Z01S02[NW]": "D04Z02S05[W]", + "D04Z02S06[S]": "D04Z02S06[S]", + "D04Z02S06[-Cherubs]": "D04Z02S06[-Cherubs]", + "D04Z02S14[E]": "D04Z02S14[E]", + "D04Z03S01[E]": "D04Z03S01[E]", + "D04Z02S04[SW]": "D04Z02S04[SW]", + "D04Z02S07[SW]": "D04Z02S07[SW]", + "D04Z02S07[W]": "D04Z02S07[W]", + "D04Z02S04[N]": "D04Z02S04[N]", + "D04Z02S09[W]": "D04Z02S09[W]", + "D04Z02S06[NE]": "D04Z02S09[W]", + "D04Z02S08[W]": "D04Z02S09[W]", + "D04Z02S09[E]": "D04Z02S09[W]", + "D04Z02S20[W]": "D04Z02S09[W]", + "D04Z02S08[E]": "D04Z02S09[W]", + "D04Z02S10[W]": "D04Z02S10[W]", + "D04Z02S06[E]": "D04Z02S10[W]", + "D04Z02S11[E]": "D04Z02S11[E]", + "D06Z01S23[S]": "D06Z01S23[S]", + "D04Z02S05[E]": "D04Z02S05[E]", + "D04Z02S08[S]": "D04Z02S08[S]", + "D04Z02S13[W]": "D04Z02S13[W]", + "D04Z02S19[E]": "D04Z02S19[E]", + "D04Z02S23[W]": "D04Z02S23[W]", + "D04Z02S06[NW]": "D04Z02S06[NW]", + "D04Z02S21[SE]": "D04Z02S21[SE]", + "D04Z02S06[N]": "D04Z02S06[N]", + "D06Z01S01[-Cherubs]": "D06Z01S01[-Cherubs]", + "D06Z01S20[W]": "D06Z01S20[W]", + "D06Z01S23[E]": "D06Z01S20[W]", + "D06Z01S20[E]": "D06Z01S20[W]", + "D06Z01S04[SW]": "D06Z01S20[W]", + "D06Z01S04[W]": "D06Z01S20[W]", + "D06Z01S03[E]": "D06Z01S20[W]", + "D06Z01S22[Sword]": "D06Z01S22[Sword]", + "D04Z02S16[W]": "D04Z02S16[W]", + "D04Z02S07[N]": "D04Z02S07[N]", + "D04Z02S16[-Cherubs]": "D04Z02S16[-Cherubs]", + "D04Z02S07[NE]": "D04Z02S07[NE]", + "D04Z02S07[SE]": "D04Z02S07[SE]", + "D04Z02S24[NW]": "D04Z02S24[NW]", + "D04Z02S23[SE]": "D04Z02S24[NW]", + "D20Z02S01[E]": "D04Z02S24[NW]", + "D04Z02S24[SW]": "D04Z02S24[NW]", + "D04Z02S25[W]": "D04Z02S24[NW]", + "D04Z02S24[SE]": "D04Z02S24[NW]", + "D20Z02S03[SE]": "D04Z02S24[NW]", + "D20Z02S01[W]": "D04Z02S24[NW]", + "D20Z02S04[E]": "D04Z02S24[NW]", + "D20Z02S03[W]": "D04Z02S24[NW]", + "D04Z04S01[W]": "D04Z04S01[W]", + "D04BZ02S01[Redento]": "D04BZ02S01[Redento]", + "D04Z02S09[NE]": "D04Z02S09[NE]", + "D04Z02S11[W]": "D04Z02S11[W]", + "D04Z02S12[W]": "D04Z02S12[W]", + "D04Z02S22[E]": "D04Z02S22[E]", + "D04Z02S21[W]": "D04Z02S22[E]", + "D04Z02S15[E]": "D04Z02S15[E]", + "D04Z02S20[Redento]": "D04Z02S20[Redento]", + "D04Z02S21[NE]": "D04Z02S21[NE]", + "D04Z02S23[NE]": "D04Z02S23[NE]", + "D04Z04S02[W]": "D04Z04S02[W]", + "D04Z03S02[W]": "D04Z03S02[W]", + "D05BZ01S01[FrontalN]": "D05BZ01S01[FrontalN]", + "D04Z04S01[E]": "D04Z04S01[E]", + "D05Z01S15[E]": "D05Z01S15[E]", + "D05Z01S02[W]": "D05Z01S02[W]", + "D05Z01S21[NE]": "D05Z01S21[NE]", + "D05Z01S04[E]": "D05Z01S04[E]", + "D05BZ01S01[FrontalS]": "D05BZ01S01[FrontalS]", + "D05Z01S03[W]": "D05Z01S03[W]", + "D05Z01S05[E]": "D05Z01S05[E]", + "D05Z01S03[Frontal]": "D05Z01S03[Frontal]", + "D05Z01S22[FrontalN]": "D05Z01S22[FrontalN]", + "D05Z01S04[W]": "D05Z01S04[W]", + "D05Z01S07[E]": "D05Z01S07[E]", + "D05Z01S17[W]": "D05Z01S17[W]", + "D05Z01S05[NE]": "D05Z01S17[W]", + "D05Z01S05[SW]": "D05Z01S05[SW]", + "D05Z01S08[NE]": "D05Z01S08[NE]", + "D05Z01S07[SW]": "D05Z01S08[NE]", + "D05Z01S12[E]": "D05Z01S08[NE]", + "D05Z01S08[NW]": "D05Z01S08[NE]", + "D05Z01S09[W]": "D05Z01S08[NE]", + "D05Z01S08[E]": "D05Z01S08[NE]", + "D05Z01S06[W]": "D05Z01S06[W]", + "D05Z01S24[E]": "D05Z01S06[W]", + "D05Z01S10[E]": "D05Z01S10[E]", + "D05Z01S14[W]": "D05Z01S14[W]", + "D05Z01S08[W]": "D05Z01S08[W]", + "D05Z01S11[NE]": "D05Z01S11[NE]", + "D05Z01S11[E]": "D05Z01S11[E]", + "D05Z01S18[W]": "D05Z01S18[W]", + "D05Z01S08[Health]": "D05Z01S08[Health]", + "D05Z01S09[E]": "D05Z01S09[E]", + "D05Z01S10[W]": "D05Z01S10[W]", + "D05Z01S10[NW]": "D05Z01S10[NW]", + "D05Z01S19[E]": "D05Z01S19[E]", + "D05Z01S23[E]": "D05Z01S23[E]", + "D05Z01S11[NW]": "D05Z01S23[E]", + "D05Z02S01[W]": "D05Z02S01[W]", + "D05Z01S11[SW]": "D05Z01S11[SW]", + "D05Z02S15[E]": "D05Z02S15[E]", + "D05Z01S11[SE]": "D05Z01S11[SE]", + "D05Z02S02[NW]": "D05Z02S02[NW]", + "D05Z01S13[E]": "D05Z01S13[E]", + "D05Z01S15[W]": "D05Z01S15[W]", + "D05Z02S14[E]": "D05Z02S14[E]", + "D05Z01S19[W]": "D05Z01S19[W]", + "D05Z02S12[N]": "D05Z02S12[N]", + "D05Z01S21[SW]": "D05Z01S21[SW]", + "D05Z02S06[NE]": "D05Z02S06[NE]", + "D05Z02S14[W]": "D05Z02S06[NE]", + "D05Z02S06[SW]": "D05Z02S06[NE]", + "D05Z02S05[E]": "D05Z02S06[NE]", + "D05Z02S07[E]": "D05Z02S06[NE]", + "D05Z02S06[NW]": "D05Z02S06[NE]", + "D05Z01S21[NW]": "D05Z01S21[NW]", + "D05Z01S21[-Cherubs]": "D05Z01S21[-Cherubs]", + "D05Z02S06[SE]": "D05Z02S06[SE]", + "D05Z01S22[E]": "D05Z01S22[E]", + "D05Z02S01[E]": "D05Z02S01[E]", + "D05Z02S03[E]": "D05Z02S03[E]", + "D05Z02S05[W]": "D05Z02S05[W]", + "D05Z02S09[W]": "D05Z02S09[W]", + "D05Z02S02[SW]": "D05Z02S02[SW]", + "D05Z02S02[SE]": "D05Z02S02[SE]", + "D05Z02S08[W]": "D05Z02S08[W]", + "D05Z02S02[NE]": "D05Z02S02[NE]", + "D05BZ02S01[C]": "D05BZ02S01[C]", + "D05Z02S04[C]": "D05Z02S04[C]", + "D05Z02S11[W]": "D05Z02S11[W]", + "D05Z02S10[E]": "D05Z02S10[E]", + "D05Z02S07[W]": "D05Z02S07[W]", + "D05Z02S13[E]": "D05Z02S13[E]", + "D05Z02S09[E]": "D05Z02S09[E]", + "D05Z02S10[W]": "D05Z02S10[W]", + "D06Z01S01[SW]": "D06Z01S01[SW]", + "D06Z01S14[E]": "D06Z01S01[SW]", + "D06Z01S01[SE]": "D06Z01S01[SW]", + "D06Z01S03[W]": "D06Z01S01[SW]", + "D06Z01S08[E]": "D06Z01S01[SW]", + "D06Z01S14[W]": "D06Z01S01[SW]", + "D06Z01S12[S]": "D06Z01S01[SW]", + "D06Z01S14[N]": "D06Z01S01[SW]", + "D06Z01S01[W]": "D06Z01S01[W]", + "D06Z01S07[E]": "D06Z01S01[W]", + "D06Z01S01[E]": "D06Z01S01[W]", + "D06Z01S06[WW]": "D06Z01S01[W]", + "D06Z01S12[E]": "D06Z01S01[W]", + "D06Z01S07[W]": "D06Z01S01[W]", + "D06Z01S13[E]": "D06Z01S01[W]", + "D06Z01S12[W]": "D06Z01S01[W]", + "D06Z01S16[-CherubsL]": "D06Z01S16[-CherubsL]", + "D06Z01S16[-CherubsR]": "D06Z01S16[-CherubsR]", + "D06Z01S04[NW]": "D06Z01S04[NW]", + "D06Z01S06[E]": "D06Z01S04[NW]", + "D06Z01S04[NE]": "D06Z01S04[NE]", + "D06Z01S06[W]": "D06Z01S04[NE]", + "D06Z01S15[SW]": "D06Z01S15[SW]", + "D06Z01S01[NW]": "D06Z01S01[NW]", + "D06Z01S16[E]": "D06Z01S01[NW]", + "D06Z01S09[-CherubsL]": "D06Z01S09[-CherubsL]", + "D06Z01S09[-CherubsR]": "D06Z01S09[-CherubsR]", + "D06Z01S12[NE2]": "D06Z01S12[NE2]", + "D06Z01S16[W]": "D06Z01S12[NE2]", + "D06Z01S01[NE]": "D06Z01S01[NE]", + "D06Z01S17[W]": "D06Z01S01[NE]", + "D06Z01S10[-CherubsL]": "D06Z01S10[-CherubsL]", + "D06Z01S10[-CherubsR]": "D06Z01S10[-CherubsR]", + "D06Z01S26[W]": "D06Z01S26[W]", + "D06Z01S17[E]": "D06Z01S26[W]", + "D06Z01S01[NNW]": "D06Z01S01[NNW]", + "D06Z01S12[NE]": "D06Z01S12[NE]", + "D06Z01S01[NNE]": "D06Z01S01[NNE]", + "D06Z01S10[W]": "D06Z01S01[NNE]", + "D06Z01S21[W]": "D06Z01S01[NNE]", + "D06Z01S10[E]": "D06Z01S01[NNE]", + "D06Z01S01[N]": "D06Z01S01[N]", + "D06Z01S25[W]": "D06Z01S25[W]", + "D06Z01S19[E]": "D06Z01S25[W]", + "D06Z01S13[S]": "D06Z01S13[S]", + "D06Z01S09[E]": "D06Z01S09[E]", + "D06Z01S19[S]": "D06Z01S19[S]", + "D06Z01S17[-Cherubs]": "D06Z01S17[-Cherubs]", + "D06Z01S24[W]": "D06Z01S24[W]", + "D06Z01S04[Health]": "D06Z01S04[Health]", + "D06Z01S05[E]": "D06Z01S05[E]", + "D06Z01S12[NW]": "D06Z01S05[E]", + "D06Z01S09[W]": "D06Z01S09[W]", + "D06Z01S06[EE]": "D06Z01S06[EE]", + "D06Z01S11[W]": "D06Z01S11[W]", + "D06Z01S21[E]": "D06Z01S21[E]", + "D06Z01S15[NW]": "D06Z01S21[E]", + "D06Z01S08[N]": "D06Z01S08[N]", + "D09Z01S01[E]": "D09Z01S01[E]", + "D06Z01S13[W]": "D06Z01S13[W]", + "D09Z01S11[E]": "D09Z01S11[E]", + "D06Z01S15[NE]": "D06Z01S15[NE]", + "D07Z01S01[W]": "D07Z01S01[W]", + "D06Z01S23[Sword]": "D06Z01S23[Sword]", + "D06Z01S25[E]": "D06Z01S25[E]", + "D07Z01S02[W]": "D07Z01S02[W]", + "D07Z01S01[E]": "D07Z01S01[E]", + "D07Z01S03[W]": "D07Z01S03[W]", + "D07Z01S02[E]": "D07Z01S03[W]", + "D08Z01S02[NE]": "D08Z01S02[NE]", + "D08Z03S02[NW]": "D08Z03S02[NW]", + "D08Z03S03[E]": "D08Z03S02[NW]", + "D08Z01S02[SE]": "D08Z01S02[SE]", + "D08Z03S01[W]": "D08Z03S01[W]", + "D08Z02S03[W]": "D08Z02S03[W]", + "D08Z03S03[W]": "D08Z03S03[W]", + "D08Z02S03[E]": "D08Z02S03[E]", + "D08Z03S02[SW]": "D08Z03S02[SW]", + "D08Z03S01[E]": "D08Z03S01[E]", + "D09Z01S01[W]": "D09Z01S01[W]", + "D09Z01S02[N]": "D09Z01S02[N]", + "D09Z01S11[S]": "D09Z01S02[N]", + "D09Z01S02[NW]": "D09Z01S02[N]", + "D09Z01S07[NE]": "D09Z01S02[N]", + "D09Z01S04[E]": "D09Z01S04[E]", + "D09Z01S04[S]": "D09Z01S04[S]", + "D09Z01S07[N]": "D09Z01S04[S]", + "D09Z01S08[NE]": "D09Z01S04[S]", + "D09Z01S07[NW]": "D09Z01S04[S]", + "D09Z01S03[W]": "D09Z01S03[W]", + "D09Z01S08[W]": "D09Z01S08[W]", + "D09Z01S13[E]": "D09Z01S13[E]", + "D09Z01S05[W]": "D09Z01S13[E]", + "D09Z01S05[SE]": "D09Z01S05[SE]", + "D09Z01S08[S]": "D09Z01S08[S]", + "D09Z01S05[NE]": "D09Z01S05[NE]", + "D09Z01S06[E]": "D09Z01S06[E]", + "D09Z01S11[W]": "D09Z01S11[W]", + "D09Z01S09[NW]": "D09Z01S09[NW]", + "D17Z01S01[E]": "D17Z01S01[E]", + "D17Z01S05[W]": "D17Z01S05[W]", + "D17Z01S02[E]": "D17Z01S05[W]", + "D17Z01S11[W]": "D17Z01S05[W]", + "D17Z01S05[E]": "D17Z01S05[W]", + "D17Z01S10[S]": "D17Z01S10[S]", + "D17Z01S02[N]": "D17Z01S10[S]", + "D17Z01S02[W]": "D17Z01S02[W]", + "D17Z01S14[-Cherubs1]": "D17Z01S14[-Cherubs1]", + "D17Z01S14[-Cherubs2]": "D17Z01S14[-Cherubs2]", + "D17Z01S14[-Cherubs3]": "D17Z01S14[-Cherubs3]", + "D17Z01S04[N]": "D17Z01S04[N]", + "D17Z01S13[E]": "D17Z01S13[E]", + "D17Z01S10[W]": "D17Z01S13[E]", + "D17Z01S14[E]": "D17Z01S13[E]", + "D17Z01S13[W]": "D17Z01S13[E]", + "D17Z01S03[relic]": "D17Z01S03[relic]", + "D17Z01S04[W]": "D17Z01S04[W]", + "D17Z01S04[FrontL]": "D17Z01S04[FrontL]", + "D17Z01S04[FrontR]": "D17Z01S04[FrontR]", + "D17BZ02S01[FrontR]": "D17Z01S04[FrontR]", + "D17Z01S05[S]": "D17Z01S05[S]", + "D17Z01S07[N]": "D17Z01S07[N]", + "D17Z01S12[E]": "D17Z01S12[E]", + "D17BZ02S01[FrontL]": "D17BZ02S01[FrontL]", + "D17Z01S07[SW]": "D17Z01S07[SW]", + "D17Z01S15[E]": "D17Z01S15[E]", + "D17Z01S14[W]": "D17Z01S14[W]", + "D20Z01S01[E]": "D20Z01S01[E]", + "D20Z01S03[W]": "D20Z01S03[W]", + "D20Z02S11[NW]": "D20Z02S11[NW]", + "D20Z02S11[SW]": "D20Z02S11[SW]", + "D20Z01S13[E]": "D20Z01S13[E]", + "D20Z02S10[W]": "D20Z02S10[W]", + "D20Z02S12[E]": "D20Z02S12[E]", + "D20Z03S01[W]": "D20Z03S01[W]", + "D20Z01S14[E]": "D20Z01S14[E]", + "D20Z02S02[W]": "D20Z02S02[W]", + "D20Z02S05[E]": "D20Z02S05[E]", + "D20Z02S04[W]": "D20Z02S05[E]", + "D20Z02S06[SE]": "D20Z02S05[E]", + "D20Z02S05[SW]": "D20Z02S05[E]", + "D20Z02S03[NE]": "D20Z02S03[NE]", + "D20Z02S06[NE]": "D20Z02S06[NE]", + "D20Z02S05[NW]": "D20Z02S06[NE]", + "D20Z02S07[E]": "D20Z02S06[NE]", + "D20Z02S06[NW]": "D20Z02S06[NE]", + "D20Z02S09[E]": "D20Z02S09[E]", + "D20Z02S06[SW]": "D20Z02S06[SW]", + "D20Z02S10[E]": "D20Z02S10[E]", + "D20Z02S08[E]": "D20Z02S08[E]", + "D20Z02S07[W]": "D20Z02S07[W]", + "D20Z02S09[W]": "D20Z02S09[W]", + "D20Z02S11[E]": "D20Z02S11[E]" +} diff --git a/worlds/blasphemous/test/__init__.py b/worlds/blasphemous/test/__init__.py new file mode 100644 index 000000000000..9f89bd26c879 --- /dev/null +++ b/worlds/blasphemous/test/__init__.py @@ -0,0 +1,7 @@ +from test.bases import WorldTestBase +from .. import BlasphemousWorld + + +class BlasphemousTestBase(WorldTestBase): + game = "Blasphemous" + world: BlasphemousWorld diff --git a/worlds/blasphemous/test/test_background_zones.py b/worlds/blasphemous/test/test_background_zones.py new file mode 100644 index 000000000000..cd93f51766a9 --- /dev/null +++ b/worlds/blasphemous/test/test_background_zones.py @@ -0,0 +1,56 @@ +from . import BlasphemousTestBase +from ..Locations import location_names + + +class BotSSGauntletTest(BlasphemousTestBase): + options = { + "starting_location": "albero", + "wall_climb_shuffle": True, + "dash_shuffle": True + } + + @property + def run_default_tests(self) -> bool: + return False + + def test_botss_gauntlet(self) -> None: + self.assertAccessDependency([location_names["CO25"]], [["Dash Ability", "Wall Climb Ability"]], True) + + +class BackgroundZonesTest(BlasphemousTestBase): + @property + def run_default_tests(self) -> bool: + return False + + def test_dc_shroud(self) -> None: + self.assertAccessDependency([location_names["RB03"]], [["Shroud of Dreamt Sins"]], True) + + def test_wothp_bronze_cells(self) -> None: + bronze_locations = [ + location_names["QI70"], + location_names["RESCUED_CHERUB_03"] + ] + + self.assertAccessDependency(bronze_locations, [["Key of the Secular"]], True) + + def test_wothp_silver_cells(self) -> None: + silver_locations = [ + location_names["CO24"], + location_names["RESCUED_CHERUB_34"], + location_names["CO37"], + location_names["RESCUED_CHERUB_04"] + ] + + self.assertAccessDependency(silver_locations, [["Key of the Scribe"]], True) + + def test_wothp_gold_cells(self) -> None: + gold_locations = [ + location_names["QI51"], + location_names["CO26"], + location_names["CO02"] + ] + + self.assertAccessDependency(gold_locations, [["Key of the Inquisitor"]], True) + + def test_wothp_quirce(self) -> None: + self.assertAccessDependency([location_names["BS14"]], [["Key of the Secular", "Key of the Scribe", "Key of the Inquisitor"]], True) diff --git a/worlds/blasphemous/test/test_starting_locations.py b/worlds/blasphemous/test/test_starting_locations.py new file mode 100644 index 000000000000..9e04d52ef369 --- /dev/null +++ b/worlds/blasphemous/test/test_starting_locations.py @@ -0,0 +1,135 @@ +from . import BlasphemousTestBase + + +class TestBrotherhoodEasy(BlasphemousTestBase): + options = { + "starting_location": "brotherhood", + "difficulty": "easy" + } + + +class TestBrotherhoodNormal(BlasphemousTestBase): + options = { + "starting_location": "brotherhood", + "difficulty": "normal" + } + + +class TestBrotherhoodHard(BlasphemousTestBase): + options = { + "starting_location": "brotherhood", + "difficulty": "hard" + } + + +class TestAlberoEasy(BlasphemousTestBase): + options = { + "starting_location": "albero", + "difficulty": "easy" + } + + +class TestAlberoNormal(BlasphemousTestBase): + options = { + "starting_location": "albero", + "difficulty": "normal" + } + + +class TestAlberoHard(BlasphemousTestBase): + options = { + "starting_location": "albero", + "difficulty": "hard" + } + + +class TestConventEasy(BlasphemousTestBase): + options = { + "starting_location": "convent", + "difficulty": "easy" + } + + +class TestConventNormal(BlasphemousTestBase): + options = { + "starting_location": "convent", + "difficulty": "normal" + } + + +class TestConventHard(BlasphemousTestBase): + options = { + "starting_location": "convent", + "difficulty": "hard" + } + + +class TestGrievanceEasy(BlasphemousTestBase): + options = { + "starting_location": "grievance", + "difficulty": "easy" + } + + +class TestGrievanceNormal(BlasphemousTestBase): + options = { + "starting_location": "grievance", + "difficulty": "normal" + } + + +class TestGrievanceHard(BlasphemousTestBase): + options = { + "starting_location": "grievance", + "difficulty": "hard" + } + + +class TestKnotOfWordsEasy(BlasphemousTestBase): + options = { + "starting_location": "knot_of_words", + "difficulty": "easy" + } + + +class TestKnotOfWordsNormal(BlasphemousTestBase): + options = { + "starting_location": "knot_of_words", + "difficulty": "normal" + } + + +class TestKnotOfWordsHard(BlasphemousTestBase): + options = { + "starting_location": "knot_of_words", + "difficulty": "hard" + } + + +class TestRooftopsEasy(BlasphemousTestBase): + options = { + "starting_location": "rooftops", + "difficulty": "easy" + } + + +class TestRooftopsNormal(BlasphemousTestBase): + options = { + "starting_location": "rooftops", + "difficulty": "normal" + } + + +class TestRooftopsHard(BlasphemousTestBase): + options = { + "starting_location": "rooftops", + "difficulty": "hard" + } + + +# mourning and havoc can't be selected on easy or normal. hard only +class TestMourningHavocHard(BlasphemousTestBase): + options = { + "starting_location": "mourning_havoc", + "difficulty": "hard" + } From eaa81560616099905e226c042d3c8f4635c869ec Mon Sep 17 00:00:00 2001 From: Silvris <58583688+Silvris@users.noreply.github.com> Date: Wed, 21 Aug 2024 09:20:16 -0500 Subject: [PATCH 16/60] MM2: fix Wily 5 Time Stopper rule (#3824) * fix time stopper rule * that was the entirely wrong rule actually --- worlds/mm2/rules.py | 2 ++ worlds/mm2/test/test_weakness.py | 29 ++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/worlds/mm2/rules.py b/worlds/mm2/rules.py index 43d4b5a6aabd..c30688f2adbe 100644 --- a/worlds/mm2/rules.py +++ b/worlds/mm2/rules.py @@ -197,6 +197,8 @@ def set_rules(world: "MM2World") -> None: boss_damage = weapon_boss[boss] weapon_weight = {weapon: (weapon_energy[weapon] / damage) if damage else 0 for weapon, damage in boss_damage.items() if weapon_energy[weapon] > 0} + if boss_damage[8]: + boss_damage[8] = 1.75 * boss_damage[8] if any(boss_damage[i] > 0 for i in range(8)) and 8 in weapon_weight: # We get exactly one use of Time Stopper during the rush # So we want to make sure that use is absolutely needed diff --git a/worlds/mm2/test/test_weakness.py b/worlds/mm2/test/test_weakness.py index d3dc7b686704..c294ce5ac989 100644 --- a/worlds/mm2/test/test_weakness.py +++ b/worlds/mm2/test/test_weakness.py @@ -8,7 +8,6 @@ def validate_wily_5(base: MM2TestBase) -> None: world = base.multiworld.worlds[base.player] weapon_damage = world.weapon_damage - boss_health = {boss: 0x1C for boss in [*list(range(8)), 12]} weapon_costs = { 0: 0, 1: 10, @@ -20,25 +19,37 @@ def validate_wily_5(base: MM2TestBase) -> None: 7: 0.25, 8: 7, } - weapon_energy = {key: float(0x1C * 2) if key == 12 else float(0x1C) for key in weapon_costs} - weapon_boss = {boss: {weapon: weapon_damage[weapon][boss] for weapon in weapon_damage} - for boss in [*list(range(8)), 12]} - flexibility = [(sum(1 if weapon_boss[boss][weapon] > 0 else 0 for weapon in range(9)) * - sum(weapon_boss[boss].values()), boss) for boss in weapon_boss if boss != 12] - for _, boss in [*sorted(flexibility), (0, 12)]: + boss_health = {boss: 0x1C if boss != 12 else 0x1C * 2 for boss in [*range(8), 12]} + weapon_energy = {key: float(0x1C) for key in weapon_costs} + weapon_boss = {boss: {weapon: world.weapon_damage[weapon][boss] for weapon in world.weapon_damage} + for boss in [*range(8), 12]} + flexibility = { + boss: ( + sum(damage_value > 0 for damage_value in + weapon_damages.values()) # Amount of weapons that hit this boss + * sum(weapon_damages.values()) # Overall damage that those weapons do + ) + for boss, weapon_damages in weapon_boss.items() if boss != 12 + } + flexibility = sorted(flexibility, key=flexibility.get) # Fast way to sort dict by value + used_weapons = {i: set() for i in [*range(8), 12]} + for boss in [*flexibility, 12]: boss_damage = weapon_boss[boss] weapon_weight = {weapon: (weapon_energy[weapon] / damage) if damage else 0 for weapon, damage in - boss_damage.items() if weapon_energy[weapon]} + boss_damage.items() if weapon_energy[weapon] > 0} + if boss_damage[8]: + boss_damage[8] = 1.75 * boss_damage[8] if any(boss_damage[i] > 0 for i in range(8)) and 8 in weapon_weight: # We get exactly one use of Time Stopper during the rush # So we want to make sure that use is absolutely needed weapon_weight[8] = min(weapon_weight[8], 0.001) while boss_health[boss] > 0: - if boss_damage[0]: + if boss_damage[0] > 0: boss_health[boss] = 0 # if we can buster, we should buster continue highest, wp = max(zip(weapon_weight.values(), weapon_weight.keys())) uses = weapon_energy[wp] // weapon_costs[wp] + used_weapons[boss].add(wp) if int(uses * boss_damage[wp]) > boss_health[boss]: used = ceil(boss_health[boss] / boss_damage[wp]) weapon_energy[wp] -= weapon_costs[wp] * used From 48c6a6fb4c04f906dcad757c9ec9d1c5cd5a1cbf Mon Sep 17 00:00:00 2001 From: Spineraks Date: Wed, 21 Aug 2024 19:59:21 +0200 Subject: [PATCH 17/60] YachtDice: implement new game (#3482) * Add the yacht dice (from other git) world to the yacht dice fork * Update .gitignore * Removed zillion because it doesn't work * Update .gitignore * added zillion again... * Now you can have 0 extra fragments * Added alt categories, also options * Added item categories * Extra categories are now working! :dog: * changed options and added exceptions * Testing if I change the generate.py * Revert "Testing if I change the generate.py" This reverts commit 7c2b3df6170dcf8d8f36a1de9fcbc9dccdec81f8. * ignore gitignore * Delete .gitignore * Update .gitignore * Update .gitignore * Update logic, added multiplicative categories * Changed difficulties * Update offline mode so that it works again * Adjusted difficulty * New version of the apworld, with 1000 as final score, always Will still need to check difficulty and weights of adding items. Website is not ready yet, so this version is not usable yet :) * Changed yaml and small bug fixes Fix when goal and max are same Options: changed chance to weight * no changes, just whitespaces * changed how logic works Now you put an array of mults and the cpu gets a couple of tries * Changed logic, tweaked a bit too * Preparation for 2.0 * logic tweak * Logic for alt categories properly now * Update setup_en.md * Update en_YachtDice.md * Improve performance of add_distributions * Formatting style * restore gitignore to APMW * Tweaked generation parameters and methods * Version 2.0.3 manual input option max score in logic always 2.0.3 faster gen * Comments and editing * Renamed setup guide * Improved create_items code * init of locations: remove self.event line * Moved setting early items to generate_early * Add my name to CODEOWNERS * Added Yacht Dice to the readme in list of games * Improve performance of Yacht Dice * newline * Improve typing * This is actually just slower lol * Update worlds/yachtdice/Items.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update Options.py * Styling * finished text whichstory option * removed roll and rollfragments; not used * import; worlds not world :) * Option groups! * ruff styling, fix * ruff format styling! * styling and capitalization of options * small comment * Cleaned up the "state_is_a_list" a little bit * RUFF :dog: * Changed filling the itempool for efficiency Now, we start with 17 extra items in the item pool, it's quite likely you need at least 17 items (~80%?). And then afterwards, we delete items if we overshoot the target of 1000, and add items if we haven't reached an achievable score of 1000 yet. Also, no need to recompute the entire logic when adding points. * :dog: * Removed plando "fix" * Changed indent of score multiplier * faster location function * Comments to docstrings * fixed making location closest to goal_score be goal_score * options format * iterate keys and values of a dict together * small optimization ListState * faster collection of categories * return arguments instead of making a list (will :dog: later) * Instead of turning it into a tuple, you can just make a tuple literal * remove .keys() * change .random and used enumerate * some readability improvements * Remove location "0", we don't use that one * Remove lookup_id_to_name entirely I for sure don't use it, and as far as I know it's not one of the mandatory functions for AP, these are item_name_to_id and location_name_to_id. * .append instead of += for single items, percentile function changed Also an extra comment for location ids. * remove ) too many * Removed sorted from category list * Hash categories (which makes it slower :( ) Maybe I messed up or misunderstood... I'll revert this right away since it is 2x slower, probably because of sorted instead of sort? * Revert "Hash categories (which makes it slower :( )" This reverts commit 34f2c1aed8c8813b2d9c58896650b82a810d3578. * temporary push: 40% faster generation test Small changes in logic make the generation 40% faster. I'll have to think about how big the changes are. I suspect they are rather limited. If this is the way to go, I'll remove the temp file and redo the YachtWeights file, I'll remove the functions there and just put the new weights here. * Add Points item category * Reverse changes of bad idea :) * ruff :dog: * Use numpy and pmf function to speed up gen Numpy has a built-in way to sum probability mass functions (pmf). This shaves of 60% of the generation time :D * Revert "Use numpy and pmf function to speed up gen" This reverts commit 9290191cb323ae92321d6c2cfcfe8c27370f439b. * Step inbetween to change the weights * Changed the weights to make it faster 135 -> 81 seconds on 100 random yamls * Adjusted max_dist, split dice_simulation function * Removed nonlocal and pass arguments instead * Change "weight-lists" to Dict[str, float] * Removed the return from ini_locations. Also added explanations to cat_weights * Choice options; dont'use .value (will ruff later) * Only put important options in slotdata * :dog: * Add Dict import * Split the cache per player, limit size to 400. * :dog: * added , because of style * Update apworld version to 2.0.6 2.0.5 is the apworld I released on github to be tested I never separately released 2.0.4. * Multiple smaller code improvements - changed names in YachtWeights so we don't need to translate them in Rules anymore - we now remember which categories are present in the game, and also put this in slotdata. This we do because only one of two categories is present in a game. If for some reason both are present (plando/getitem/startinventory), we now know which category to ignore - * :dog: ruff * Mostly minimize_extra_items improvements - Change logic, generation is now even faster (0.6s per default yaml). - Made the option 'minimize_extra_items' do a lot more, hopefully this makes the impact of Yacht Dice a little bit less, if you want that. Here's what is also does now: - you start with 2 dice and 2 rolls - there will be less locations/items at the start of you game * ruff :dog: * Removed printing options * Reworded some option descriptions --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --- README.md | 1 + docs/CODEOWNERS | 3 + worlds/yachtdice/Items.py | 118 + worlds/yachtdice/Locations.py | 79 + worlds/yachtdice/Options.py | 332 +++ worlds/yachtdice/Rules.py | 239 ++ worlds/yachtdice/YachtWeights.py | 3562 ++++++++++++++++++++++++ worlds/yachtdice/__init__.py | 533 ++++ worlds/yachtdice/docs/en_Yacht Dice.md | 15 + worlds/yachtdice/docs/setup_en.md | 21 + 10 files changed, 4903 insertions(+) create mode 100644 worlds/yachtdice/Items.py create mode 100644 worlds/yachtdice/Locations.py create mode 100644 worlds/yachtdice/Options.py create mode 100644 worlds/yachtdice/Rules.py create mode 100644 worlds/yachtdice/YachtWeights.py create mode 100644 worlds/yachtdice/__init__.py create mode 100644 worlds/yachtdice/docs/en_Yacht Dice.md create mode 100644 worlds/yachtdice/docs/setup_en.md diff --git a/README.md b/README.md index 0d9a41de9f1a..0e57bce53b51 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ Currently, the following games are supported: * Old School Runescape * Kingdom Hearts 1 * Mega Man 2 +* Yacht Dice For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/). Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index 6a3c8f45c174..cd1e859af951 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -202,6 +202,9 @@ # The Witness /worlds/witness/ @NewSoupVi @blastron +# Yacht Dice +/worlds/yachtdice/ @spinerak + # Yoshi's Island /worlds/yoshisisland/ @PinkSwitch diff --git a/worlds/yachtdice/Items.py b/worlds/yachtdice/Items.py new file mode 100644 index 000000000000..fa52c93ad6f2 --- /dev/null +++ b/worlds/yachtdice/Items.py @@ -0,0 +1,118 @@ +import typing + +from BaseClasses import Item, ItemClassification + + +class ItemData(typing.NamedTuple): + code: typing.Optional[int] + classification: ItemClassification + + +class YachtDiceItem(Item): + game: str = "Yacht Dice" + + +# the starting index is chosen semi-randomly to be 16871244000 + + +item_table = { + # victory item, always placed manually at goal location + "Victory": ItemData(16871244000 - 1, ItemClassification.progression), + "Dice": ItemData(16871244000, ItemClassification.progression), + "Dice Fragment": ItemData(16871244001, ItemClassification.progression), + "Roll": ItemData(16871244002, ItemClassification.progression), + "Roll Fragment": ItemData(16871244003, ItemClassification.progression), + "Fixed Score Multiplier": ItemData(16871244005, ItemClassification.progression), + "Step Score Multiplier": ItemData(16871244006, ItemClassification.progression), + "Category Ones": ItemData(16871244103, ItemClassification.progression), + "Category Twos": ItemData(16871244104, ItemClassification.progression), + "Category Threes": ItemData(16871244105, ItemClassification.progression), + "Category Fours": ItemData(16871244106, ItemClassification.progression), + "Category Fives": ItemData(16871244107, ItemClassification.progression), + "Category Sixes": ItemData(16871244108, ItemClassification.progression), + "Category Choice": ItemData(16871244109, ItemClassification.progression), + "Category Inverse Choice": ItemData(16871244110, ItemClassification.progression), + "Category Pair": ItemData(16871244111, ItemClassification.progression), + "Category Three of a Kind": ItemData(16871244112, ItemClassification.progression), + "Category Four of a Kind": ItemData(16871244113, ItemClassification.progression), + "Category Tiny Straight": ItemData(16871244114, ItemClassification.progression), + "Category Small Straight": ItemData(16871244115, ItemClassification.progression), + "Category Large Straight": ItemData(16871244116, ItemClassification.progression), + "Category Full House": ItemData(16871244117, ItemClassification.progression), + "Category Yacht": ItemData(16871244118, ItemClassification.progression), + "Category Distincts": ItemData(16871244123, ItemClassification.progression), + "Category Two times Ones": ItemData(16871244124, ItemClassification.progression), + "Category Half of Sixes": ItemData(16871244125, ItemClassification.progression), + "Category Twos and Threes": ItemData(16871244126, ItemClassification.progression), + "Category Sum of Odds": ItemData(16871244127, ItemClassification.progression), + "Category Sum of Evens": ItemData(16871244128, ItemClassification.progression), + "Category Double Threes and Fours": ItemData(16871244129, ItemClassification.progression), + "Category Quadruple Ones and Twos": ItemData(16871244130, ItemClassification.progression), + "Category Micro Straight": ItemData(16871244131, ItemClassification.progression), + "Category Three Odds": ItemData(16871244132, ItemClassification.progression), + "Category 1-2-1 Consecutive": ItemData(16871244133, ItemClassification.progression), + "Category Three Distinct Dice": ItemData(16871244134, ItemClassification.progression), + "Category Two Pair": ItemData(16871244135, ItemClassification.progression), + "Category 2-1-2 Consecutive": ItemData(16871244136, ItemClassification.progression), + "Category Five Distinct Dice": ItemData(16871244137, ItemClassification.progression), + "Category 4&5 Full House": ItemData(16871244138, ItemClassification.progression), + # filler items + "Encouragement": ItemData(16871244200, ItemClassification.filler), + "Fun Fact": ItemData(16871244201, ItemClassification.filler), + "Story Chapter": ItemData(16871244202, ItemClassification.filler), + "Good RNG": ItemData(16871244203, ItemClassification.filler), + "Bad RNG": ItemData(16871244204, ItemClassification.trap), + "Bonus Point": ItemData(16871244205, ItemClassification.useful), # not included in logic + # These points are included in the logic and might be necessary to progress. + "1 Point": ItemData(16871244301, ItemClassification.progression_skip_balancing), + "10 Points": ItemData(16871244302, ItemClassification.progression), + "100 Points": ItemData(16871244303, ItemClassification.progression), +} + +# item groups for better hinting +item_groups = { + "Score Multiplier": { + "Step Score Multiplier", + "Fixed Score Multiplier" + }, + "Categories": { + "Category Ones", + "Category Twos", + "Category Threes", + "Category Fours", + "Category Fives", + "Category Sixes", + "Category Choice", + "Category Inverse Choice", + "Category Pair", + "Category Three of a Kind", + "Category Four of a Kind", + "Category Tiny Straight", + "Category Small Straight", + "Category Large Straight", + "Category Full House", + "Category Yacht", + "Category Distincts", + "Category Two times Ones", + "Category Half of Sixes", + "Category Twos and Threes", + "Category Sum of Odds", + "Category Sum of Evens", + "Category Double Threes and Fours", + "Category Quadruple Ones and Twos", + "Category Micro Straight", + "Category Three Odds", + "Category 1-2-1 Consecutive", + "Category Three Distinct Dice", + "Category Two Pair", + "Category 2-1-2 Consecutive", + "Category Five Distinct Dice", + "Category 4&5 Full House", + }, + "Points": { + "100 Points", + "10 Points", + "1 Point", + "Bonus Point" + }, +} diff --git a/worlds/yachtdice/Locations.py b/worlds/yachtdice/Locations.py new file mode 100644 index 000000000000..a9a236466fcc --- /dev/null +++ b/worlds/yachtdice/Locations.py @@ -0,0 +1,79 @@ +import typing + +from BaseClasses import Location + + +class LocData(typing.NamedTuple): + id: int + region: str + score: int + + +class YachtDiceLocation(Location): + game: str = "Yacht Dice" + + def __init__(self, player: int, name: str, score: int, address: typing.Optional[int], parent): + super().__init__(player, name, address, parent) + self.yacht_dice_score = score + + +all_locations = {} +starting_index = 16871244500 # 500 more than the starting index for items (not necessary, but this is what it is now) + + +def all_locations_fun(max_score): + """ + Function that is called when this file is loaded, which loads in ALL possible locations, score 1 to 1000 + """ + return {f"{i} score": LocData(starting_index + i, "Board", i) for i in range(1, max_score + 1)} + + +def ini_locations(goal_score, max_score, number_of_locations, dif, skip_early_locations, number_of_players): + """ + function that loads in all locations necessary for the game, so based on options. + will make sure that goal_score and max_score are included locations + """ + scaling = 2 # parameter that determines how many low-score location there are. + # need more low-score locations or lower difficulties: + if dif == 1: + scaling = 3 + elif dif == 2: + scaling = 2.3 + + scores = [] + # the scores follow the function int( 1 + (percentage ** scaling) * (max_score-1) ) + # however, this will have many low values, sometimes repeating. + # to avoid repeating scores, highest_score keeps tracks of the highest score location + # and the next score will always be at least highest_score + 1 + # note that current_score is at most max_score-1 + highest_score = 0 + start_score = 0 + + if skip_early_locations: + scaling = 1.95 + if number_of_players > 2: + scaling = max(1.2, 2.2 - number_of_players * 0.1) + + for i in range(number_of_locations - 1): + percentage = i / number_of_locations + current_score = int(start_score + 1 + (percentage**scaling) * (max_score - start_score - 2)) + if current_score <= highest_score: + current_score = highest_score + 1 + highest_score = current_score + scores += [current_score] + + if goal_score != max_score: + # if the goal score is not in the list, find the closest one and make it the goal. + if goal_score not in scores: + closest_num = min(scores, key=lambda x: abs(x - goal_score)) + scores[scores.index(closest_num)] = goal_score + + scores += [max_score] + + location_table = {f"{score} score": LocData(starting_index + score, "Board", score) for score in scores} + + return location_table + + +# we need to run this function to initialize all scores from 1 to 1000, even though not all are used +all_locations = all_locations_fun(1000) diff --git a/worlds/yachtdice/Options.py b/worlds/yachtdice/Options.py new file mode 100644 index 000000000000..e687936224c3 --- /dev/null +++ b/worlds/yachtdice/Options.py @@ -0,0 +1,332 @@ +from dataclasses import dataclass + +from Options import Choice, OptionGroup, PerGameCommonOptions, Range + + +class GameDifficulty(Choice): + """ + Difficulty. This option determines how difficult the scores are to achieve. + Easy: for beginners. No luck required, just roll the dice and have fun. Lower final goal. + Medium: intended difficulty. If you play smart, you will finish the game without any trouble. + Hard: you will need to play smart and be lucky. + Extreme: really hard mode, which requires many brain wrinkles and insane luck. NOT RECOMMENDED FOR MULTIWORLDS. + """ + + display_name = "Game difficulty" + option_easy = 1 + option_medium = 2 + option_hard = 3 + option_extreme = 4 + default = 2 + + +class ScoreForLastCheck(Range): + """ + The items in the item pool will always allow you to reach a score of 1000. + By default, the last check is also at a score of 1000. + However, you can set the score for the last check to be lower. This will make the game shorter and easier. + """ + + display_name = "Score for last check" + range_start = 500 + range_end = 1000 + default = 1000 + + +class ScoreForGoal(Range): + """ + This option determines what score you need to reach to finish the game. + It cannot be higher than the score for the last check (if it is, this option is changed automatically). + """ + + display_name = "Score for goal" + range_start = 500 + range_end = 1000 + default = 777 + + +class MinimalNumberOfDiceAndRolls(Choice): + """ + The minimal number of dice and rolls in the pool. + These are guaranteed, unlike the later items. + You can never get more than 8 dice and 5 rolls. + You start with one dice and one roll. + """ + + display_name = "Minimal number of dice and rolls in pool" + option_5_dice_and_3_rolls = 2 + option_5_dice_and_5_rolls = 3 + option_6_dice_and_4_rolls = 4 + option_7_dice_and_3_rolls = 5 + option_8_dice_and_2_rolls = 6 + default = 2 + + +class NumberDiceFragmentsPerDice(Range): + """ + Dice can be split into fragments, gathering enough will give you an extra dice. + You start with one dice, and there will always be one full dice in the pool. + The other dice are split into fragments, according to this option. + Setting this to 1 fragment per dice just puts "Dice" objects in the pool. + """ + + display_name = "Number of dice fragments per dice" + range_start = 1 + range_end = 5 + default = 4 + + +class NumberRollFragmentsPerRoll(Range): + """ + Rolls can be split into fragments, gathering enough will give you an extra roll. + You start with one roll, and there will always be one full roll in the pool. + The other three rolls are split into fragments, according to this option. + Setting this to 1 fragment per roll just puts "Roll" objects in the pool. + """ + + display_name = "Number of roll fragments per roll" + range_start = 1 + range_end = 5 + default = 4 + + +class AlternativeCategories(Range): + """ + There are 16 default categories, but there are also 16 alternative categories. + These alternative categories can be randomly selected to replace the default categories. + They are a little strange, but can give a fun new experience. + In the game, you can hover over categories to check what they do. + This option determines the number of alternative categories in your game. + """ + + display_name = "Number of alternative categories" + range_start = 0 + range_end = 16 + default = 0 + + +class ChanceOfDice(Range): + """ + The item pool is always filled in such a way that you can reach a score of 1000. + Extra progression items are added that will help you on your quest. + You can set the weight for each extra progressive item in the following options. + + Of course, more dice = more points! + """ + + display_name = "Weight of adding Dice" + range_start = 0 + range_end = 100 + default = 5 + + +class ChanceOfRoll(Range): + """ + With more rolls, you will be able to reach higher scores. + """ + + display_name = "Weight of adding Roll" + range_start = 0 + range_end = 100 + default = 20 + + +class ChanceOfFixedScoreMultiplier(Range): + """ + Getting a Fixed Score Multiplier will boost all future scores by 10%. + """ + + display_name = "Weight of adding Fixed Score Multiplier" + range_start = 0 + range_end = 100 + default = 30 + + +class ChanceOfStepScoreMultiplier(Range): + """ + The Step Score Multiplier boosts your multiplier after every roll by 1%, and resets on sheet reset. + So, keep high scoring categories for later to get the most out of them. + By default, this item is not included. It is fun however, you just need to know the above strategy. + """ + + display_name = "Weight of adding Step Score Multiplier" + range_start = 0 + range_end = 100 + default = 0 + + +class ChanceOfDoubleCategory(Range): + """ + This option allows categories to appear multiple times. + Each time you get a category after the first, its score value gets doubled. + """ + + display_name = "Weight of adding Category copy" + range_start = 0 + range_end = 100 + default = 50 + + +class ChanceOfPoints(Range): + """ + Are you tired of rolling dice countless times and tallying up points one by one, all by yourself? + Worry not, as this option will simply add some points items to the item pool! + And getting one of these points items gives you... points! + Imagine how nice it would be to find tons of them. Or even better, having others find them FOR you! + """ + + display_name = "Weight of adding Points" + range_start = 0 + range_end = 100 + default = 20 + + +class PointsSize(Choice): + """ + If you choose to add points to the item pool, you can choose to have many small points, + medium-size points, a few larger points, or a mix of them. + """ + + display_name = "Size of points" + option_small = 1 + option_medium = 2 + option_large = 3 + option_mix = 4 + default = 2 + + +class MinimizeExtraItems(Choice): + """ + Besides necessary items, Yacht Dice has extra useful/filler items in the item pool. + It is possible however to decrease the number of locations and extra items. + This option will: + - decrease the number of locations at the start (you'll start with 2 dice and 2 rolls). + - will limit the number of dice/roll fragments per dice/roll to 2. + - in multiplayer games, it will reduce the number of filler items. + """ + + display_name = "Minimize extra items" + option_no_dont = 1 + option_yes_please = 2 + default = 1 + + +class AddExtraPoints(Choice): + """ + Yacht Dice typically has space for extra items. + This option determines if bonus points are put into the item pool. + They make the game a little bit easier, as they are not considered in the logic. + + All Of It: fill all locations with extra points + Sure: put some bonus points in + Never: do not put any bonus points + """ + + display_name = "Extra bonus in the pool" + option_all_of_it = 1 + option_sure = 2 + option_never = 3 + default = 2 + + +class AddStoryChapters(Choice): + """ + Yacht Dice typically has space for more items. + This option determines if extra story chapters are put into the item pool. + Note: if you have extra points on "all_of_it", there will not be story chapters. + + All Of It: fill all locations with story chapters + Sure: if there is space left, put in 10 story chapters. + Never: do not put any story chapters in, I do not like reading (but I am glad you are reading THIS!) + """ + + display_name = "Extra story chapters in the pool" + option_all_of_it = 1 + option_sure = 2 + option_never = 3 + default = 3 + + +class WhichStory(Choice): + """ + The most important part of Yacht Dice is the narrative. + Of course you will need to add story chapters to the item pool. + You can read story chapters in the feed on the website and there are several stories to choose from. + """ + + display_name = "Story" + option_the_quest_of_the_dice_warrior = 1 + option_the_tragedy_of_fortunas_gambit = 2 + option_the_dicey_animal_dice_game = 3 + option_whispers_of_fate = 4 + option_a_yacht_dice_odyssey = 5 + option_a_rollin_rhyme_adventure = 6 + option_random_story = -1 + default = -1 + + +class AllowManual(Choice): + """ + If allowed, players can roll IRL dice and input them manually into the game. + By sending "manual" in the chat, an input field appears where you can type your dice rolls. + Of course, we cannot check anymore if the player is playing fair. + """ + + display_name = "Allow manual inputs" + option_yes_allow = 1 + option_no_dont_allow = 2 + default = 1 + + +@dataclass +class YachtDiceOptions(PerGameCommonOptions): + game_difficulty: GameDifficulty + score_for_last_check: ScoreForLastCheck + score_for_goal: ScoreForGoal + + minimal_number_of_dice_and_rolls: MinimalNumberOfDiceAndRolls + number_of_dice_fragments_per_dice: NumberDiceFragmentsPerDice + number_of_roll_fragments_per_roll: NumberRollFragmentsPerRoll + + alternative_categories: AlternativeCategories + + allow_manual_input: AllowManual + + # the following options determine what extra items are shuffled into the pool: + weight_of_dice: ChanceOfDice + weight_of_roll: ChanceOfRoll + weight_of_fixed_score_multiplier: ChanceOfFixedScoreMultiplier + weight_of_step_score_multiplier: ChanceOfStepScoreMultiplier + weight_of_double_category: ChanceOfDoubleCategory + weight_of_points: ChanceOfPoints + points_size: PointsSize + + minimize_extra_items: MinimizeExtraItems + add_bonus_points: AddExtraPoints + add_story_chapters: AddStoryChapters + which_story: WhichStory + + +yd_option_groups = [ + OptionGroup( + "Extra progression items", + [ + ChanceOfDice, + ChanceOfRoll, + ChanceOfFixedScoreMultiplier, + ChanceOfStepScoreMultiplier, + ChanceOfDoubleCategory, + ChanceOfPoints, + PointsSize, + ], + ), + OptionGroup( + "Other items", + [ + MinimizeExtraItems, + AddExtraPoints, + AddStoryChapters, + WhichStory + ], + ), +] diff --git a/worlds/yachtdice/Rules.py b/worlds/yachtdice/Rules.py new file mode 100644 index 000000000000..1db5cebccdef --- /dev/null +++ b/worlds/yachtdice/Rules.py @@ -0,0 +1,239 @@ +import math +from collections import Counter, defaultdict +from typing import List, Optional + +from BaseClasses import MultiWorld + +from worlds.generic.Rules import set_rule + +from .YachtWeights import yacht_weights + +# This module adds logic to the apworld. +# In short, we ran a simulation for every possible combination of dice and rolls you can have, per category. +# This simulation has a good strategy for locking dice. +# This gives rise to an approximate discrete distribution per category. +# We calculate the distribution of the total score. +# We then pick a correct percentile to reflect the correct score that should be in logic. +# The score is logic is *much* lower than the actual maximum reachable score. + + +class Category: + def __init__(self, name, quantity=1): + self.name = name + self.quantity = quantity # how many times you have the category + + # return mean score of a category + def mean_score(self, num_dice, num_rolls): + if num_dice <= 0 or num_rolls <= 0: + return 0 + mean_score = 0 + for key, value in yacht_weights[self.name, min(8, num_dice), min(8, num_rolls)].items(): + mean_score += key * value / 100000 + return mean_score * self.quantity + + +class ListState: + def __init__(self, state: List[str]): + self.state = state + self.item_counts = Counter(state) + + def count(self, item: str, player: Optional[str] = None) -> int: + return self.item_counts[item] + + +def extract_progression(state, player, frags_per_dice, frags_per_roll, allowed_categories): + """ + method to obtain a list of what items the player has. + this includes categories, dice, rolls and score multiplier etc. + First, we convert the state if it's a list, so we can use state.count(item, player) + """ + if isinstance(state, list): + state = ListState(state=state) + + number_of_dice = state.count("Dice", player) + state.count("Dice Fragment", player) // frags_per_dice + number_of_rerolls = state.count("Roll", player) + state.count("Roll Fragment", player) // frags_per_roll + number_of_fixed_mults = state.count("Fixed Score Multiplier", player) + number_of_step_mults = state.count("Step Score Multiplier", player) + + categories = [ + Category(category_name, state.count(category_name, player)) + for category_name in allowed_categories + if state.count(category_name, player) # want all categories that have count >= 1 + ] + + extra_points_in_logic = state.count("1 Point", player) + extra_points_in_logic += state.count("10 Points", player) * 10 + extra_points_in_logic += state.count("100 Points", player) * 100 + + return ( + categories, + number_of_dice, + number_of_rerolls, + number_of_fixed_mults * 0.1, + number_of_step_mults * 0.01, + extra_points_in_logic, + ) + + +# We will store the results of this function as it is called often for the same parameters. + + +yachtdice_cache = {} + + +def dice_simulation_strings(categories, num_dice, num_rolls, fixed_mult, step_mult, diff, player): + """ + Function that returns the feasible score in logic based on items obtained. + """ + tup = ( + tuple([c.name + str(c.quantity) for c in categories]), + num_dice, + num_rolls, + fixed_mult, + step_mult, + diff, + ) # identifier + + if player not in yachtdice_cache: + yachtdice_cache[player] = {} + + if tup in yachtdice_cache[player]: + return yachtdice_cache[player][tup] + + # sort categories because for the step multiplier, you will want low-scoring categories first + categories.sort(key=lambda category: category.mean_score(num_dice, num_rolls)) + + # function to add two discrete distribution. + # defaultdict is a dict where you don't need to check if an id is present, you can just use += (lot faster) + def add_distributions(dist1, dist2): + combined_dist = defaultdict(float) + for val1, prob1 in dist1.items(): + for val2, prob2 in dist2.items(): + combined_dist[val1 + val2] += prob1 * prob2 + return dict(combined_dist) + + # function to take the maximum of "times" i.i.d. dist1. + # (I have tried using defaultdict here too but this made it slower.) + def max_dist(dist1, mults): + new_dist = {0: 1} + for mult in mults: + temp_dist = {} + for val1, prob1 in new_dist.items(): + for val2, prob2 in dist1.items(): + new_val = int(max(val1, val2 * mult)) + new_prob = prob1 * prob2 + + # Update the probability for the new value + if new_val in temp_dist: + temp_dist[new_val] += new_prob + else: + temp_dist[new_val] = new_prob + new_dist = temp_dist + + return new_dist + + # Returns percentile value of a distribution. + def percentile_distribution(dist, percentile): + sorted_values = sorted(dist.keys()) + cumulative_prob = 0 + + for val in sorted_values: + cumulative_prob += dist[val] + if cumulative_prob >= percentile: + return val + + # Return the last value if percentile is higher than all probabilities + return sorted_values[-1] + + # parameters for logic. + # perc_return is, per difficulty, the percentages of total score it returns (it averages out the values) + # diff_divide determines how many shots the logic gets per category. Lower = more shots. + perc_return = [[0], [0.1, 0.5], [0.3, 0.7], [0.55, 0.85], [0.85, 0.95]][diff] + diff_divide = [0, 9, 7, 3, 2][diff] + + # calculate total distribution + total_dist = {0: 1} + for j, category in enumerate(categories): + if num_dice <= 0 or num_rolls <= 0: + dist = {0: 100000} + else: + dist = yacht_weights[category.name, min(8, num_dice), min(8, num_rolls)].copy() + + for key in dist.keys(): + dist[key] /= 100000 + + cat_mult = 2 ** (category.quantity - 1) + + # for higher difficulties, the simulation gets multiple tries for categories. + max_tries = j // diff_divide + mults = [(1 + fixed_mult + step_mult * ii) * cat_mult for ii in range(max(0, j - max_tries), j + 1)] + dist = max_dist(dist, mults) + + total_dist = add_distributions(total_dist, dist) + + # save result into the cache, then return it + outcome = sum([percentile_distribution(total_dist, perc) for perc in perc_return]) / len(perc_return) + yachtdice_cache[player][tup] = max(5, math.floor(outcome)) # at least 5. + + # cache management; we rarely/never need more than 400 entries. But if for some reason it became large, + # delete the first entry of the player cache. + if len(yachtdice_cache[player]) > 400: + # Remove the oldest item + oldest_tup = next(iter(yachtdice_cache[player])) + del yachtdice_cache[player][oldest_tup] + + return yachtdice_cache[player][tup] + + +def dice_simulation_fill_pool(state, frags_per_dice, frags_per_roll, allowed_categories, difficulty, player): + """ + Returns the feasible score that one can reach with the current state, options and difficulty. + This function is called with state being a list, during filling of item pool. + """ + categories, num_dice, num_rolls, fixed_mult, step_mult, expoints = extract_progression( + state, "state_is_a_list", frags_per_dice, frags_per_roll, allowed_categories + ) + return ( + dice_simulation_strings(categories, num_dice, num_rolls, fixed_mult, step_mult, difficulty, player) + expoints + ) + + +def dice_simulation_state_change(state, player, frags_per_dice, frags_per_roll, allowed_categories, difficulty): + """ + Returns the feasible score that one can reach with the current state, options and difficulty. + This function is called with state being a AP state object, while doing access rules. + """ + + if state.prog_items[player]["state_is_fresh"] == 0: + state.prog_items[player]["state_is_fresh"] = 1 + categories, num_dice, num_rolls, fixed_mult, step_mult, expoints = extract_progression( + state, player, frags_per_dice, frags_per_roll, allowed_categories + ) + state.prog_items[player]["maximum_achievable_score"] = ( + dice_simulation_strings(categories, num_dice, num_rolls, fixed_mult, step_mult, difficulty, player) + + expoints + ) + + return state.prog_items[player]["maximum_achievable_score"] + + +def set_yacht_rules(world: MultiWorld, player: int, frags_per_dice, frags_per_roll, allowed_categories, difficulty): + """ + Sets rules on reaching scores + """ + + for location in world.get_locations(player): + set_rule( + location, + lambda state, curscore=location.yacht_dice_score, player=player: dice_simulation_state_change( + state, player, frags_per_dice, frags_per_roll, allowed_categories, difficulty + ) + >= curscore, + ) + + +def set_yacht_completion_rules(world: MultiWorld, player: int): + """ + Sets rules on completion condition + """ + world.completion_condition[player] = lambda state: state.has("Victory", player) diff --git a/worlds/yachtdice/YachtWeights.py b/worlds/yachtdice/YachtWeights.py new file mode 100644 index 000000000000..ee387fdf212d --- /dev/null +++ b/worlds/yachtdice/YachtWeights.py @@ -0,0 +1,3562 @@ +# A file containing the results of our simulations. +# Every entry consists of a key. This key has input category, number of dice, and number of rolls. +# The value then shows a list of all possible scores to get, and how many times of 100000 it achieved. + +# example: ("Category Choice", 2, 2): +# {8: 13639, 9: 12220, 10: 13755, 5: 4889, 6: 9840, 7: 14772, 12: 7780, 11: 15622, 2: 1269, 3: 2445, 4: 3769} +# this example shows the outcomes for the category "Category Choice", with 2 dice and 2 rolls. +# 13639 out of 100000 times, a score of 8 was achieved for example. +yacht_weights = { + ("Category Ones", 0, 0): {0: 100000}, + ("Category Ones", 0, 1): {0: 100000}, + ("Category Ones", 0, 2): {0: 100000}, + ("Category Ones", 0, 3): {0: 100000}, + ("Category Ones", 0, 4): {0: 100000}, + ("Category Ones", 0, 5): {0: 100000}, + ("Category Ones", 0, 6): {0: 100000}, + ("Category Ones", 0, 7): {0: 100000}, + ("Category Ones", 0, 8): {0: 100000}, + ("Category Ones", 1, 0): {0: 100000}, + ("Category Ones", 1, 1): {0: 83416, 1: 16584}, + ("Category Ones", 1, 2): {0: 69346, 1: 30654}, + ("Category Ones", 1, 3): {0: 57756, 1: 42244}, + ("Category Ones", 1, 4): {0: 48709, 1: 51291}, + ("Category Ones", 1, 5): {0: 40214, 1: 59786}, + ("Category Ones", 1, 6): {0: 33491, 1: 66509}, + ("Category Ones", 1, 7): {0: 27838, 1: 72162}, + ("Category Ones", 1, 8): {0: 23094, 1: 76906}, + ("Category Ones", 2, 0): {0: 100000}, + ("Category Ones", 2, 1): {0: 69715, 1: 30285}, + ("Category Ones", 2, 2): {0: 48066, 1: 51934}, + ("Category Ones", 2, 3): {0: 33544, 1: 48585, 2: 17871}, + ("Category Ones", 2, 4): {0: 23342, 1: 50092, 2: 26566}, + ("Category Ones", 2, 5): {0: 16036, 1: 48250, 2: 35714}, + ("Category Ones", 2, 6): {0: 11355, 1: 44545, 2: 44100}, + ("Category Ones", 2, 7): {0: 7812, 1: 40248, 2: 51940}, + ("Category Ones", 2, 8): {0: 5395, 1: 35484, 2: 59121}, + ("Category Ones", 3, 0): {0: 100000}, + ("Category Ones", 3, 1): {0: 57462, 1: 42538}, + ("Category Ones", 3, 2): {0: 33327, 1: 44253, 2: 22420}, + ("Category Ones", 3, 3): {0: 19432, 1: 42237, 2: 38331}, + ("Category Ones", 3, 4): {0: 11191, 1: 36208, 2: 38606, 3: 13995}, + ("Category Ones", 3, 5): {0: 6536, 1: 28891, 2: 43130, 3: 21443}, + ("Category Ones", 3, 6): {0: 3697, 1: 22501, 2: 44196, 3: 29606}, + ("Category Ones", 3, 7): {0: 2134, 2: 60499, 3: 37367}, + ("Category Ones", 3, 8): {0: 1280, 2: 53518, 3: 45202}, + ("Category Ones", 4, 0): {0: 100000}, + ("Category Ones", 4, 1): {0: 48178, 1: 38635, 2: 13187}, + ("Category Ones", 4, 2): {0: 23349, 1: 40775, 2: 35876}, + ("Category Ones", 4, 3): {0: 11366, 1: 32547, 2: 35556, 3: 20531}, + ("Category Ones", 4, 4): {0: 5331, 1: 23241, 2: 37271, 3: 34157}, + ("Category Ones", 4, 5): {0: 2640, 2: 49872, 3: 47488}, + ("Category Ones", 4, 6): {0: 1253, 2: 39816, 3: 39298, 4: 19633}, + ("Category Ones", 4, 7): {0: 6915, 2: 24313, 3: 41680, 4: 27092}, + ("Category Ones", 4, 8): {0: 4228, 3: 61312, 4: 34460}, + ("Category Ones", 5, 0): {0: 100000}, + ("Category Ones", 5, 1): {0: 40042, 1: 40202, 2: 19756}, + ("Category Ones", 5, 2): {0: 16212, 1: 35432, 2: 31231, 3: 17125}, + ("Category Ones", 5, 3): {0: 6556, 1: 23548, 2: 34509, 3: 35387}, + ("Category Ones", 5, 4): {0: 2552, 2: 44333, 3: 32048, 4: 21067}, + ("Category Ones", 5, 5): {0: 8783, 2: 23245, 3: 34614, 4: 33358}, + ("Category Ones", 5, 6): {0: 4513, 3: 49603, 4: 32816, 5: 13068}, + ("Category Ones", 5, 7): {0: 2295, 3: 40470, 4: 37869, 5: 19366}, + ("Category Ones", 5, 8): {0: 73, 3: 33115, 4: 40166, 5: 26646}, + ("Category Ones", 6, 0): {0: 100000}, + ("Category Ones", 6, 1): {0: 33501, 1: 40042, 2: 26457}, + ("Category Ones", 6, 2): {0: 11326, 1: 29379, 2: 32368, 3: 26927}, + ("Category Ones", 6, 3): {0: 3764, 2: 46660, 3: 28928, 4: 20648}, + ("Category Ones", 6, 4): {0: 1231, 2: 29883, 3: 31038, 4: 37848}, + ("Category Ones", 6, 5): {0: 4208, 3: 41897, 4: 30878, 5: 23017}, + ("Category Ones", 6, 6): {0: 1850, 3: 30396, 4: 33022, 5: 34732}, + ("Category Ones", 6, 7): {0: 5503, 4: 48099, 5: 32432, 6: 13966}, + ("Category Ones", 6, 8): {0: 2896, 4: 39616, 5: 37005, 6: 20483}, + ("Category Ones", 7, 0): {0: 100000}, + ("Category Ones", 7, 1): {0: 27838, 1: 39224, 2: 32938}, + ("Category Ones", 7, 2): {0: 7796, 1: 23850, 2: 31678, 3: 23224, 4: 13452}, + ("Category Ones", 7, 3): {0: 2247, 2: 35459, 3: 29131, 4: 33163}, + ("Category Ones", 7, 4): {0: 5252, 3: 41207, 4: 28065, 5: 25476}, + ("Category Ones", 7, 5): {0: 174, 3: 29347, 4: 28867, 5: 26190, 6: 15422}, + ("Category Ones", 7, 6): {0: 4625, 4: 38568, 5: 30596, 6: 26211}, + ("Category Ones", 7, 7): {0: 230, 4: 30109, 5: 32077, 6: 37584}, + ("Category Ones", 7, 8): {0: 5519, 5: 45718, 6: 33357, 7: 15406}, + ("Category Ones", 8, 0): {0: 100000}, + ("Category Ones", 8, 1): {0: 23156, 1: 37295, 2: 26136, 3: 13413}, + ("Category Ones", 8, 2): {0: 5472, 2: 48372, 3: 25847, 4: 20309}, + ("Category Ones", 8, 3): {0: 8661, 3: 45896, 4: 24664, 5: 20779}, + ("Category Ones", 8, 4): {0: 2807, 3: 29707, 4: 27157, 5: 23430, 6: 16899}, + ("Category Ones", 8, 5): {0: 5173, 4: 36033, 5: 27792, 6: 31002}, + ("Category Ones", 8, 6): {0: 255, 4: 25642, 5: 27508, 6: 27112, 7: 19483}, + ("Category Ones", 8, 7): {0: 4236, 5: 35323, 6: 30438, 7: 30003}, + ("Category Ones", 8, 8): {0: 310, 5: 27692, 6: 30830, 7: 41168}, + ("Category Twos", 0, 0): {0: 100000}, + ("Category Twos", 0, 1): {0: 100000}, + ("Category Twos", 0, 2): {0: 100000}, + ("Category Twos", 0, 3): {0: 100000}, + ("Category Twos", 0, 4): {0: 100000}, + ("Category Twos", 0, 5): {0: 100000}, + ("Category Twos", 0, 6): {0: 100000}, + ("Category Twos", 0, 7): {0: 100000}, + ("Category Twos", 0, 8): {0: 100000}, + ("Category Twos", 1, 0): {0: 100000}, + ("Category Twos", 1, 1): {0: 83475, 2: 16525}, + ("Category Twos", 1, 2): {0: 69690, 2: 30310}, + ("Category Twos", 1, 3): {0: 57818, 2: 42182}, + ("Category Twos", 1, 4): {0: 48418, 2: 51582}, + ("Category Twos", 1, 5): {0: 40301, 2: 59699}, + ("Category Twos", 1, 6): {0: 33558, 2: 66442}, + ("Category Twos", 1, 7): {0: 28182, 2: 71818}, + ("Category Twos", 1, 8): {0: 23406, 2: 76594}, + ("Category Twos", 2, 0): {0: 100000}, + ("Category Twos", 2, 1): {0: 69724, 2: 30276}, + ("Category Twos", 2, 2): {0: 48238, 2: 42479, 4: 9283}, + ("Category Twos", 2, 3): {0: 33290, 2: 48819, 4: 17891}, + ("Category Twos", 2, 4): {0: 23136, 2: 49957, 4: 26907}, + ("Category Twos", 2, 5): {0: 16146, 2: 48200, 4: 35654}, + ("Category Twos", 2, 6): {0: 11083, 2: 44497, 4: 44420}, + ("Category Twos", 2, 7): {0: 7662, 2: 40343, 4: 51995}, + ("Category Twos", 2, 8): {0: 5354, 2: 35526, 4: 59120}, + ("Category Twos", 3, 0): {0: 100000}, + ("Category Twos", 3, 1): {0: 58021, 2: 34522, 4: 7457}, + ("Category Twos", 3, 2): {0: 33548, 2: 44261, 4: 22191}, + ("Category Twos", 3, 3): {0: 19375, 2: 42372, 4: 30748, 6: 7505}, + ("Category Twos", 3, 4): {0: 10998, 2: 36435, 4: 38569, 6: 13998}, + ("Category Twos", 3, 5): {0: 6519, 2: 28838, 4: 43283, 6: 21360}, + ("Category Twos", 3, 6): {0: 3619, 2: 22498, 4: 44233, 6: 29650}, + ("Category Twos", 3, 7): {0: 2195, 2: 16979, 4: 43684, 6: 37142}, + ("Category Twos", 3, 8): {0: 1255, 2: 12420, 4: 40920, 6: 45405}, + ("Category Twos", 4, 0): {0: 100000}, + ("Category Twos", 4, 1): {0: 48235, 2: 38602, 4: 13163}, + ("Category Twos", 4, 2): {0: 23289, 2: 40678, 4: 27102, 6: 8931}, + ("Category Twos", 4, 3): {0: 11177, 2: 32677, 4: 35702, 6: 20444}, + ("Category Twos", 4, 4): {0: 5499, 2: 23225, 4: 37240, 6: 26867, 8: 7169}, + ("Category Twos", 4, 5): {0: 2574, 2: 15782, 4: 34605, 6: 34268, 8: 12771}, + ("Category Twos", 4, 6): {0: 1259, 4: 39616, 6: 39523, 8: 19602}, + ("Category Twos", 4, 7): {0: 622, 4: 30426, 6: 41894, 8: 27058}, + ("Category Twos", 4, 8): {0: 4091, 4: 18855, 6: 42309, 8: 34745}, + ("Category Twos", 5, 0): {0: 100000}, + ("Category Twos", 5, 1): {0: 40028, 2: 40241, 4: 19731}, + ("Category Twos", 5, 2): {0: 16009, 2: 35901, 4: 31024, 6: 17066}, + ("Category Twos", 5, 3): {0: 6489, 2: 23477, 4: 34349, 6: 25270, 8: 10415}, + ("Category Twos", 5, 4): {0: 2658, 2: 14032, 4: 30199, 6: 32214, 8: 20897}, + ("Category Twos", 5, 5): {0: 1032, 4: 31627, 6: 33993, 8: 25853, 10: 7495}, + ("Category Twos", 5, 6): {0: 450, 4: 20693, 6: 32774, 8: 32900, 10: 13183}, + ("Category Twos", 5, 7): {0: 2396, 4: 11231, 6: 29481, 8: 37636, 10: 19256}, + ("Category Twos", 5, 8): {0: 1171, 6: 31564, 8: 40798, 10: 26467}, + ("Category Twos", 6, 0): {0: 100000}, + ("Category Twos", 6, 1): {0: 33502, 2: 40413, 4: 26085}, + ("Category Twos", 6, 2): {0: 11210, 2: 29638, 4: 32701, 6: 18988, 8: 7463}, + ("Category Twos", 6, 3): {0: 3673, 2: 16459, 4: 29795, 6: 29102, 8: 20971}, + ("Category Twos", 6, 4): {0: 1243, 4: 30025, 6: 31053, 8: 25066, 10: 12613}, + ("Category Twos", 6, 5): {0: 4194, 4: 13949, 6: 28142, 8: 30723, 10: 22992}, + ("Category Twos", 6, 6): {0: 1800, 6: 30677, 8: 32692, 10: 26213, 12: 8618}, + ("Category Twos", 6, 7): {0: 775, 6: 21013, 8: 31410, 10: 32532, 12: 14270}, + ("Category Twos", 6, 8): {0: 2855, 6: 11432, 8: 27864, 10: 37237, 12: 20612}, + ("Category Twos", 7, 0): {0: 100000}, + ("Category Twos", 7, 1): {0: 27683, 2: 39060, 4: 23574, 6: 9683}, + ("Category Twos", 7, 2): {0: 7824, 2: 24031, 4: 31764, 6: 23095, 8: 13286}, + ("Category Twos", 7, 3): {0: 2148, 2: 11019, 4: 24197, 6: 29599, 8: 21250, 10: 11787}, + ("Category Twos", 7, 4): {0: 564, 4: 19036, 6: 26395, 8: 28409, 10: 18080, 12: 7516}, + ("Category Twos", 7, 5): {0: 1913, 6: 27198, 8: 29039, 10: 26129, 12: 15721}, + ("Category Twos", 7, 6): {0: 54, 6: 17506, 8: 25752, 10: 30413, 12: 26275}, + ("Category Twos", 7, 7): {0: 2179, 8: 28341, 10: 32054, 12: 27347, 14: 10079}, + ("Category Twos", 7, 8): {0: 942, 8: 19835, 10: 30248, 12: 33276, 14: 15699}, + ("Category Twos", 8, 0): {0: 100000}, + ("Category Twos", 8, 1): {0: 23378, 2: 37157, 4: 26082, 6: 13383}, + ("Category Twos", 8, 2): {0: 5420, 2: 19164, 4: 29216, 6: 25677, 8: 20523}, + ("Category Twos", 8, 3): {0: 1271, 4: 26082, 6: 27054, 8: 24712, 10: 20881}, + ("Category Twos", 8, 4): {0: 2889, 6: 29552, 8: 27389, 10: 23232, 12: 16938}, + ("Category Twos", 8, 5): {0: 879, 6: 16853, 8: 23322, 10: 27882, 12: 20768, 14: 10296}, + ("Category Twos", 8, 6): {0: 2041, 8: 24140, 10: 27398, 12: 27048, 14: 19373}, + ("Category Twos", 8, 7): {0: 74, 8: 15693, 10: 23675, 12: 30829, 14: 22454, 16: 7275}, + ("Category Twos", 8, 8): {2: 2053, 10: 25677, 12: 31310, 14: 28983, 16: 11977}, + ("Category Threes", 0, 0): {0: 100000}, + ("Category Threes", 0, 1): {0: 100000}, + ("Category Threes", 0, 2): {0: 100000}, + ("Category Threes", 0, 3): {0: 100000}, + ("Category Threes", 0, 4): {0: 100000}, + ("Category Threes", 0, 5): {0: 100000}, + ("Category Threes", 0, 6): {0: 100000}, + ("Category Threes", 0, 7): {0: 100000}, + ("Category Threes", 0, 8): {0: 100000}, + ("Category Threes", 1, 0): {0: 100000}, + ("Category Threes", 1, 1): {0: 83343, 3: 16657}, + ("Category Threes", 1, 2): {0: 69569, 3: 30431}, + ("Category Threes", 1, 3): {0: 57872, 3: 42128}, + ("Category Threes", 1, 4): {0: 48081, 3: 51919}, + ("Category Threes", 1, 5): {0: 40271, 3: 59729}, + ("Category Threes", 1, 6): {0: 33201, 3: 66799}, + ("Category Threes", 1, 7): {0: 27903, 3: 72097}, + ("Category Threes", 1, 8): {0: 23240, 3: 76760}, + ("Category Threes", 2, 0): {0: 100000}, + ("Category Threes", 2, 1): {0: 69419, 3: 30581}, + ("Category Threes", 2, 2): {0: 48202, 3: 42590, 6: 9208}, + ("Category Threes", 2, 3): {0: 33376, 3: 48849, 6: 17775}, + ("Category Threes", 2, 4): {0: 23276, 3: 49810, 6: 26914}, + ("Category Threes", 2, 5): {0: 16092, 3: 47718, 6: 36190}, + ("Category Threes", 2, 6): {0: 11232, 3: 44515, 6: 44253}, + ("Category Threes", 2, 7): {0: 7589, 3: 40459, 6: 51952}, + ("Category Threes", 2, 8): {0: 5447, 3: 35804, 6: 58749}, + ("Category Threes", 3, 0): {0: 100000}, + ("Category Threes", 3, 1): {0: 57964, 3: 34701, 6: 7335}, + ("Category Threes", 3, 2): {0: 33637, 3: 44263, 6: 22100}, + ("Category Threes", 3, 3): {0: 19520, 3: 42382, 6: 30676, 9: 7422}, + ("Category Threes", 3, 4): {0: 11265, 3: 35772, 6: 39042, 9: 13921}, + ("Category Threes", 3, 5): {0: 6419, 3: 28916, 6: 43261, 9: 21404}, + ("Category Threes", 3, 6): {0: 3810, 3: 22496, 6: 44388, 9: 29306}, + ("Category Threes", 3, 7): {0: 2174, 3: 16875, 6: 43720, 9: 37231}, + ("Category Threes", 3, 8): {0: 1237, 3: 12471, 6: 41222, 9: 45070}, + ("Category Threes", 4, 0): {0: 100000}, + ("Category Threes", 4, 1): {0: 48121, 3: 38786, 6: 13093}, + ("Category Threes", 4, 2): {0: 23296, 3: 40989, 6: 26998, 9: 8717}, + ("Category Threes", 4, 3): {0: 11233, 3: 32653, 6: 35710, 9: 20404}, + ("Category Threes", 4, 4): {0: 5463, 3: 23270, 6: 37468, 9: 26734, 12: 7065}, + ("Category Threes", 4, 5): {0: 2691, 3: 15496, 6: 34539, 9: 34635, 12: 12639}, + ("Category Threes", 4, 6): {0: 1221, 3: 10046, 6: 29811, 9: 39190, 12: 19732}, + ("Category Threes", 4, 7): {0: 599, 6: 30742, 9: 41614, 12: 27045}, + ("Category Threes", 4, 8): {0: 309, 6: 22719, 9: 42236, 12: 34736}, + ("Category Threes", 5, 0): {0: 100000}, + ("Category Threes", 5, 1): {0: 40183, 3: 40377, 6: 19440}, + ("Category Threes", 5, 2): {0: 16197, 3: 35494, 6: 30937, 9: 17372}, + ("Category Threes", 5, 3): {0: 6583, 3: 23394, 6: 34432, 9: 25239, 12: 10352}, + ("Category Threes", 5, 4): {0: 2636, 3: 14072, 6: 30134, 9: 32371, 12: 20787}, + ("Category Threes", 5, 5): {0: 1075, 3: 7804, 6: 23010, 9: 34811, 12: 25702, 15: 7598}, + ("Category Threes", 5, 6): {0: 418, 6: 20888, 9: 32809, 12: 32892, 15: 12993}, + ("Category Threes", 5, 7): {0: 2365, 6: 11416, 9: 29072, 12: 37604, 15: 19543}, + ("Category Threes", 5, 8): {0: 1246, 6: 7425, 9: 24603, 12: 40262, 15: 26464}, + ("Category Threes", 6, 0): {0: 100000}, + ("Category Threes", 6, 1): {0: 33473, 3: 40175, 6: 20151, 9: 6201}, + ("Category Threes", 6, 2): {0: 11147, 3: 29592, 6: 32630, 9: 19287, 12: 7344}, + ("Category Threes", 6, 3): {0: 3628, 3: 16528, 6: 29814, 9: 29006, 12: 15888, 15: 5136}, + ("Category Threes", 6, 4): {0: 1262, 3: 8236, 6: 21987, 9: 30953, 12: 24833, 15: 12729}, + ("Category Threes", 6, 5): {0: 416, 6: 17769, 9: 27798, 12: 31197, 15: 18256, 18: 4564}, + ("Category Threes", 6, 6): {0: 1796, 6: 8372, 9: 22175, 12: 32897, 15: 26264, 18: 8496}, + ("Category Threes", 6, 7): {0: 791, 9: 21074, 12: 31385, 15: 32666, 18: 14084}, + ("Category Threes", 6, 8): {0: 20, 9: 14150, 12: 28320, 15: 36982, 18: 20528}, + ("Category Threes", 7, 0): {0: 100000}, + ("Category Threes", 7, 1): {0: 27933, 3: 39105, 6: 23338, 9: 9624}, + ("Category Threes", 7, 2): {0: 7794, 3: 23896, 6: 31832, 9: 23110, 12: 13368}, + ("Category Threes", 7, 3): {0: 2138, 3: 11098, 6: 24140, 9: 29316, 12: 21386, 15: 11922}, + ("Category Threes", 7, 4): {0: 590, 6: 19385, 9: 26233, 12: 28244, 15: 18118, 18: 7430}, + ("Category Threes", 7, 5): {0: 1941, 6: 7953, 9: 19439, 12: 28977, 15: 26078, 18: 15612}, + ("Category Threes", 7, 6): {0: 718, 9: 16963, 12: 25793, 15: 30535, 18: 20208, 21: 5783}, + ("Category Threes", 7, 7): {0: 2064, 9: 7941, 12: 20571, 15: 31859, 18: 27374, 21: 10191}, + ("Category Threes", 7, 8): {0: 963, 12: 19864, 15: 30313, 18: 33133, 21: 15727}, + ("Category Threes", 8, 0): {0: 100000}, + ("Category Threes", 8, 1): {0: 23337, 3: 37232, 6: 25968, 9: 13463}, + ("Category Threes", 8, 2): {0: 5310, 3: 18930, 6: 29232, 9: 26016, 12: 14399, 15: 6113}, + ("Category Threes", 8, 3): {0: 1328, 3: 7328, 6: 18754, 9: 27141, 12: 24703, 15: 14251, 18: 6495}, + ("Category Threes", 8, 4): {0: 2719, 6: 9554, 9: 20607, 12: 26898, 15: 23402, 18: 12452, 21: 4368}, + ("Category Threes", 8, 5): {0: 905, 9: 16848, 12: 23248, 15: 27931, 18: 20616, 21: 10452}, + ("Category Threes", 8, 6): {0: 1914, 9: 6890, 12: 17302, 15: 27235, 18: 27276, 21: 19383}, + ("Category Threes", 8, 7): {0: 800, 12: 15127, 15: 23682, 18: 30401, 21: 22546, 24: 7444}, + ("Category Threes", 8, 8): {0: 2041, 12: 7211, 15: 18980, 18: 30657, 21: 29074, 24: 12037}, + ("Category Fours", 0, 0): {0: 100000}, + ("Category Fours", 0, 1): {0: 100000}, + ("Category Fours", 0, 2): {0: 100000}, + ("Category Fours", 0, 3): {0: 100000}, + ("Category Fours", 0, 4): {0: 100000}, + ("Category Fours", 0, 5): {0: 100000}, + ("Category Fours", 0, 6): {0: 100000}, + ("Category Fours", 0, 7): {0: 100000}, + ("Category Fours", 0, 8): {0: 100000}, + ("Category Fours", 1, 0): {0: 100000}, + ("Category Fours", 1, 1): {0: 83260, 4: 16740}, + ("Category Fours", 1, 2): {0: 69514, 4: 30486}, + ("Category Fours", 1, 3): {0: 58017, 4: 41983}, + ("Category Fours", 1, 4): {0: 48389, 4: 51611}, + ("Category Fours", 1, 5): {0: 40201, 4: 59799}, + ("Category Fours", 1, 6): {0: 33496, 4: 66504}, + ("Category Fours", 1, 7): {0: 28052, 4: 71948}, + ("Category Fours", 1, 8): {0: 23431, 4: 76569}, + ("Category Fours", 2, 0): {0: 100000}, + ("Category Fours", 2, 1): {0: 69379, 4: 30621}, + ("Category Fours", 2, 2): {0: 48538, 4: 42240, 8: 9222}, + ("Category Fours", 2, 3): {0: 33756, 4: 48555, 8: 17689}, + ("Category Fours", 2, 4): {0: 23070, 4: 49916, 8: 27014}, + ("Category Fours", 2, 5): {0: 16222, 4: 48009, 8: 35769}, + ("Category Fours", 2, 6): {0: 11125, 4: 44400, 8: 44475}, + ("Category Fours", 2, 7): {0: 7919, 4: 40216, 8: 51865}, + ("Category Fours", 2, 8): {0: 5348, 4: 35757, 8: 58895}, + ("Category Fours", 3, 0): {0: 100000}, + ("Category Fours", 3, 1): {0: 57914, 4: 34622, 8: 7464}, + ("Category Fours", 3, 2): {0: 33621, 4: 44110, 8: 22269}, + ("Category Fours", 3, 3): {0: 19153, 4: 42425, 8: 30898, 12: 7524}, + ("Category Fours", 3, 4): {0: 11125, 4: 36011, 8: 39024, 12: 13840}, + ("Category Fours", 3, 5): {0: 6367, 4: 29116, 8: 43192, 12: 21325}, + ("Category Fours", 3, 6): {0: 3643, 4: 22457, 8: 44477, 12: 29423}, + ("Category Fours", 3, 7): {0: 2178, 4: 16802, 8: 43275, 12: 37745}, + ("Category Fours", 3, 8): {0: 1255, 4: 12301, 8: 41132, 12: 45312}, + ("Category Fours", 4, 0): {0: 100000}, + ("Category Fours", 4, 1): {0: 48465, 4: 38398, 8: 13137}, + ("Category Fours", 4, 2): {0: 23296, 4: 40911, 8: 27073, 12: 8720}, + ("Category Fours", 4, 3): {0: 11200, 4: 33191, 8: 35337, 12: 20272}, + ("Category Fours", 4, 4): {0: 5447, 4: 23066, 8: 37441, 12: 26861, 16: 7185}, + ("Category Fours", 4, 5): {0: 2533, 4: 15668, 8: 34781, 12: 34222, 16: 12796}, + ("Category Fours", 4, 6): {0: 1314, 4: 10001, 8: 29850, 12: 39425, 16: 19410}, + ("Category Fours", 4, 7): {0: 592, 4: 6231, 8: 24250, 12: 41917, 16: 27010}, + ("Category Fours", 4, 8): {0: 302, 8: 23055, 12: 41866, 16: 34777}, + ("Category Fours", 5, 0): {0: 100000}, + ("Category Fours", 5, 1): {0: 40215, 4: 40127, 8: 16028, 12: 3630}, + ("Category Fours", 5, 2): {0: 15946, 4: 35579, 8: 31158, 12: 13998, 16: 3319}, + ("Category Fours", 5, 3): {0: 6479, 4: 23705, 8: 34575, 12: 24783, 16: 10458}, + ("Category Fours", 5, 4): {0: 2635, 4: 13889, 8: 30079, 12: 32428, 16: 17263, 20: 3706}, + ("Category Fours", 5, 5): {0: 1160, 4: 7756, 8: 23332, 12: 34254, 16: 25803, 20: 7695}, + ("Category Fours", 5, 6): {0: 434, 8: 20773, 12: 32910, 16: 32752, 20: 13131}, + ("Category Fours", 5, 7): {0: 169, 8: 13536, 12: 29123, 16: 37701, 20: 19471}, + ("Category Fours", 5, 8): {0: 1267, 8: 7340, 12: 24807, 16: 40144, 20: 26442}, + ("Category Fours", 6, 0): {0: 100000}, + ("Category Fours", 6, 1): {0: 33632, 4: 39856, 8: 20225, 12: 6287}, + ("Category Fours", 6, 2): {0: 11175, 4: 29824, 8: 32381, 12: 19179, 16: 7441}, + ("Category Fours", 6, 3): {0: 3698, 4: 16329, 8: 29939, 12: 29071, 16: 15808, 20: 5155}, + ("Category Fours", 6, 4): {0: 1284, 4: 7889, 8: 21748, 12: 31107, 16: 25281, 20: 12691}, + ("Category Fours", 6, 5): {0: 462, 8: 17601, 12: 27817, 16: 31233, 20: 18386, 24: 4501}, + ("Category Fours", 6, 6): {0: 1783, 8: 8344, 12: 22156, 16: 32690, 20: 26192, 24: 8835}, + ("Category Fours", 6, 7): {0: 767, 12: 20974, 16: 31490, 20: 32639, 24: 14130}, + ("Category Fours", 6, 8): {0: 357, 12: 13912, 16: 27841, 20: 37380, 24: 20510}, + ("Category Fours", 7, 0): {0: 100000}, + ("Category Fours", 7, 1): {0: 27821, 4: 39289, 8: 23327, 12: 9563}, + ("Category Fours", 7, 2): {0: 7950, 4: 24026, 8: 31633, 12: 23169, 16: 13222}, + ("Category Fours", 7, 3): {0: 2194, 4: 11153, 8: 24107, 12: 29411, 16: 21390, 20: 11745}, + ("Category Fours", 7, 4): {0: 560, 8: 19291, 12: 26330, 16: 28118, 20: 18174, 24: 7527}, + ("Category Fours", 7, 5): {0: 1858, 8: 7862, 12: 19425, 16: 29003, 20: 26113, 24: 15739}, + ("Category Fours", 7, 6): {0: 679, 12: 16759, 16: 25831, 20: 30724, 24: 20147, 28: 5860}, + ("Category Fours", 7, 7): {0: 13, 12: 10063, 16: 20524, 20: 31843, 24: 27368, 28: 10189}, + ("Category Fours", 7, 8): {4: 864, 16: 19910, 20: 30153, 24: 33428, 28: 15645}, + ("Category Fours", 8, 0): {0: 100000}, + ("Category Fours", 8, 1): {0: 23275, 4: 37161, 8: 25964, 12: 13600}, + ("Category Fours", 8, 2): {0: 5421, 4: 19014, 8: 29259, 12: 25812, 16: 14387, 20: 6107}, + ("Category Fours", 8, 3): {0: 1277, 4: 7349, 8: 18330, 12: 27186, 16: 25138, 20: 14371, 24: 6349}, + ("Category Fours", 8, 4): {0: 289, 8: 11929, 12: 20282, 16: 26960, 20: 23292, 24: 12927, 28: 4321}, + ("Category Fours", 8, 5): {0: 835, 12: 16706, 16: 23588, 20: 27754, 24: 20767, 28: 10350}, + ("Category Fours", 8, 6): {0: 21, 12: 8911, 16: 17296, 20: 27398, 24: 27074, 28: 15457, 32: 3843}, + ("Category Fours", 8, 7): {0: 745, 16: 15069, 20: 23737, 24: 30628, 28: 22590, 32: 7231}, + ("Category Fours", 8, 8): {0: 1949, 16: 7021, 20: 18630, 24: 31109, 28: 29548, 32: 11743}, + ("Category Fives", 0, 0): {0: 100000}, + ("Category Fives", 0, 1): {0: 100000}, + ("Category Fives", 0, 2): {0: 100000}, + ("Category Fives", 0, 3): {0: 100000}, + ("Category Fives", 0, 4): {0: 100000}, + ("Category Fives", 0, 5): {0: 100000}, + ("Category Fives", 0, 6): {0: 100000}, + ("Category Fives", 0, 7): {0: 100000}, + ("Category Fives", 0, 8): {0: 100000}, + ("Category Fives", 1, 0): {0: 100000}, + ("Category Fives", 1, 1): {0: 83338, 5: 16662}, + ("Category Fives", 1, 2): {0: 69499, 5: 30501}, + ("Category Fives", 1, 3): {0: 57799, 5: 42201}, + ("Category Fives", 1, 4): {0: 48311, 5: 51689}, + ("Category Fives", 1, 5): {0: 40084, 5: 59916}, + ("Category Fives", 1, 6): {0: 33440, 5: 66560}, + ("Category Fives", 1, 7): {0: 27730, 5: 72270}, + ("Category Fives", 1, 8): {0: 23210, 5: 76790}, + ("Category Fives", 2, 0): {0: 100000}, + ("Category Fives", 2, 1): {0: 69299, 5: 27864, 10: 2837}, + ("Category Fives", 2, 2): {0: 48156, 5: 42526, 10: 9318}, + ("Category Fives", 2, 3): {0: 33225, 5: 49153, 10: 17622}, + ("Category Fives", 2, 4): {0: 23218, 5: 50075, 10: 26707}, + ("Category Fives", 2, 5): {0: 15939, 5: 48313, 10: 35748}, + ("Category Fives", 2, 6): {0: 11340, 5: 44324, 10: 44336}, + ("Category Fives", 2, 7): {0: 7822, 5: 40388, 10: 51790}, + ("Category Fives", 2, 8): {0: 5386, 5: 35636, 10: 58978}, + ("Category Fives", 3, 0): {0: 100000}, + ("Category Fives", 3, 1): {0: 58034, 5: 34541, 10: 7425}, + ("Category Fives", 3, 2): {0: 33466, 5: 44227, 10: 19403, 15: 2904}, + ("Category Fives", 3, 3): {0: 19231, 5: 42483, 10: 30794, 15: 7492}, + ("Category Fives", 3, 4): {0: 11196, 5: 36192, 10: 38673, 15: 13939}, + ("Category Fives", 3, 5): {0: 6561, 5: 29163, 10: 43014, 15: 21262}, + ("Category Fives", 3, 6): {0: 3719, 5: 22181, 10: 44611, 15: 29489}, + ("Category Fives", 3, 7): {0: 2099, 5: 16817, 10: 43466, 15: 37618}, + ("Category Fives", 3, 8): {0: 1281, 5: 12473, 10: 40936, 15: 45310}, + ("Category Fives", 4, 0): {0: 100000}, + ("Category Fives", 4, 1): {0: 48377, 5: 38345, 10: 13278}, + ("Category Fives", 4, 2): {0: 23126, 5: 40940, 10: 27041, 15: 8893}, + ("Category Fives", 4, 3): {0: 11192, 5: 32597, 10: 35753, 15: 17250, 20: 3208}, + ("Category Fives", 4, 4): {0: 5362, 5: 23073, 10: 37379, 15: 26968, 20: 7218}, + ("Category Fives", 4, 5): {0: 2655, 5: 15662, 10: 34602, 15: 34186, 20: 12895}, + ("Category Fives", 4, 6): {0: 1291, 5: 9959, 10: 29833, 15: 39417, 20: 19500}, + ("Category Fives", 4, 7): {0: 623, 5: 6231, 10: 24360, 15: 41779, 20: 27007}, + ("Category Fives", 4, 8): {0: 313, 10: 23001, 15: 41957, 20: 34729}, + ("Category Fives", 5, 0): {0: 100000}, + ("Category Fives", 5, 1): {0: 39911, 5: 40561, 10: 16029, 15: 3499}, + ("Category Fives", 5, 2): {0: 16178, 5: 35517, 10: 31246, 15: 13793, 20: 3266}, + ("Category Fives", 5, 3): {0: 6526, 5: 23716, 10: 34430, 15: 25017, 20: 10311}, + ("Category Fives", 5, 4): {0: 2615, 5: 13975, 10: 30133, 15: 32247, 20: 17219, 25: 3811}, + ("Category Fives", 5, 5): {0: 1063, 5: 7876, 10: 23203, 15: 34489, 20: 25757, 25: 7612}, + ("Category Fives", 5, 6): {0: 429, 5: 4091, 10: 16696, 15: 32855, 20: 32891, 25: 13038}, + ("Category Fives", 5, 7): {0: 159, 10: 13509, 15: 29416, 20: 37778, 25: 19138}, + ("Category Fives", 5, 8): {0: 1179, 10: 7453, 15: 24456, 20: 40615, 25: 26297}, + ("Category Fives", 6, 0): {0: 100000}, + ("Category Fives", 6, 1): {0: 33476, 5: 40167, 10: 20181, 15: 6176}, + ("Category Fives", 6, 2): {0: 11322, 5: 29613, 10: 32664, 15: 19004, 20: 7397}, + ("Category Fives", 6, 3): {0: 3765, 5: 16288, 10: 29770, 15: 29233, 20: 15759, 25: 5185}, + ("Category Fives", 6, 4): {0: 1201, 5: 8226, 10: 21518, 15: 31229, 20: 25160, 25: 12666}, + ("Category Fives", 6, 5): {0: 433, 10: 17879, 15: 27961, 20: 30800, 25: 18442, 30: 4485}, + ("Category Fives", 6, 6): {0: 141, 10: 10040, 15: 22226, 20: 32744, 25: 26341, 30: 8508}, + ("Category Fives", 6, 7): {0: 772, 10: 4724, 15: 16206, 20: 31363, 25: 32784, 30: 14151}, + ("Category Fives", 6, 8): {0: 297, 15: 13902, 20: 28004, 25: 37178, 30: 20619}, + ("Category Fives", 7, 0): {0: 100000}, + ("Category Fives", 7, 1): {0: 27826, 5: 39154, 10: 23567, 15: 9453}, + ("Category Fives", 7, 2): {0: 7609, 5: 24193, 10: 31722, 15: 23214, 20: 10140, 25: 3122}, + ("Category Fives", 7, 3): {0: 2262, 5: 11013, 10: 24443, 15: 29307, 20: 21387, 25: 11588}, + ("Category Fives", 7, 4): {0: 618, 5: 4583, 10: 14761, 15: 26159, 20: 28335, 25: 18050, 30: 7494}, + ("Category Fives", 7, 5): {0: 183, 10: 9616, 15: 19685, 20: 28915, 25: 26000, 30: 12883, 35: 2718}, + ("Category Fives", 7, 6): {0: 670, 15: 16878, 20: 25572, 25: 30456, 30: 20695, 35: 5729}, + ("Category Fives", 7, 7): {0: 255, 15: 9718, 20: 20696, 25: 31883, 30: 27333, 35: 10115}, + ("Category Fives", 7, 8): {0: 927, 15: 4700, 20: 15292, 25: 30298, 30: 33015, 35: 15768}, + ("Category Fives", 8, 0): {0: 100000}, + ("Category Fives", 8, 1): {0: 23333, 5: 37259, 10: 25947, 15: 10392, 20: 3069}, + ("Category Fives", 8, 2): {0: 5425, 5: 18915, 10: 29380, 15: 25994, 20: 14056, 25: 6230}, + ("Category Fives", 8, 3): {0: 1258, 5: 7317, 10: 18783, 15: 27375, 20: 24542, 25: 14322, 30: 6403}, + ("Category Fives", 8, 4): {0: 271, 10: 11864, 15: 20267, 20: 27158, 25: 23589, 30: 12529, 35: 4322}, + ("Category Fives", 8, 5): {0: 943, 10: 4260, 15: 12456, 20: 23115, 25: 27968, 30: 20704, 35: 10554}, + ("Category Fives", 8, 6): {0: 281, 15: 8625, 20: 17201, 25: 27484, 30: 27178, 35: 15414, 40: 3817}, + ("Category Fives", 8, 7): {0: 746, 20: 14964, 25: 23717, 30: 30426, 35: 22677, 40: 7470}, + ("Category Fives", 8, 8): {0: 261, 20: 8927, 25: 18714, 30: 31084, 35: 29126, 40: 11888}, + ("Category Sixes", 0, 0): {0: 100000}, + ("Category Sixes", 0, 1): {0: 100000}, + ("Category Sixes", 0, 2): {0: 100000}, + ("Category Sixes", 0, 3): {0: 100000}, + ("Category Sixes", 0, 4): {0: 100000}, + ("Category Sixes", 0, 5): {0: 100000}, + ("Category Sixes", 0, 6): {0: 100000}, + ("Category Sixes", 0, 7): {0: 100000}, + ("Category Sixes", 0, 8): {0: 100000}, + ("Category Sixes", 1, 0): {0: 100000}, + ("Category Sixes", 1, 1): {0: 83168, 6: 16832}, + ("Category Sixes", 1, 2): {0: 69548, 6: 30452}, + ("Category Sixes", 1, 3): {0: 57697, 6: 42303}, + ("Category Sixes", 1, 4): {0: 48043, 6: 51957}, + ("Category Sixes", 1, 5): {0: 39912, 6: 60088}, + ("Category Sixes", 1, 6): {0: 33499, 6: 66501}, + ("Category Sixes", 1, 7): {0: 28251, 6: 71749}, + ("Category Sixes", 1, 8): {0: 23206, 6: 76794}, + ("Category Sixes", 2, 0): {0: 100000}, + ("Category Sixes", 2, 1): {0: 69463, 6: 27651, 12: 2886}, + ("Category Sixes", 2, 2): {0: 47896, 6: 42794, 12: 9310}, + ("Category Sixes", 2, 3): {0: 33394, 6: 48757, 12: 17849}, + ("Category Sixes", 2, 4): {0: 23552, 6: 49554, 12: 26894}, + ("Category Sixes", 2, 5): {0: 16090, 6: 48098, 12: 35812}, + ("Category Sixes", 2, 6): {0: 11073, 6: 44833, 12: 44094}, + ("Category Sixes", 2, 7): {0: 7737, 6: 40480, 12: 51783}, + ("Category Sixes", 2, 8): {0: 5379, 6: 35672, 12: 58949}, + ("Category Sixes", 3, 0): {0: 100000}, + ("Category Sixes", 3, 1): {0: 57718, 6: 34818, 12: 7464}, + ("Category Sixes", 3, 2): {0: 33610, 6: 44328, 12: 19159, 18: 2903}, + ("Category Sixes", 3, 3): {0: 19366, 6: 42246, 12: 30952, 18: 7436}, + ("Category Sixes", 3, 4): {0: 11144, 6: 36281, 12: 38817, 18: 13758}, + ("Category Sixes", 3, 5): {0: 6414, 6: 28891, 12: 43114, 18: 21581}, + ("Category Sixes", 3, 6): {0: 3870, 6: 22394, 12: 44318, 18: 29418}, + ("Category Sixes", 3, 7): {0: 2188, 6: 16803, 12: 43487, 18: 37522}, + ("Category Sixes", 3, 8): {0: 1289, 6: 12421, 12: 41082, 18: 45208}, + ("Category Sixes", 4, 0): {0: 100000}, + ("Category Sixes", 4, 1): {0: 48197, 6: 38521, 12: 13282}, + ("Category Sixes", 4, 2): {0: 23155, 6: 41179, 12: 26935, 18: 8731}, + ("Category Sixes", 4, 3): {0: 11256, 6: 32609, 12: 35588, 18: 17390, 24: 3157}, + ("Category Sixes", 4, 4): {0: 5324, 6: 23265, 12: 37209, 18: 26929, 24: 7273}, + ("Category Sixes", 4, 5): {0: 2658, 6: 15488, 12: 34685, 18: 34476, 24: 12693}, + ("Category Sixes", 4, 6): {0: 1282, 6: 9997, 12: 29855, 18: 39379, 24: 19487}, + ("Category Sixes", 4, 7): {0: 588, 6: 6202, 12: 24396, 18: 41935, 24: 26879}, + ("Category Sixes", 4, 8): {0: 317, 6: 3863, 12: 19042, 18: 42180, 24: 34598}, + ("Category Sixes", 5, 0): {0: 100000}, + ("Category Sixes", 5, 1): {0: 40393, 6: 39904, 12: 16206, 18: 3497}, + ("Category Sixes", 5, 2): {0: 16202, 6: 35664, 12: 31241, 18: 13612, 24: 3281}, + ("Category Sixes", 5, 3): {0: 6456, 6: 23539, 12: 34585, 18: 25020, 24: 10400}, + ("Category Sixes", 5, 4): {0: 2581, 6: 13980, 12: 30355, 18: 32198, 24: 17115, 30: 3771}, + ("Category Sixes", 5, 5): {0: 1119, 6: 7775, 12: 23063, 18: 34716, 24: 25568, 30: 7759}, + ("Category Sixes", 5, 6): {0: 392, 6: 4171, 12: 16724, 18: 32792, 24: 32829, 30: 13092}, + ("Category Sixes", 5, 7): {0: 197, 12: 13627, 18: 29190, 24: 37560, 30: 19426}, + ("Category Sixes", 5, 8): {0: 1246, 12: 7404, 18: 24560, 24: 40134, 30: 26656}, + ("Category Sixes", 6, 0): {0: 100000}, + ("Category Sixes", 6, 1): {0: 33316, 6: 40218, 12: 20198, 18: 6268}, + ("Category Sixes", 6, 2): {0: 11256, 6: 29444, 12: 32590, 18: 19196, 24: 7514}, + ("Category Sixes", 6, 3): {0: 3787, 6: 16266, 12: 29873, 18: 29107, 24: 15863, 30: 5104}, + ("Category Sixes", 6, 4): {0: 1286, 6: 8066, 12: 21653, 18: 31264, 24: 25039, 30: 12692}, + ("Category Sixes", 6, 5): {0: 413, 6: 3777, 12: 13962, 18: 27705, 24: 30919, 30: 18670, 36: 4554}, + ("Category Sixes", 6, 6): {0: 146, 12: 10040, 18: 22320, 24: 32923, 30: 26086, 36: 8485}, + ("Category Sixes", 6, 7): {0: 814, 12: 4698, 18: 16286, 24: 31577, 30: 32487, 36: 14138}, + ("Category Sixes", 6, 8): {0: 328, 18: 14004, 24: 28064, 30: 37212, 36: 20392}, + ("Category Sixes", 7, 0): {0: 100000}, + ("Category Sixes", 7, 1): {0: 27852, 6: 38984, 12: 23499, 18: 9665}, + ("Category Sixes", 7, 2): {0: 7883, 6: 23846, 12: 31558, 18: 23295, 24: 10316, 30: 3102}, + ("Category Sixes", 7, 3): {0: 2186, 6: 10928, 12: 24321, 18: 29650, 24: 21177, 30: 9209, 36: 2529}, + ("Category Sixes", 7, 4): {0: 603, 6: 4459, 12: 14673, 18: 26303, 24: 28335, 30: 18228, 36: 7399}, + ("Category Sixes", 7, 5): {0: 172, 12: 9654, 18: 19381, 24: 29254, 30: 25790, 36: 12992, 42: 2757}, + ("Category Sixes", 7, 6): {0: 704, 12: 3864, 18: 13039, 24: 25760, 30: 30698, 36: 20143, 42: 5792}, + ("Category Sixes", 7, 7): {0: 257, 18: 9857, 24: 20557, 30: 31709, 36: 27546, 42: 10074}, + ("Category Sixes", 7, 8): {0: 872, 18: 4658, 24: 15419, 30: 30259, 36: 33183, 42: 15609}, + ("Category Sixes", 8, 0): {0: 100000}, + ("Category Sixes", 8, 1): {0: 23220, 6: 37213, 12: 25961, 18: 10483, 24: 3123}, + ("Category Sixes", 8, 2): {0: 5280, 6: 18943, 12: 29664, 18: 25777, 24: 14170, 30: 6166}, + ("Category Sixes", 8, 3): {0: 1246, 6: 7112, 12: 18757, 18: 27277, 24: 24802, 30: 14351, 36: 6455}, + ("Category Sixes", 8, 4): {0: 301, 12: 12044, 18: 20247, 24: 27146, 30: 23403, 36: 12524, 42: 4335}, + ("Category Sixes", 8, 5): {0: 859, 12: 4241, 18: 12477, 24: 23471, 30: 27655, 36: 20803, 42: 10494}, + ("Category Sixes", 8, 6): {0: 277, 18: 8656, 24: 17373, 30: 27347, 36: 27024, 42: 15394, 48: 3929}, + ("Category Sixes", 8, 7): {0: 766, 18: 3503, 24: 11451, 30: 23581, 36: 30772, 42: 22654, 48: 7273}, + ("Category Sixes", 8, 8): {6: 262, 24: 8866, 30: 18755, 36: 31116, 42: 28870, 48: 12131}, + ("Category Choice", 0, 0): {0: 100000}, + ("Category Choice", 0, 1): {0: 100000}, + ("Category Choice", 0, 2): {0: 100000}, + ("Category Choice", 0, 3): {0: 100000}, + ("Category Choice", 0, 4): {0: 100000}, + ("Category Choice", 0, 5): {0: 100000}, + ("Category Choice", 0, 6): {0: 100000}, + ("Category Choice", 0, 7): {0: 100000}, + ("Category Choice", 0, 8): {0: 100000}, + ("Category Choice", 1, 0): {0: 100000}, + ("Category Choice", 1, 1): {1: 16642, 3: 33501, 5: 33218, 6: 16639}, + ("Category Choice", 1, 2): {1: 10921, 3: 22060, 5: 39231, 6: 27788}, + ("Category Choice", 1, 3): {1: 9416, 4: 27917, 5: 22740, 6: 39927}, + ("Category Choice", 1, 4): {1: 15490, 3: 15489, 6: 69021}, + ("Category Choice", 1, 5): {1: 12817, 3: 12757, 6: 74426}, + ("Category Choice", 1, 6): {1: 10513, 3: 10719, 6: 78768}, + ("Category Choice", 1, 7): {1: 8893, 6: 91107}, + ("Category Choice", 1, 8): {1: 14698, 6: 85302}, + ("Category Choice", 2, 0): {0: 100000}, + ("Category Choice", 2, 1): {2: 8504, 6: 32987, 8: 30493, 11: 28016}, + ("Category Choice", 2, 2): {2: 3714, 7: 33270, 9: 25859, 11: 37157}, + ("Category Choice", 2, 3): {2: 5113, 5: 10402, 8: 25783, 10: 24173, 12: 34529}, + ("Category Choice", 2, 4): {2: 1783, 4: 8908, 8: 23189, 10: 22115, 12: 44005}, + ("Category Choice", 2, 5): {2: 7575, 8: 20444, 11: 38062, 12: 33919}, + ("Category Choice", 2, 6): {2: 5153, 9: 26383, 11: 25950, 12: 42514}, + ("Category Choice", 2, 7): {2: 3638, 7: 15197, 9: 14988, 12: 66177}, + ("Category Choice", 2, 8): {2: 2448, 7: 13306, 9: 12754, 12: 71492}, + ("Category Choice", 3, 0): {0: 100000}, + ("Category Choice", 3, 1): {3: 4589, 6: 11560, 9: 21469, 11: 25007, 13: 28332, 15: 9043}, + ("Category Choice", 3, 2): {3: 1380, 6: 8622, 9: 14417, 12: 23457, 14: 24807, 17: 27317}, + ("Category Choice", 3, 3): {3: 1605, 7: 9370, 10: 13491, 13: 24408, 15: 23065, 17: 28061}, + ("Category Choice", 3, 4): {3: 7212, 13: 32000, 15: 22707, 17: 38081}, + ("Category Choice", 3, 5): {3: 7989, 11: 10756, 14: 23811, 16: 21668, 18: 35776}, + ("Category Choice", 3, 6): {3: 3251, 10: 10272, 14: 21653, 17: 37049, 18: 27775}, + ("Category Choice", 3, 7): {3: 1018, 9: 8591, 15: 28080, 17: 26469, 18: 35842}, + ("Category Choice", 3, 8): {3: 6842, 15: 25118, 17: 24534, 18: 43506}, + ("Category Choice", 4, 0): {0: 100000}, + ("Category Choice", 4, 1): {4: 5386, 9: 10561, 13: 28501, 15: 21902, 17: 23999, 19: 9651}, + ("Category Choice", 4, 2): {4: 7510, 12: 10646, 16: 28145, 18: 22596, 19: 17705, 21: 13398}, + ("Category Choice", 4, 3): {4: 2392, 11: 8547, 14: 13300, 18: 29887, 20: 21680, 21: 15876, 23: 8318}, + ("Category Choice", 4, 4): {4: 2258, 12: 8230, 15: 12216, 19: 31486, 21: 20698, 23: 25112}, + ("Category Choice", 4, 5): {4: 2209, 13: 8484, 16: 11343, 19: 21913, 21: 21675, 23: 34376}, + ("Category Choice", 4, 6): {4: 2179, 14: 8704, 17: 12056, 20: 23300, 22: 20656, 24: 33105}, + ("Category Choice", 4, 7): {5: 7652, 19: 20489, 21: 20365, 23: 26176, 24: 25318}, + ("Category Choice", 4, 8): {5: 3231, 16: 8958, 21: 28789, 23: 25837, 24: 33185}, + ("Category Choice", 5, 0): {0: 100000}, + ("Category Choice", 5, 1): {5: 1575, 10: 8293, 13: 12130, 17: 28045, 20: 40099, 23: 9858}, + ("Category Choice", 5, 2): {5: 3298, 14: 10211, 17: 13118, 21: 28204, 24: 34078, 26: 11091}, + ("Category Choice", 5, 3): {6: 2633, 15: 8316, 18: 11302, 22: 26605, 24: 20431, 26: 22253, 28: 8460}, + ("Category Choice", 5, 4): {5: 4084, 17: 9592, 20: 13422, 24: 28620, 26: 20353, 27: 14979, 29: 8950}, + ("Category Choice", 5, 5): {6: 348, 14: 8075, 20: 10195, 22: 14679, 25: 22335, 28: 28253, 29: 16115}, + ("Category Choice", 5, 6): {7: 3204, 19: 9258, 22: 11859, 25: 21412, 27: 20895, 29: 33372}, + ("Category Choice", 5, 7): {8: 2983, 20: 9564, 23: 12501, 26: 22628, 29: 34285, 30: 18039}, + ("Category Choice", 5, 8): {9: 323, 17: 8259, 25: 20762, 27: 20118, 29: 25318, 30: 25220}, + ("Category Choice", 6, 0): {0: 100000}, + ("Category Choice", 6, 1): {6: 6102, 17: 21746, 21: 26524, 23: 25004, 25: 11086, 27: 9538}, + ("Category Choice", 6, 2): {8: 1504, 16: 8676, 20: 10032, 22: 14673, 26: 27312, 27: 16609, 29: 12133, 31: 9061}, + ("Category Choice", 6, 3): {6: 1896, 18: 8914, 22: 10226, 24: 14822, 28: 27213, 31: 28868, 33: 8061}, + ("Category Choice", 6, 4): {9: 441, 17: 8018, 25: 22453, 29: 26803, 32: 32275, 34: 10010}, + ("Category Choice", 6, 5): {10: 1788, 21: 8763, 25: 10319, 27: 14763, 31: 30144, 33: 23879, 35: 10344}, + ("Category Choice", 6, 6): {13: 876, 21: 8303, 28: 24086, 31: 21314, 34: 28149, 35: 17272}, + ("Category Choice", 6, 7): {12: 3570, 25: 9625, 28: 11348, 31: 20423, 33: 20469, 35: 34565}, + ("Category Choice", 6, 8): {12: 3450, 26: 9544, 29: 12230, 32: 22130, 35: 33671, 36: 18975}, + ("Category Choice", 7, 0): {0: 100000}, + ("Category Choice", 7, 1): {7: 1237, 15: 8100, 21: 23947, 25: 25361, 27: 22186, 31: 19169}, + ("Category Choice", 7, 2): {10: 2086, 20: 8960, 26: 23657, 30: 25264, 31: 15759, 33: 12356, 35: 11918}, + ("Category Choice", 7, 3): {10: 4980, 24: 9637, 27: 11247, 29: 15046, 33: 33492, 35: 13130, 37: 12468}, + ("Category Choice", 7, 4): {13: 2260, 24: 8651, 30: 23022, 34: 25656, 37: 29910, 39: 10501}, + ("Category Choice", 7, 5): {12: 3879, 27: 8154, 30: 10292, 32: 14692, 36: 27425, 38: 23596, 40: 11962}, + ("Category Choice", 7, 6): {14: 1957, 27: 8230, 33: 23945, 37: 29286, 39: 24519, 41: 12063}, + ("Category Choice", 7, 7): {16: 599, 26: 8344, 34: 22981, 37: 20883, 40: 28045, 42: 19148}, + ("Category Choice", 7, 8): {14: 3639, 31: 8907, 34: 10904, 37: 20148, 39: 20219, 41: 21627, 42: 14556}, + ("Category Choice", 8, 0): {0: 100000}, + ("Category Choice", 8, 1): {10: 752, 17: 8385, 24: 21460, 26: 15361, 29: 23513, 31: 12710, 35: 17819}, + ("Category Choice", 8, 2): {11: 5900, 26: 10331, 29: 11435, 31: 14533, 34: 23939, 36: 13855, 38: 10165, 40: 9842}, + ("Category Choice", 8, 3): {12: 2241, 26: 8099, 32: 20474, 34: 14786, 38: 31140, 40: 11751, 42: 11509}, + ("Category Choice", 8, 4): {16: 1327, 27: 8361, 34: 19865, 36: 15078, 40: 32325, 42: 12218, 44: 10826}, + ("Category Choice", 8, 5): {16: 4986, 32: 9031, 35: 10214, 37: 14528, 41: 25608, 42: 16131, 44: 11245, 46: 8257}, + ("Category Choice", 8, 6): {16: 2392, 32: 8742, 38: 23237, 42: 26333, 45: 30725, 47: 8571}, + ("Category Choice", 8, 7): {20: 1130, 32: 8231, 39: 22137, 43: 28783, 45: 25221, 47: 14498}, + ("Category Choice", 8, 8): {20: 73, 28: 8033, 40: 21670, 43: 20615, 46: 28105, 48: 21504}, + ("Category Inverse Choice", 0, 0): {0: 100000}, + ("Category Inverse Choice", 0, 1): {0: 100000}, + ("Category Inverse Choice", 0, 2): {0: 100000}, + ("Category Inverse Choice", 0, 3): {0: 100000}, + ("Category Inverse Choice", 0, 4): {0: 100000}, + ("Category Inverse Choice", 0, 5): {0: 100000}, + ("Category Inverse Choice", 0, 6): {0: 100000}, + ("Category Inverse Choice", 0, 7): {0: 100000}, + ("Category Inverse Choice", 0, 8): {0: 100000}, + ("Category Inverse Choice", 1, 0): {0: 100000}, + ("Category Inverse Choice", 1, 1): {1: 16642, 3: 33501, 5: 33218, 6: 16639}, + ("Category Inverse Choice", 1, 2): {1: 10921, 3: 22060, 5: 39231, 6: 27788}, + ("Category Inverse Choice", 1, 3): {1: 9416, 4: 27917, 5: 22740, 6: 39927}, + ("Category Inverse Choice", 1, 4): {1: 15490, 3: 15489, 6: 69021}, + ("Category Inverse Choice", 1, 5): {1: 12817, 3: 12757, 6: 74426}, + ("Category Inverse Choice", 1, 6): {1: 10513, 3: 10719, 6: 78768}, + ("Category Inverse Choice", 1, 7): {1: 8893, 6: 91107}, + ("Category Inverse Choice", 1, 8): {1: 14698, 6: 85302}, + ("Category Inverse Choice", 2, 0): {0: 100000}, + ("Category Inverse Choice", 2, 1): {2: 8504, 6: 32987, 8: 30493, 11: 28016}, + ("Category Inverse Choice", 2, 2): {2: 3714, 7: 33270, 9: 25859, 11: 37157}, + ("Category Inverse Choice", 2, 3): {2: 5113, 5: 10402, 8: 25783, 10: 24173, 12: 34529}, + ("Category Inverse Choice", 2, 4): {2: 1783, 4: 8908, 8: 23189, 10: 22115, 12: 44005}, + ("Category Inverse Choice", 2, 5): {2: 7575, 8: 20444, 11: 38062, 12: 33919}, + ("Category Inverse Choice", 2, 6): {2: 5153, 9: 26383, 11: 25950, 12: 42514}, + ("Category Inverse Choice", 2, 7): {2: 3638, 7: 15197, 9: 14988, 12: 66177}, + ("Category Inverse Choice", 2, 8): {2: 2448, 7: 13306, 9: 12754, 12: 71492}, + ("Category Inverse Choice", 3, 0): {0: 100000}, + ("Category Inverse Choice", 3, 1): {3: 4589, 6: 11560, 9: 21469, 11: 25007, 13: 28332, 15: 9043}, + ("Category Inverse Choice", 3, 2): {3: 1380, 6: 8622, 9: 14417, 12: 23457, 14: 24807, 17: 27317}, + ("Category Inverse Choice", 3, 3): {3: 1605, 7: 9370, 10: 13491, 13: 24408, 15: 23065, 17: 28061}, + ("Category Inverse Choice", 3, 4): {3: 7212, 13: 32000, 15: 22707, 17: 38081}, + ("Category Inverse Choice", 3, 5): {3: 7989, 11: 10756, 14: 23811, 16: 21668, 18: 35776}, + ("Category Inverse Choice", 3, 6): {3: 3251, 10: 10272, 14: 21653, 17: 37049, 18: 27775}, + ("Category Inverse Choice", 3, 7): {3: 1018, 9: 8591, 15: 28080, 17: 26469, 18: 35842}, + ("Category Inverse Choice", 3, 8): {3: 6842, 15: 25118, 17: 24534, 18: 43506}, + ("Category Inverse Choice", 4, 0): {0: 100000}, + ("Category Inverse Choice", 4, 1): {4: 5386, 9: 10561, 13: 28501, 15: 21902, 17: 23999, 19: 9651}, + ("Category Inverse Choice", 4, 2): {4: 7510, 12: 10646, 16: 28145, 18: 22596, 19: 17705, 21: 13398}, + ("Category Inverse Choice", 4, 3): {4: 2392, 11: 8547, 14: 13300, 18: 29887, 20: 21680, 21: 15876, 23: 8318}, + ("Category Inverse Choice", 4, 4): {4: 2258, 12: 8230, 15: 12216, 19: 31486, 21: 20698, 23: 25112}, + ("Category Inverse Choice", 4, 5): {4: 2209, 13: 8484, 16: 11343, 19: 21913, 21: 21675, 23: 34376}, + ("Category Inverse Choice", 4, 6): {4: 2179, 14: 8704, 17: 12056, 20: 23300, 22: 20656, 24: 33105}, + ("Category Inverse Choice", 4, 7): {5: 7652, 19: 20489, 21: 20365, 23: 26176, 24: 25318}, + ("Category Inverse Choice", 4, 8): {5: 3231, 16: 8958, 21: 28789, 23: 25837, 24: 33185}, + ("Category Inverse Choice", 5, 0): {0: 100000}, + ("Category Inverse Choice", 5, 1): {5: 1575, 10: 8293, 13: 12130, 17: 28045, 20: 40099, 23: 9858}, + ("Category Inverse Choice", 5, 2): {5: 3298, 14: 10211, 17: 13118, 21: 28204, 24: 34078, 26: 11091}, + ("Category Inverse Choice", 5, 3): {6: 2633, 15: 8316, 18: 11302, 22: 26605, 24: 20431, 26: 22253, 28: 8460}, + ("Category Inverse Choice", 5, 4): {5: 4084, 17: 9592, 20: 13422, 24: 28620, 26: 20353, 27: 14979, 29: 8950}, + ("Category Inverse Choice", 5, 5): {6: 348, 14: 8075, 20: 10195, 22: 14679, 25: 22335, 28: 28253, 29: 16115}, + ("Category Inverse Choice", 5, 6): {7: 3204, 19: 9258, 22: 11859, 25: 21412, 27: 20895, 29: 33372}, + ("Category Inverse Choice", 5, 7): {8: 2983, 20: 9564, 23: 12501, 26: 22628, 29: 34285, 30: 18039}, + ("Category Inverse Choice", 5, 8): {9: 323, 17: 8259, 25: 20762, 27: 20118, 29: 25318, 30: 25220}, + ("Category Inverse Choice", 6, 0): {0: 100000}, + ("Category Inverse Choice", 6, 1): {6: 6102, 17: 21746, 21: 26524, 23: 25004, 25: 11086, 27: 9538}, + ("Category Inverse Choice", 6, 2): { + 8: 1504, + 16: 8676, + 20: 10032, + 22: 14673, + 26: 27312, + 27: 16609, + 29: 12133, + 31: 9061, + }, + ("Category Inverse Choice", 6, 3): {6: 1896, 18: 8914, 22: 10226, 24: 14822, 28: 27213, 31: 28868, 33: 8061}, + ("Category Inverse Choice", 6, 4): {9: 441, 17: 8018, 25: 22453, 29: 26803, 32: 32275, 34: 10010}, + ("Category Inverse Choice", 6, 5): {10: 1788, 21: 8763, 25: 10319, 27: 14763, 31: 30144, 33: 23879, 35: 10344}, + ("Category Inverse Choice", 6, 6): {13: 876, 21: 8303, 28: 24086, 31: 21314, 34: 28149, 35: 17272}, + ("Category Inverse Choice", 6, 7): {12: 3570, 25: 9625, 28: 11348, 31: 20423, 33: 20469, 35: 34565}, + ("Category Inverse Choice", 6, 8): {12: 3450, 26: 9544, 29: 12230, 32: 22130, 35: 33671, 36: 18975}, + ("Category Inverse Choice", 7, 0): {0: 100000}, + ("Category Inverse Choice", 7, 1): {7: 1237, 15: 8100, 21: 23947, 25: 25361, 27: 22186, 31: 19169}, + ("Category Inverse Choice", 7, 2): {10: 2086, 20: 8960, 26: 23657, 30: 25264, 31: 15759, 33: 12356, 35: 11918}, + ("Category Inverse Choice", 7, 3): {10: 4980, 24: 9637, 27: 11247, 29: 15046, 33: 33492, 35: 13130, 37: 12468}, + ("Category Inverse Choice", 7, 4): {13: 2260, 24: 8651, 30: 23022, 34: 25656, 37: 29910, 39: 10501}, + ("Category Inverse Choice", 7, 5): {12: 3879, 27: 8154, 30: 10292, 32: 14692, 36: 27425, 38: 23596, 40: 11962}, + ("Category Inverse Choice", 7, 6): {14: 1957, 27: 8230, 33: 23945, 37: 29286, 39: 24519, 41: 12063}, + ("Category Inverse Choice", 7, 7): {16: 599, 26: 8344, 34: 22981, 37: 20883, 40: 28045, 42: 19148}, + ("Category Inverse Choice", 7, 8): {14: 3639, 31: 8907, 34: 10904, 37: 20148, 39: 20219, 41: 21627, 42: 14556}, + ("Category Inverse Choice", 8, 0): {0: 100000}, + ("Category Inverse Choice", 8, 1): {10: 752, 17: 8385, 24: 21460, 26: 15361, 29: 23513, 31: 12710, 35: 17819}, + ("Category Inverse Choice", 8, 2): { + 11: 5900, + 26: 10331, + 29: 11435, + 31: 14533, + 34: 23939, + 36: 13855, + 38: 10165, + 40: 9842, + }, + ("Category Inverse Choice", 8, 3): {12: 2241, 26: 8099, 32: 20474, 34: 14786, 38: 31140, 40: 11751, 42: 11509}, + ("Category Inverse Choice", 8, 4): {16: 1327, 27: 8361, 34: 19865, 36: 15078, 40: 32325, 42: 12218, 44: 10826}, + ("Category Inverse Choice", 8, 5): { + 16: 4986, + 32: 9031, + 35: 10214, + 37: 14528, + 41: 25608, + 42: 16131, + 44: 11245, + 46: 8257, + }, + ("Category Inverse Choice", 8, 6): {16: 2392, 32: 8742, 38: 23237, 42: 26333, 45: 30725, 47: 8571}, + ("Category Inverse Choice", 8, 7): {20: 1130, 32: 8231, 39: 22137, 43: 28783, 45: 25221, 47: 14498}, + ("Category Inverse Choice", 8, 8): {20: 73, 28: 8033, 40: 21670, 43: 20615, 46: 28105, 48: 21504}, + ("Category Pair", 0, 0): {0: 100000}, + ("Category Pair", 0, 1): {0: 100000}, + ("Category Pair", 0, 2): {0: 100000}, + ("Category Pair", 0, 3): {0: 100000}, + ("Category Pair", 0, 4): {0: 100000}, + ("Category Pair", 0, 5): {0: 100000}, + ("Category Pair", 0, 6): {0: 100000}, + ("Category Pair", 0, 7): {0: 100000}, + ("Category Pair", 0, 8): {0: 100000}, + ("Category Pair", 1, 0): {0: 100000}, + ("Category Pair", 1, 1): {0: 100000}, + ("Category Pair", 1, 2): {0: 100000}, + ("Category Pair", 1, 3): {0: 100000}, + ("Category Pair", 1, 4): {0: 100000}, + ("Category Pair", 1, 5): {0: 100000}, + ("Category Pair", 1, 6): {0: 100000}, + ("Category Pair", 1, 7): {0: 100000}, + ("Category Pair", 1, 8): {0: 100000}, + ("Category Pair", 2, 0): {0: 100000}, + ("Category Pair", 2, 1): {0: 83388, 10: 16612}, + ("Category Pair", 2, 2): {0: 69422, 10: 30578}, + ("Category Pair", 2, 3): {0: 57830, 10: 42170}, + ("Category Pair", 2, 4): {0: 48195, 10: 51805}, + ("Category Pair", 2, 5): {0: 40117, 10: 59883}, + ("Category Pair", 2, 6): {0: 33286, 10: 66714}, + ("Category Pair", 2, 7): {0: 27917, 10: 72083}, + ("Category Pair", 2, 8): {0: 23354, 10: 76646}, + ("Category Pair", 3, 0): {0: 100000}, + ("Category Pair", 3, 1): {0: 55518, 10: 44482}, + ("Category Pair", 3, 2): {0: 30904, 10: 69096}, + ("Category Pair", 3, 3): {0: 17242, 10: 82758}, + ("Category Pair", 3, 4): {0: 9486, 10: 90514}, + ("Category Pair", 3, 5): {0: 5362, 10: 94638}, + ("Category Pair", 3, 6): {0: 2909, 10: 97091}, + ("Category Pair", 3, 7): {0: 1574, 10: 98426}, + ("Category Pair", 3, 8): {0: 902, 10: 99098}, + ("Category Pair", 4, 0): {0: 100000}, + ("Category Pair", 4, 1): {0: 27789, 10: 72211}, + ("Category Pair", 4, 2): {0: 7799, 10: 92201}, + ("Category Pair", 4, 3): {0: 2113, 10: 97887}, + ("Category Pair", 4, 4): {0: 601, 10: 99399}, + ("Category Pair", 4, 5): {0: 155, 10: 99845}, + ("Category Pair", 4, 6): {0: 43, 10: 99957}, + ("Category Pair", 4, 7): {0: 10, 10: 99990}, + ("Category Pair", 4, 8): {0: 3, 10: 99997}, + ("Category Pair", 5, 0): {0: 100000}, + ("Category Pair", 5, 1): {0: 9298, 10: 90702}, + ("Category Pair", 5, 2): {0: 863, 10: 99137}, + ("Category Pair", 5, 3): {0: 79, 10: 99921}, + ("Category Pair", 5, 4): {0: 2, 10: 99998}, + ("Category Pair", 5, 5): {0: 2, 10: 99998}, + ("Category Pair", 5, 6): {10: 100000}, + ("Category Pair", 5, 7): {10: 100000}, + ("Category Pair", 5, 8): {10: 100000}, + ("Category Pair", 6, 0): {0: 100000}, + ("Category Pair", 6, 1): {0: 1541, 10: 98459}, + ("Category Pair", 6, 2): {0: 23, 10: 99977}, + ("Category Pair", 6, 3): {10: 100000}, + ("Category Pair", 6, 4): {10: 100000}, + ("Category Pair", 6, 5): {10: 100000}, + ("Category Pair", 6, 6): {10: 100000}, + ("Category Pair", 6, 7): {10: 100000}, + ("Category Pair", 6, 8): {10: 100000}, + ("Category Pair", 7, 0): {0: 100000}, + ("Category Pair", 7, 1): {10: 100000}, + ("Category Pair", 7, 2): {10: 100000}, + ("Category Pair", 7, 3): {10: 100000}, + ("Category Pair", 7, 4): {10: 100000}, + ("Category Pair", 7, 5): {10: 100000}, + ("Category Pair", 7, 6): {10: 100000}, + ("Category Pair", 7, 7): {10: 100000}, + ("Category Pair", 7, 8): {10: 100000}, + ("Category Pair", 8, 0): {0: 100000}, + ("Category Pair", 8, 1): {10: 100000}, + ("Category Pair", 8, 2): {10: 100000}, + ("Category Pair", 8, 3): {10: 100000}, + ("Category Pair", 8, 4): {10: 100000}, + ("Category Pair", 8, 5): {10: 100000}, + ("Category Pair", 8, 6): {10: 100000}, + ("Category Pair", 8, 7): {10: 100000}, + ("Category Pair", 8, 8): {10: 100000}, + ("Category Three of a Kind", 0, 0): {0: 100000}, + ("Category Three of a Kind", 0, 1): {0: 100000}, + ("Category Three of a Kind", 0, 2): {0: 100000}, + ("Category Three of a Kind", 0, 3): {0: 100000}, + ("Category Three of a Kind", 0, 4): {0: 100000}, + ("Category Three of a Kind", 0, 5): {0: 100000}, + ("Category Three of a Kind", 0, 6): {0: 100000}, + ("Category Three of a Kind", 0, 7): {0: 100000}, + ("Category Three of a Kind", 0, 8): {0: 100000}, + ("Category Three of a Kind", 1, 0): {0: 100000}, + ("Category Three of a Kind", 1, 1): {0: 100000}, + ("Category Three of a Kind", 1, 2): {0: 100000}, + ("Category Three of a Kind", 1, 3): {0: 100000}, + ("Category Three of a Kind", 1, 4): {0: 100000}, + ("Category Three of a Kind", 1, 5): {0: 100000}, + ("Category Three of a Kind", 1, 6): {0: 100000}, + ("Category Three of a Kind", 1, 7): {0: 100000}, + ("Category Three of a Kind", 1, 8): {0: 100000}, + ("Category Three of a Kind", 2, 0): {0: 100000}, + ("Category Three of a Kind", 2, 1): {0: 100000}, + ("Category Three of a Kind", 2, 2): {0: 100000}, + ("Category Three of a Kind", 2, 3): {0: 100000}, + ("Category Three of a Kind", 2, 4): {0: 100000}, + ("Category Three of a Kind", 2, 5): {0: 100000}, + ("Category Three of a Kind", 2, 6): {0: 100000}, + ("Category Three of a Kind", 2, 7): {0: 100000}, + ("Category Three of a Kind", 2, 8): {0: 100000}, + ("Category Three of a Kind", 3, 0): {0: 100000}, + ("Category Three of a Kind", 3, 1): {0: 97222, 20: 2778}, + ("Category Three of a Kind", 3, 2): {0: 88880, 20: 11120}, + ("Category Three of a Kind", 3, 3): {0: 78187, 20: 21813}, + ("Category Three of a Kind", 3, 4): {0: 67476, 20: 32524}, + ("Category Three of a Kind", 3, 5): {0: 57476, 20: 42524}, + ("Category Three of a Kind", 3, 6): {0: 48510, 20: 51490}, + ("Category Three of a Kind", 3, 7): {0: 40921, 20: 59079}, + ("Category Three of a Kind", 3, 8): {0: 34533, 20: 65467}, + ("Category Three of a Kind", 4, 0): {0: 100000}, + ("Category Three of a Kind", 4, 1): {0: 90316, 20: 9684}, + ("Category Three of a Kind", 4, 2): {0: 68401, 20: 31599}, + ("Category Three of a Kind", 4, 3): {0: 49383, 20: 50617}, + ("Category Three of a Kind", 4, 4): {0: 34399, 20: 65601}, + ("Category Three of a Kind", 4, 5): {0: 24154, 20: 75846}, + ("Category Three of a Kind", 4, 6): {0: 16802, 20: 83198}, + ("Category Three of a Kind", 4, 7): {0: 11623, 20: 88377}, + ("Category Three of a Kind", 4, 8): {0: 8105, 20: 91895}, + ("Category Three of a Kind", 5, 0): {0: 100000}, + ("Category Three of a Kind", 5, 1): {0: 78629, 20: 21371}, + ("Category Three of a Kind", 5, 2): {0: 46013, 20: 53987}, + ("Category Three of a Kind", 5, 3): {0: 25698, 20: 74302}, + ("Category Three of a Kind", 5, 4): {0: 14205, 20: 85795}, + ("Category Three of a Kind", 5, 5): {0: 7932, 20: 92068}, + ("Category Three of a Kind", 5, 6): {0: 4357, 20: 95643}, + ("Category Three of a Kind", 5, 7): {0: 2432, 20: 97568}, + ("Category Three of a Kind", 5, 8): {0: 1378, 20: 98622}, + ("Category Three of a Kind", 6, 0): {0: 100000}, + ("Category Three of a Kind", 6, 1): {0: 63231, 20: 36769}, + ("Category Three of a Kind", 6, 2): {0: 26818, 20: 73182}, + ("Category Three of a Kind", 6, 3): {0: 11075, 20: 88925}, + ("Category Three of a Kind", 6, 4): {0: 4749, 20: 95251}, + ("Category Three of a Kind", 6, 5): {0: 1982, 20: 98018}, + ("Category Three of a Kind", 6, 6): {0: 827, 20: 99173}, + ("Category Three of a Kind", 6, 7): {0: 358, 20: 99642}, + ("Category Three of a Kind", 6, 8): {0: 146, 20: 99854}, + ("Category Three of a Kind", 7, 0): {0: 100000}, + ("Category Three of a Kind", 7, 1): {0: 45975, 20: 54025}, + ("Category Three of a Kind", 7, 2): {0: 13207, 20: 86793}, + ("Category Three of a Kind", 7, 3): {0: 3727, 20: 96273}, + ("Category Three of a Kind", 7, 4): {0: 1097, 20: 98903}, + ("Category Three of a Kind", 7, 5): {0: 313, 20: 99687}, + ("Category Three of a Kind", 7, 6): {0: 96, 20: 99904}, + ("Category Three of a Kind", 7, 7): {0: 22, 20: 99978}, + ("Category Three of a Kind", 7, 8): {0: 8, 20: 99992}, + ("Category Three of a Kind", 8, 0): {0: 100000}, + ("Category Three of a Kind", 8, 1): {0: 29316, 20: 70684}, + ("Category Three of a Kind", 8, 2): {0: 5027, 20: 94973}, + ("Category Three of a Kind", 8, 3): {0: 857, 20: 99143}, + ("Category Three of a Kind", 8, 4): {0: 162, 20: 99838}, + ("Category Three of a Kind", 8, 5): {0: 25, 20: 99975}, + ("Category Three of a Kind", 8, 6): {0: 4, 20: 99996}, + ("Category Three of a Kind", 8, 7): {0: 1, 20: 99999}, + ("Category Three of a Kind", 8, 8): {20: 100000}, + ("Category Four of a Kind", 0, 0): {0: 100000}, + ("Category Four of a Kind", 0, 1): {0: 100000}, + ("Category Four of a Kind", 0, 2): {0: 100000}, + ("Category Four of a Kind", 0, 3): {0: 100000}, + ("Category Four of a Kind", 0, 4): {0: 100000}, + ("Category Four of a Kind", 0, 5): {0: 100000}, + ("Category Four of a Kind", 0, 6): {0: 100000}, + ("Category Four of a Kind", 0, 7): {0: 100000}, + ("Category Four of a Kind", 0, 8): {0: 100000}, + ("Category Four of a Kind", 1, 0): {0: 100000}, + ("Category Four of a Kind", 1, 1): {0: 100000}, + ("Category Four of a Kind", 1, 2): {0: 100000}, + ("Category Four of a Kind", 1, 3): {0: 100000}, + ("Category Four of a Kind", 1, 4): {0: 100000}, + ("Category Four of a Kind", 1, 5): {0: 100000}, + ("Category Four of a Kind", 1, 6): {0: 100000}, + ("Category Four of a Kind", 1, 7): {0: 100000}, + ("Category Four of a Kind", 1, 8): {0: 100000}, + ("Category Four of a Kind", 2, 0): {0: 100000}, + ("Category Four of a Kind", 2, 1): {0: 100000}, + ("Category Four of a Kind", 2, 2): {0: 100000}, + ("Category Four of a Kind", 2, 3): {0: 100000}, + ("Category Four of a Kind", 2, 4): {0: 100000}, + ("Category Four of a Kind", 2, 5): {0: 100000}, + ("Category Four of a Kind", 2, 6): {0: 100000}, + ("Category Four of a Kind", 2, 7): {0: 100000}, + ("Category Four of a Kind", 2, 8): {0: 100000}, + ("Category Four of a Kind", 3, 0): {0: 100000}, + ("Category Four of a Kind", 3, 1): {0: 100000}, + ("Category Four of a Kind", 3, 2): {0: 100000}, + ("Category Four of a Kind", 3, 3): {0: 100000}, + ("Category Four of a Kind", 3, 4): {0: 100000}, + ("Category Four of a Kind", 3, 5): {0: 100000}, + ("Category Four of a Kind", 3, 6): {0: 100000}, + ("Category Four of a Kind", 3, 7): {0: 100000}, + ("Category Four of a Kind", 3, 8): {0: 100000}, + ("Category Four of a Kind", 4, 0): {0: 100000}, + ("Category Four of a Kind", 4, 1): {0: 99516, 30: 484}, + ("Category Four of a Kind", 4, 2): {0: 96122, 30: 3878}, + ("Category Four of a Kind", 4, 3): {0: 89867, 30: 10133}, + ("Category Four of a Kind", 4, 4): {0: 81771, 30: 18229}, + ("Category Four of a Kind", 4, 5): {0: 72893, 30: 27107}, + ("Category Four of a Kind", 4, 6): {0: 64000, 30: 36000}, + ("Category Four of a Kind", 4, 7): {0: 55921, 30: 44079}, + ("Category Four of a Kind", 4, 8): {0: 48175, 30: 51825}, + ("Category Four of a Kind", 5, 0): {0: 100000}, + ("Category Four of a Kind", 5, 1): {0: 97938, 30: 2062}, + ("Category Four of a Kind", 5, 2): {0: 86751, 30: 13249}, + ("Category Four of a Kind", 5, 3): {0: 70886, 30: 29114}, + ("Category Four of a Kind", 5, 4): {0: 54807, 30: 45193}, + ("Category Four of a Kind", 5, 5): {0: 41729, 30: 58271}, + ("Category Four of a Kind", 5, 6): {0: 30960, 30: 69040}, + ("Category Four of a Kind", 5, 7): {0: 22207, 30: 77793}, + ("Category Four of a Kind", 5, 8): {0: 16027, 30: 83973}, + ("Category Four of a Kind", 6, 0): {0: 100000}, + ("Category Four of a Kind", 6, 1): {0: 94810, 30: 5190}, + ("Category Four of a Kind", 6, 2): {0: 73147, 30: 26853}, + ("Category Four of a Kind", 6, 3): {0: 49873, 30: 50127}, + ("Category Four of a Kind", 6, 4): {0: 31913, 30: 68087}, + ("Category Four of a Kind", 6, 5): {0: 19877, 30: 80123}, + ("Category Four of a Kind", 6, 6): {0: 11973, 30: 88027}, + ("Category Four of a Kind", 6, 7): {0: 7324, 30: 92676}, + ("Category Four of a Kind", 6, 8): {0: 4221, 30: 95779}, + ("Category Four of a Kind", 7, 0): {0: 100000}, + ("Category Four of a Kind", 7, 1): {0: 89422, 30: 10578}, + ("Category Four of a Kind", 7, 2): {0: 57049, 30: 42951}, + ("Category Four of a Kind", 7, 3): {0: 30903, 30: 69097}, + ("Category Four of a Kind", 7, 4): {0: 15962, 30: 84038}, + ("Category Four of a Kind", 7, 5): {0: 8148, 30: 91852}, + ("Category Four of a Kind", 7, 6): {0: 3943, 30: 96057}, + ("Category Four of a Kind", 7, 7): {0: 1933, 30: 98067}, + ("Category Four of a Kind", 7, 8): {0: 912, 30: 99088}, + ("Category Four of a Kind", 8, 0): {0: 100000}, + ("Category Four of a Kind", 8, 1): {0: 81614, 30: 18386}, + ("Category Four of a Kind", 8, 2): {0: 40524, 30: 59476}, + ("Category Four of a Kind", 8, 3): {0: 17426, 30: 82574}, + ("Category Four of a Kind", 8, 4): {0: 6958, 30: 93042}, + ("Category Four of a Kind", 8, 5): {0: 2862, 30: 97138}, + ("Category Four of a Kind", 8, 6): {0: 1049, 30: 98951}, + ("Category Four of a Kind", 8, 7): {0: 401, 30: 99599}, + ("Category Four of a Kind", 8, 8): {0: 156, 30: 99844}, + ("Category Tiny Straight", 0, 0): {0: 100000}, + ("Category Tiny Straight", 0, 1): {0: 100000}, + ("Category Tiny Straight", 0, 2): {0: 100000}, + ("Category Tiny Straight", 0, 3): {0: 100000}, + ("Category Tiny Straight", 0, 4): {0: 100000}, + ("Category Tiny Straight", 0, 5): {0: 100000}, + ("Category Tiny Straight", 0, 6): {0: 100000}, + ("Category Tiny Straight", 0, 7): {0: 100000}, + ("Category Tiny Straight", 0, 8): {0: 100000}, + ("Category Tiny Straight", 1, 0): {0: 100000}, + ("Category Tiny Straight", 1, 1): {0: 100000}, + ("Category Tiny Straight", 1, 2): {0: 100000}, + ("Category Tiny Straight", 1, 3): {0: 100000}, + ("Category Tiny Straight", 1, 4): {0: 100000}, + ("Category Tiny Straight", 1, 5): {0: 100000}, + ("Category Tiny Straight", 1, 6): {0: 100000}, + ("Category Tiny Straight", 1, 7): {0: 100000}, + ("Category Tiny Straight", 1, 8): {0: 100000}, + ("Category Tiny Straight", 2, 0): {0: 100000}, + ("Category Tiny Straight", 2, 1): {0: 100000}, + ("Category Tiny Straight", 2, 2): {0: 100000}, + ("Category Tiny Straight", 2, 3): {0: 100000}, + ("Category Tiny Straight", 2, 4): {0: 100000}, + ("Category Tiny Straight", 2, 5): {0: 100000}, + ("Category Tiny Straight", 2, 6): {0: 100000}, + ("Category Tiny Straight", 2, 7): {0: 100000}, + ("Category Tiny Straight", 2, 8): {0: 100000}, + ("Category Tiny Straight", 3, 0): {0: 100000}, + ("Category Tiny Straight", 3, 1): {0: 91672, 20: 8328}, + ("Category Tiny Straight", 3, 2): {0: 79082, 20: 20918}, + ("Category Tiny Straight", 3, 3): {0: 66490, 20: 33510}, + ("Category Tiny Straight", 3, 4): {0: 55797, 20: 44203}, + ("Category Tiny Straight", 3, 5): {0: 46967, 20: 53033}, + ("Category Tiny Straight", 3, 6): {0: 39595, 20: 60405}, + ("Category Tiny Straight", 3, 7): {0: 33384, 20: 66616}, + ("Category Tiny Straight", 3, 8): {0: 28747, 20: 71253}, + ("Category Tiny Straight", 4, 0): {0: 100000}, + ("Category Tiny Straight", 4, 1): {0: 78812, 20: 21188}, + ("Category Tiny Straight", 4, 2): {0: 55525, 20: 44475}, + ("Category Tiny Straight", 4, 3): {0: 38148, 20: 61852}, + ("Category Tiny Straight", 4, 4): {0: 26432, 20: 73568}, + ("Category Tiny Straight", 4, 5): {0: 18225, 20: 81775}, + ("Category Tiny Straight", 4, 6): {0: 12758, 20: 87242}, + ("Category Tiny Straight", 4, 7): {0: 8991, 20: 91009}, + ("Category Tiny Straight", 4, 8): {0: 6325, 20: 93675}, + ("Category Tiny Straight", 5, 0): {0: 100000}, + ("Category Tiny Straight", 5, 1): {0: 64979, 20: 35021}, + ("Category Tiny Straight", 5, 2): {0: 36509, 20: 63491}, + ("Category Tiny Straight", 5, 3): {0: 20576, 20: 79424}, + ("Category Tiny Straight", 5, 4): {0: 11585, 20: 88415}, + ("Category Tiny Straight", 5, 5): {0: 6874, 20: 93126}, + ("Category Tiny Straight", 5, 6): {0: 3798, 20: 96202}, + ("Category Tiny Straight", 5, 7): {0: 2214, 20: 97786}, + ("Category Tiny Straight", 5, 8): {0: 1272, 20: 98728}, + ("Category Tiny Straight", 6, 0): {0: 100000}, + ("Category Tiny Straight", 6, 1): {0: 52157, 20: 47843}, + ("Category Tiny Straight", 6, 2): {0: 23641, 20: 76359}, + ("Category Tiny Straight", 6, 3): {0: 10883, 20: 89117}, + ("Category Tiny Straight", 6, 4): {0: 5127, 20: 94873}, + ("Category Tiny Straight", 6, 5): {0: 2442, 20: 97558}, + ("Category Tiny Straight", 6, 6): {0: 1158, 20: 98842}, + ("Category Tiny Straight", 6, 7): {0: 542, 20: 99458}, + ("Category Tiny Straight", 6, 8): {0: 252, 20: 99748}, + ("Category Tiny Straight", 7, 0): {0: 100000}, + ("Category Tiny Straight", 7, 1): {0: 41492, 20: 58508}, + ("Category Tiny Straight", 7, 2): {0: 15072, 20: 84928}, + ("Category Tiny Straight", 7, 3): {0: 5905, 20: 94095}, + ("Category Tiny Straight", 7, 4): {0: 2246, 20: 97754}, + ("Category Tiny Straight", 7, 5): {0: 942, 20: 99058}, + ("Category Tiny Straight", 7, 6): {0: 337, 20: 99663}, + ("Category Tiny Straight", 7, 7): {0: 155, 20: 99845}, + ("Category Tiny Straight", 7, 8): {0: 61, 20: 99939}, + ("Category Tiny Straight", 8, 0): {0: 100000}, + ("Category Tiny Straight", 8, 1): {0: 32993, 20: 67007}, + ("Category Tiny Straight", 8, 2): {0: 10074, 20: 89926}, + ("Category Tiny Straight", 8, 3): {0: 3158, 20: 96842}, + ("Category Tiny Straight", 8, 4): {0: 1060, 20: 98940}, + ("Category Tiny Straight", 8, 5): {0: 356, 20: 99644}, + ("Category Tiny Straight", 8, 6): {0: 117, 20: 99883}, + ("Category Tiny Straight", 8, 7): {0: 32, 20: 99968}, + ("Category Tiny Straight", 8, 8): {0: 10, 20: 99990}, + ("Category Small Straight", 0, 0): {0: 100000}, + ("Category Small Straight", 0, 1): {0: 100000}, + ("Category Small Straight", 0, 2): {0: 100000}, + ("Category Small Straight", 0, 3): {0: 100000}, + ("Category Small Straight", 0, 4): {0: 100000}, + ("Category Small Straight", 0, 5): {0: 100000}, + ("Category Small Straight", 0, 6): {0: 100000}, + ("Category Small Straight", 0, 7): {0: 100000}, + ("Category Small Straight", 0, 8): {0: 100000}, + ("Category Small Straight", 1, 0): {0: 100000}, + ("Category Small Straight", 1, 1): {0: 100000}, + ("Category Small Straight", 1, 2): {0: 100000}, + ("Category Small Straight", 1, 3): {0: 100000}, + ("Category Small Straight", 1, 4): {0: 100000}, + ("Category Small Straight", 1, 5): {0: 100000}, + ("Category Small Straight", 1, 6): {0: 100000}, + ("Category Small Straight", 1, 7): {0: 100000}, + ("Category Small Straight", 1, 8): {0: 100000}, + ("Category Small Straight", 2, 0): {0: 100000}, + ("Category Small Straight", 2, 1): {0: 100000}, + ("Category Small Straight", 2, 2): {0: 100000}, + ("Category Small Straight", 2, 3): {0: 100000}, + ("Category Small Straight", 2, 4): {0: 100000}, + ("Category Small Straight", 2, 5): {0: 100000}, + ("Category Small Straight", 2, 6): {0: 100000}, + ("Category Small Straight", 2, 7): {0: 100000}, + ("Category Small Straight", 2, 8): {0: 100000}, + ("Category Small Straight", 3, 0): {0: 100000}, + ("Category Small Straight", 3, 1): {0: 100000}, + ("Category Small Straight", 3, 2): {0: 100000}, + ("Category Small Straight", 3, 3): {0: 100000}, + ("Category Small Straight", 3, 4): {0: 100000}, + ("Category Small Straight", 3, 5): {0: 100000}, + ("Category Small Straight", 3, 6): {0: 100000}, + ("Category Small Straight", 3, 7): {0: 100000}, + ("Category Small Straight", 3, 8): {0: 100000}, + ("Category Small Straight", 4, 0): {0: 100000}, + ("Category Small Straight", 4, 1): {0: 94516, 30: 5484}, + ("Category Small Straight", 4, 2): {0: 82700, 30: 17300}, + ("Category Small Straight", 4, 3): {0: 67926, 30: 32074}, + ("Category Small Straight", 4, 4): {0: 54265, 30: 45735}, + ("Category Small Straight", 4, 5): {0: 42130, 30: 57870}, + ("Category Small Straight", 4, 6): {0: 32536, 30: 67464}, + ("Category Small Straight", 4, 7): {0: 25008, 30: 74992}, + ("Category Small Straight", 4, 8): {0: 19595, 30: 80405}, + ("Category Small Straight", 5, 0): {0: 100000}, + ("Category Small Straight", 5, 1): {0: 84528, 30: 15472}, + ("Category Small Straight", 5, 2): {0: 60775, 30: 39225}, + ("Category Small Straight", 5, 3): {0: 39543, 30: 60457}, + ("Category Small Straight", 5, 4): {0: 24760, 30: 75240}, + ("Category Small Straight", 5, 5): {0: 15713, 30: 84287}, + ("Category Small Straight", 5, 6): {0: 10199, 30: 89801}, + ("Category Small Straight", 5, 7): {0: 6618, 30: 93382}, + ("Category Small Straight", 5, 8): {0: 4205, 30: 95795}, + ("Category Small Straight", 6, 0): {0: 100000}, + ("Category Small Straight", 6, 1): {0: 73121, 30: 26879}, + ("Category Small Straight", 6, 2): {0: 41832, 30: 58168}, + ("Category Small Straight", 6, 3): {0: 21949, 30: 78051}, + ("Category Small Straight", 6, 4): {0: 11304, 30: 88696}, + ("Category Small Straight", 6, 5): {0: 6063, 30: 93937}, + ("Category Small Straight", 6, 6): {0: 3362, 30: 96638}, + ("Category Small Straight", 6, 7): {0: 1799, 30: 98201}, + ("Category Small Straight", 6, 8): {0: 1069, 30: 98931}, + ("Category Small Straight", 7, 0): {0: 100000}, + ("Category Small Straight", 7, 1): {0: 61837, 30: 38163}, + ("Category Small Straight", 7, 2): {0: 28202, 30: 71798}, + ("Category Small Straight", 7, 3): {0: 12187, 30: 87813}, + ("Category Small Straight", 7, 4): {0: 5427, 30: 94573}, + ("Category Small Straight", 7, 5): {0: 2444, 30: 97556}, + ("Category Small Straight", 7, 6): {0: 1144, 30: 98856}, + ("Category Small Straight", 7, 7): {0: 588, 30: 99412}, + ("Category Small Straight", 7, 8): {0: 258, 30: 99742}, + ("Category Small Straight", 8, 0): {0: 100000}, + ("Category Small Straight", 8, 1): {0: 51394, 30: 48606}, + ("Category Small Straight", 8, 2): {0: 19090, 30: 80910}, + ("Category Small Straight", 8, 3): {0: 7104, 30: 92896}, + ("Category Small Straight", 8, 4): {0: 2645, 30: 97355}, + ("Category Small Straight", 8, 5): {0: 1010, 30: 98990}, + ("Category Small Straight", 8, 6): {0: 408, 30: 99592}, + ("Category Small Straight", 8, 7): {0: 153, 30: 99847}, + ("Category Small Straight", 8, 8): {0: 78, 30: 99922}, + ("Category Large Straight", 0, 0): {0: 100000}, + ("Category Large Straight", 0, 1): {0: 100000}, + ("Category Large Straight", 0, 2): {0: 100000}, + ("Category Large Straight", 0, 3): {0: 100000}, + ("Category Large Straight", 0, 4): {0: 100000}, + ("Category Large Straight", 0, 5): {0: 100000}, + ("Category Large Straight", 0, 6): {0: 100000}, + ("Category Large Straight", 0, 7): {0: 100000}, + ("Category Large Straight", 0, 8): {0: 100000}, + ("Category Large Straight", 1, 0): {0: 100000}, + ("Category Large Straight", 1, 1): {0: 100000}, + ("Category Large Straight", 1, 2): {0: 100000}, + ("Category Large Straight", 1, 3): {0: 100000}, + ("Category Large Straight", 1, 4): {0: 100000}, + ("Category Large Straight", 1, 5): {0: 100000}, + ("Category Large Straight", 1, 6): {0: 100000}, + ("Category Large Straight", 1, 7): {0: 100000}, + ("Category Large Straight", 1, 8): {0: 100000}, + ("Category Large Straight", 2, 0): {0: 100000}, + ("Category Large Straight", 2, 1): {0: 100000}, + ("Category Large Straight", 2, 2): {0: 100000}, + ("Category Large Straight", 2, 3): {0: 100000}, + ("Category Large Straight", 2, 4): {0: 100000}, + ("Category Large Straight", 2, 5): {0: 100000}, + ("Category Large Straight", 2, 6): {0: 100000}, + ("Category Large Straight", 2, 7): {0: 100000}, + ("Category Large Straight", 2, 8): {0: 100000}, + ("Category Large Straight", 3, 0): {0: 100000}, + ("Category Large Straight", 3, 1): {0: 100000}, + ("Category Large Straight", 3, 2): {0: 100000}, + ("Category Large Straight", 3, 3): {0: 100000}, + ("Category Large Straight", 3, 4): {0: 100000}, + ("Category Large Straight", 3, 5): {0: 100000}, + ("Category Large Straight", 3, 6): {0: 100000}, + ("Category Large Straight", 3, 7): {0: 100000}, + ("Category Large Straight", 3, 8): {0: 100000}, + ("Category Large Straight", 4, 0): {0: 100000}, + ("Category Large Straight", 4, 1): {0: 100000}, + ("Category Large Straight", 4, 2): {0: 100000}, + ("Category Large Straight", 4, 3): {0: 100000}, + ("Category Large Straight", 4, 4): {0: 100000}, + ("Category Large Straight", 4, 5): {0: 100000}, + ("Category Large Straight", 4, 6): {0: 100000}, + ("Category Large Straight", 4, 7): {0: 100000}, + ("Category Large Straight", 4, 8): {0: 100000}, + ("Category Large Straight", 5, 0): {0: 100000}, + ("Category Large Straight", 5, 1): {0: 96929, 40: 3071}, + ("Category Large Straight", 5, 2): {0: 87056, 40: 12944}, + ("Category Large Straight", 5, 3): {0: 75101, 40: 24899}, + ("Category Large Straight", 5, 4): {0: 63617, 40: 36383}, + ("Category Large Straight", 5, 5): {0: 53149, 40: 46851}, + ("Category Large Straight", 5, 6): {0: 44321, 40: 55679}, + ("Category Large Straight", 5, 7): {0: 36948, 40: 63052}, + ("Category Large Straight", 5, 8): {0: 30661, 40: 69339}, + ("Category Large Straight", 6, 0): {0: 100000}, + ("Category Large Straight", 6, 1): {0: 90756, 40: 9244}, + ("Category Large Straight", 6, 2): {0: 69805, 40: 30195}, + ("Category Large Straight", 6, 3): {0: 49814, 40: 50186}, + ("Category Large Straight", 6, 4): {0: 35102, 40: 64898}, + ("Category Large Straight", 6, 5): {0: 24385, 40: 75615}, + ("Category Large Straight", 6, 6): {0: 17018, 40: 82982}, + ("Category Large Straight", 6, 7): {0: 11739, 40: 88261}, + ("Category Large Straight", 6, 8): {0: 7972, 40: 92028}, + ("Category Large Straight", 7, 0): {0: 100000}, + ("Category Large Straight", 7, 1): {0: 82840, 40: 17160}, + ("Category Large Straight", 7, 2): {0: 52821, 40: 47179}, + ("Category Large Straight", 7, 3): {0: 31348, 40: 68652}, + ("Category Large Straight", 7, 4): {0: 18166, 40: 81834}, + ("Category Large Straight", 7, 5): {0: 10690, 40: 89310}, + ("Category Large Straight", 7, 6): {0: 6051, 40: 93949}, + ("Category Large Straight", 7, 7): {0: 3617, 40: 96383}, + ("Category Large Straight", 7, 8): {0: 1941, 40: 98059}, + ("Category Large Straight", 8, 0): {0: 100000}, + ("Category Large Straight", 8, 1): {0: 73520, 40: 26480}, + ("Category Large Straight", 8, 2): {0: 39031, 40: 60969}, + ("Category Large Straight", 8, 3): {0: 19156, 40: 80844}, + ("Category Large Straight", 8, 4): {0: 9304, 40: 90696}, + ("Category Large Straight", 8, 5): {0: 4420, 40: 95580}, + ("Category Large Straight", 8, 6): {0: 2141, 40: 97859}, + ("Category Large Straight", 8, 7): {0: 1037, 40: 98963}, + ("Category Large Straight", 8, 8): {0: 511, 40: 99489}, + ("Category Full House", 0, 0): {0: 100000}, + ("Category Full House", 0, 1): {0: 100000}, + ("Category Full House", 0, 2): {0: 100000}, + ("Category Full House", 0, 3): {0: 100000}, + ("Category Full House", 0, 4): {0: 100000}, + ("Category Full House", 0, 5): {0: 100000}, + ("Category Full House", 0, 6): {0: 100000}, + ("Category Full House", 0, 7): {0: 100000}, + ("Category Full House", 0, 8): {0: 100000}, + ("Category Full House", 1, 0): {0: 100000}, + ("Category Full House", 1, 1): {0: 100000}, + ("Category Full House", 1, 2): {0: 100000}, + ("Category Full House", 1, 3): {0: 100000}, + ("Category Full House", 1, 4): {0: 100000}, + ("Category Full House", 1, 5): {0: 100000}, + ("Category Full House", 1, 6): {0: 100000}, + ("Category Full House", 1, 7): {0: 100000}, + ("Category Full House", 1, 8): {0: 100000}, + ("Category Full House", 2, 0): {0: 100000}, + ("Category Full House", 2, 1): {0: 100000}, + ("Category Full House", 2, 2): {0: 100000}, + ("Category Full House", 2, 3): {0: 100000}, + ("Category Full House", 2, 4): {0: 100000}, + ("Category Full House", 2, 5): {0: 100000}, + ("Category Full House", 2, 6): {0: 100000}, + ("Category Full House", 2, 7): {0: 100000}, + ("Category Full House", 2, 8): {0: 100000}, + ("Category Full House", 3, 0): {0: 100000}, + ("Category Full House", 3, 1): {0: 100000}, + ("Category Full House", 3, 2): {0: 100000}, + ("Category Full House", 3, 3): {0: 100000}, + ("Category Full House", 3, 4): {0: 100000}, + ("Category Full House", 3, 5): {0: 100000}, + ("Category Full House", 3, 6): {0: 100000}, + ("Category Full House", 3, 7): {0: 100000}, + ("Category Full House", 3, 8): {0: 100000}, + ("Category Full House", 4, 0): {0: 100000}, + ("Category Full House", 4, 1): {0: 100000}, + ("Category Full House", 4, 2): {0: 100000}, + ("Category Full House", 4, 3): {0: 100000}, + ("Category Full House", 4, 4): {0: 100000}, + ("Category Full House", 4, 5): {0: 100000}, + ("Category Full House", 4, 6): {0: 100000}, + ("Category Full House", 4, 7): {0: 100000}, + ("Category Full House", 4, 8): {0: 100000}, + ("Category Full House", 5, 0): {0: 100000}, + ("Category Full House", 5, 1): {0: 96155, 25: 3845}, + ("Category Full House", 5, 2): {0: 81391, 25: 18609}, + ("Category Full House", 5, 3): {0: 64300, 25: 35700}, + ("Category Full House", 5, 4): {0: 49669, 25: 50331}, + ("Category Full House", 5, 5): {0: 38019, 25: 61981}, + ("Category Full House", 5, 6): {0: 29751, 25: 70249}, + ("Category Full House", 5, 7): {0: 22960, 25: 77040}, + ("Category Full House", 5, 8): {0: 18650, 25: 81350}, + ("Category Full House", 6, 0): {0: 100000}, + ("Category Full House", 6, 1): {0: 82989, 25: 17011}, + ("Category Full House", 6, 2): {0: 47153, 25: 52847}, + ("Category Full House", 6, 3): {0: 24151, 25: 75849}, + ("Category Full House", 6, 4): {0: 12519, 25: 87481}, + ("Category Full House", 6, 5): {0: 6524, 25: 93476}, + ("Category Full House", 6, 6): {0: 3606, 25: 96394}, + ("Category Full House", 6, 7): {0: 1959, 25: 98041}, + ("Category Full House", 6, 8): {0: 1026, 25: 98974}, + ("Category Full House", 7, 0): {0: 100000}, + ("Category Full House", 7, 1): {0: 60232, 25: 39768}, + ("Category Full House", 7, 2): {0: 18894, 25: 81106}, + ("Category Full House", 7, 3): {0: 5682, 25: 94318}, + ("Category Full House", 7, 4): {0: 1706, 25: 98294}, + ("Category Full House", 7, 5): {0: 522, 25: 99478}, + ("Category Full House", 7, 6): {0: 146, 25: 99854}, + ("Category Full House", 7, 7): {0: 54, 25: 99946}, + ("Category Full House", 7, 8): {0: 18, 25: 99982}, + ("Category Full House", 8, 0): {0: 100000}, + ("Category Full House", 8, 1): {0: 35909, 25: 64091}, + ("Category Full House", 8, 2): {0: 5712, 25: 94288}, + ("Category Full House", 8, 3): {0: 930, 25: 99070}, + ("Category Full House", 8, 4): {0: 165, 25: 99835}, + ("Category Full House", 8, 5): {0: 19, 25: 99981}, + ("Category Full House", 8, 6): {0: 6, 25: 99994}, + ("Category Full House", 8, 7): {25: 100000}, + ("Category Full House", 8, 8): {25: 100000}, + ("Category Yacht", 0, 0): {0: 100000}, + ("Category Yacht", 0, 1): {0: 100000}, + ("Category Yacht", 0, 2): {0: 100000}, + ("Category Yacht", 0, 3): {0: 100000}, + ("Category Yacht", 0, 4): {0: 100000}, + ("Category Yacht", 0, 5): {0: 100000}, + ("Category Yacht", 0, 6): {0: 100000}, + ("Category Yacht", 0, 7): {0: 100000}, + ("Category Yacht", 0, 8): {0: 100000}, + ("Category Yacht", 1, 0): {0: 100000}, + ("Category Yacht", 1, 1): {0: 100000}, + ("Category Yacht", 1, 2): {0: 100000}, + ("Category Yacht", 1, 3): {0: 100000}, + ("Category Yacht", 1, 4): {0: 100000}, + ("Category Yacht", 1, 5): {0: 100000}, + ("Category Yacht", 1, 6): {0: 100000}, + ("Category Yacht", 1, 7): {0: 100000}, + ("Category Yacht", 1, 8): {0: 100000}, + ("Category Yacht", 2, 0): {0: 100000}, + ("Category Yacht", 2, 1): {0: 100000}, + ("Category Yacht", 2, 2): {0: 100000}, + ("Category Yacht", 2, 3): {0: 100000}, + ("Category Yacht", 2, 4): {0: 100000}, + ("Category Yacht", 2, 5): {0: 100000}, + ("Category Yacht", 2, 6): {0: 100000}, + ("Category Yacht", 2, 7): {0: 100000}, + ("Category Yacht", 2, 8): {0: 100000}, + ("Category Yacht", 3, 0): {0: 100000}, + ("Category Yacht", 3, 1): {0: 100000}, + ("Category Yacht", 3, 2): {0: 100000}, + ("Category Yacht", 3, 3): {0: 100000}, + ("Category Yacht", 3, 4): {0: 100000}, + ("Category Yacht", 3, 5): {0: 100000}, + ("Category Yacht", 3, 6): {0: 100000}, + ("Category Yacht", 3, 7): {0: 100000}, + ("Category Yacht", 3, 8): {0: 100000}, + ("Category Yacht", 4, 0): {0: 100000}, + ("Category Yacht", 4, 1): {0: 100000}, + ("Category Yacht", 4, 2): {0: 100000}, + ("Category Yacht", 4, 3): {0: 100000}, + ("Category Yacht", 4, 4): {0: 100000}, + ("Category Yacht", 4, 5): {0: 100000}, + ("Category Yacht", 4, 6): {0: 100000}, + ("Category Yacht", 4, 7): {0: 100000}, + ("Category Yacht", 4, 8): {0: 100000}, + ("Category Yacht", 5, 0): {0: 100000}, + ("Category Yacht", 5, 1): {0: 100000}, + ("Category Yacht", 5, 2): {0: 98727, 50: 1273}, + ("Category Yacht", 5, 3): {0: 95347, 50: 4653}, + ("Category Yacht", 5, 4): {0: 89969, 50: 10031}, + ("Category Yacht", 5, 5): {0: 83124, 50: 16876}, + ("Category Yacht", 5, 6): {0: 75023, 50: 24977}, + ("Category Yacht", 5, 7): {0: 67007, 50: 32993}, + ("Category Yacht", 5, 8): {0: 58618, 50: 41382}, + ("Category Yacht", 6, 0): {0: 100000}, + ("Category Yacht", 6, 1): {0: 99571, 50: 429}, + ("Category Yacht", 6, 2): {0: 94726, 50: 5274}, + ("Category Yacht", 6, 3): {0: 84366, 50: 15634}, + ("Category Yacht", 6, 4): {0: 70782, 50: 29218}, + ("Category Yacht", 6, 5): {0: 56573, 50: 43427}, + ("Category Yacht", 6, 6): {0: 44206, 50: 55794}, + ("Category Yacht", 6, 7): {0: 33578, 50: 66422}, + ("Category Yacht", 6, 8): {0: 25079, 50: 74921}, + ("Category Yacht", 7, 0): {0: 100000}, + ("Category Yacht", 7, 1): {0: 98833, 50: 1167}, + ("Category Yacht", 7, 2): {0: 87511, 50: 12489}, + ("Category Yacht", 7, 3): {0: 68252, 50: 31748}, + ("Category Yacht", 7, 4): {0: 49065, 50: 50935}, + ("Category Yacht", 7, 5): {0: 33364, 50: 66636}, + ("Category Yacht", 7, 6): {0: 21483, 50: 78517}, + ("Category Yacht", 7, 7): {0: 13597, 50: 86403}, + ("Category Yacht", 7, 8): {0: 8483, 50: 91517}, + ("Category Yacht", 8, 0): {0: 100000}, + ("Category Yacht", 8, 1): {0: 97212, 50: 2788}, + ("Category Yacht", 8, 2): {0: 76962, 50: 23038}, + ("Category Yacht", 8, 3): {0: 50533, 50: 49467}, + ("Category Yacht", 8, 4): {0: 29981, 50: 70019}, + ("Category Yacht", 8, 5): {0: 16776, 50: 83224}, + ("Category Yacht", 8, 6): {0: 9079, 50: 90921}, + ("Category Yacht", 8, 7): {0: 4705, 50: 95295}, + ("Category Yacht", 8, 8): {0: 2363, 50: 97637}, + ("Category Distincts", 1, 1): {1: 100000}, + ("Category Distincts", 1, 2): {1: 100000}, + ("Category Distincts", 1, 3): {1: 100000}, + ("Category Distincts", 1, 4): {1: 100000}, + ("Category Distincts", 1, 5): {1: 100000}, + ("Category Distincts", 1, 6): {1: 100000}, + ("Category Distincts", 1, 7): {1: 100000}, + ("Category Distincts", 1, 8): {1: 100000}, + ("Category Distincts", 2, 1): {1: 16804, 2: 83196}, + ("Category Distincts", 2, 2): {1: 2686, 2: 97314}, + ("Category Distincts", 2, 3): {1: 463, 2: 99537}, + ("Category Distincts", 2, 4): {1: 66, 2: 99934}, + ("Category Distincts", 2, 5): {1: 11, 2: 99989}, + ("Category Distincts", 2, 6): {1: 1, 2: 99999}, + ("Category Distincts", 2, 7): {2: 100000}, + ("Category Distincts", 2, 8): {2: 100000}, + ("Category Distincts", 3, 1): {1: 2760, 2: 41714, 3: 55526}, + ("Category Distincts", 3, 2): {1: 78, 3: 99922}, + ("Category Distincts", 3, 3): {1: 4866, 3: 95134}, + ("Category Distincts", 3, 4): {2: 1659, 3: 98341}, + ("Category Distincts", 3, 5): {2: 575, 3: 99425}, + ("Category Distincts", 3, 6): {2: 200, 3: 99800}, + ("Category Distincts", 3, 7): {2: 69, 3: 99931}, + ("Category Distincts", 3, 8): {2: 22, 3: 99978}, + ("Category Distincts", 4, 1): {1: 494, 3: 71611, 4: 27895}, + ("Category Distincts", 4, 2): {1: 1893, 3: 36922, 4: 61185}, + ("Category Distincts", 4, 3): {2: 230, 4: 99770}, + ("Category Distincts", 4, 4): {2: 21, 4: 99979}, + ("Category Distincts", 4, 5): {2: 4906, 4: 95094}, + ("Category Distincts", 4, 6): {3: 2494, 4: 97506}, + ("Category Distincts", 4, 7): {3: 1297, 4: 98703}, + ("Category Distincts", 4, 8): {3: 611, 4: 99389}, + ("Category Distincts", 5, 1): {1: 5798, 3: 38538, 4: 55664}, + ("Category Distincts", 5, 2): {2: 196, 4: 68119, 5: 31685}, + ("Category Distincts", 5, 3): {2: 3022, 4: 44724, 5: 52254}, + ("Category Distincts", 5, 4): {3: 722, 4: 31632, 5: 67646}, + ("Category Distincts", 5, 5): {3: 215, 4: 21391, 5: 78394}, + ("Category Distincts", 5, 6): {3: 55, 5: 99945}, + ("Category Distincts", 5, 7): {3: 15, 5: 99985}, + ("Category Distincts", 5, 8): {3: 6463, 5: 93537}, + ("Category Distincts", 6, 1): {1: 2027, 3: 22985, 4: 50464, 5: 24524}, + ("Category Distincts", 6, 2): {2: 3299, 4: 35174, 5: 61527}, + ("Category Distincts", 6, 3): {3: 417, 5: 79954, 6: 19629}, + ("Category Distincts", 6, 4): {3: 7831, 5: 61029, 6: 31140}, + ("Category Distincts", 6, 5): {3: 3699, 5: 54997, 6: 41304}, + ("Category Distincts", 6, 6): {4: 1557, 5: 47225, 6: 51218}, + ("Category Distincts", 6, 7): {4: 728, 5: 40465, 6: 58807}, + ("Category Distincts", 6, 8): {4: 321, 5: 33851, 6: 65828}, + ("Category Distincts", 7, 1): {1: 665, 4: 57970, 5: 41365}, + ("Category Distincts", 7, 2): {2: 839, 5: 75578, 6: 23583}, + ("Category Distincts", 7, 3): {3: 6051, 5: 50312, 6: 43637}, + ("Category Distincts", 7, 4): {3: 1796, 5: 38393, 6: 59811}, + ("Category Distincts", 7, 5): {4: 529, 5: 27728, 6: 71743}, + ("Category Distincts", 7, 6): {4: 164, 6: 99836}, + ("Category Distincts", 7, 7): {4: 53, 6: 99947}, + ("Category Distincts", 7, 8): {4: 14, 6: 99986}, + ("Category Distincts", 8, 1): {1: 7137, 4: 36582, 5: 56281}, + ("Category Distincts", 8, 2): {2: 233, 5: 59964, 6: 39803}, + ("Category Distincts", 8, 3): {3: 1976, 5: 34748, 6: 63276}, + ("Category Distincts", 8, 4): {4: 389, 5: 21008, 6: 78603}, + ("Category Distincts", 8, 5): {4: 78, 6: 99922}, + ("Category Distincts", 8, 6): {4: 7177, 6: 92823}, + ("Category Distincts", 8, 7): {4: 4179, 6: 95821}, + ("Category Distincts", 8, 8): {5: 2440, 6: 97560}, + ("Category Two times Ones", 0, 0): {0: 100000}, + ("Category Two times Ones", 0, 1): {0: 100000}, + ("Category Two times Ones", 0, 2): {0: 100000}, + ("Category Two times Ones", 0, 3): {0: 100000}, + ("Category Two times Ones", 0, 4): {0: 100000}, + ("Category Two times Ones", 0, 5): {0: 100000}, + ("Category Two times Ones", 0, 6): {0: 100000}, + ("Category Two times Ones", 0, 7): {0: 100000}, + ("Category Two times Ones", 0, 8): {0: 100000}, + ("Category Two times Ones", 1, 0): {0: 100000}, + ("Category Two times Ones", 1, 1): {0: 83475, 2: 16525}, + ("Category Two times Ones", 1, 2): {0: 69690, 2: 30310}, + ("Category Two times Ones", 1, 3): {0: 57818, 2: 42182}, + ("Category Two times Ones", 1, 4): {0: 48418, 2: 51582}, + ("Category Two times Ones", 1, 5): {0: 40301, 2: 59699}, + ("Category Two times Ones", 1, 6): {0: 33558, 2: 66442}, + ("Category Two times Ones", 1, 7): {0: 28182, 2: 71818}, + ("Category Two times Ones", 1, 8): {0: 23406, 2: 76594}, + ("Category Two times Ones", 2, 0): {0: 100000}, + ("Category Two times Ones", 2, 1): {0: 69724, 2: 30276}, + ("Category Two times Ones", 2, 2): {0: 48238, 2: 42479, 4: 9283}, + ("Category Two times Ones", 2, 3): {0: 33290, 2: 48819, 4: 17891}, + ("Category Two times Ones", 2, 4): {0: 23136, 2: 49957, 4: 26907}, + ("Category Two times Ones", 2, 5): {0: 16146, 2: 48200, 4: 35654}, + ("Category Two times Ones", 2, 6): {0: 11083, 2: 44497, 4: 44420}, + ("Category Two times Ones", 2, 7): {0: 7662, 2: 40343, 4: 51995}, + ("Category Two times Ones", 2, 8): {0: 5354, 2: 35526, 4: 59120}, + ("Category Two times Ones", 3, 0): {0: 100000}, + ("Category Two times Ones", 3, 1): {0: 58021, 2: 34522, 4: 7457}, + ("Category Two times Ones", 3, 2): {0: 33548, 2: 44261, 4: 22191}, + ("Category Two times Ones", 3, 3): {0: 19375, 2: 42372, 4: 30748, 6: 7505}, + ("Category Two times Ones", 3, 4): {0: 10998, 2: 36435, 4: 38569, 6: 13998}, + ("Category Two times Ones", 3, 5): {0: 6519, 2: 28838, 4: 43283, 6: 21360}, + ("Category Two times Ones", 3, 6): {0: 3619, 2: 22498, 4: 44233, 6: 29650}, + ("Category Two times Ones", 3, 7): {0: 2195, 2: 16979, 4: 43684, 6: 37142}, + ("Category Two times Ones", 3, 8): {0: 1255, 2: 12420, 4: 40920, 6: 45405}, + ("Category Two times Ones", 4, 0): {0: 100000}, + ("Category Two times Ones", 4, 1): {0: 48235, 2: 38602, 4: 13163}, + ("Category Two times Ones", 4, 2): {0: 23289, 2: 40678, 4: 27102, 6: 8931}, + ("Category Two times Ones", 4, 3): {0: 11177, 2: 32677, 4: 35702, 6: 20444}, + ("Category Two times Ones", 4, 4): {0: 5499, 2: 23225, 4: 37240, 6: 26867, 8: 7169}, + ("Category Two times Ones", 4, 5): {0: 2574, 2: 15782, 4: 34605, 6: 34268, 8: 12771}, + ("Category Two times Ones", 4, 6): {0: 1259, 4: 39616, 6: 39523, 8: 19602}, + ("Category Two times Ones", 4, 7): {0: 622, 4: 30426, 6: 41894, 8: 27058}, + ("Category Two times Ones", 4, 8): {0: 4091, 4: 18855, 6: 42309, 8: 34745}, + ("Category Two times Ones", 5, 0): {0: 100000}, + ("Category Two times Ones", 5, 1): {0: 40028, 2: 40241, 4: 19731}, + ("Category Two times Ones", 5, 2): {0: 16009, 2: 35901, 4: 31024, 6: 17066}, + ("Category Two times Ones", 5, 3): {0: 6489, 2: 23477, 4: 34349, 6: 25270, 8: 10415}, + ("Category Two times Ones", 5, 4): {0: 2658, 2: 14032, 4: 30199, 6: 32214, 8: 20897}, + ("Category Two times Ones", 5, 5): {0: 1032, 4: 31627, 6: 33993, 8: 25853, 10: 7495}, + ("Category Two times Ones", 5, 6): {0: 450, 4: 20693, 6: 32774, 8: 32900, 10: 13183}, + ("Category Two times Ones", 5, 7): {0: 2396, 4: 11231, 6: 29481, 8: 37636, 10: 19256}, + ("Category Two times Ones", 5, 8): {0: 1171, 6: 31564, 8: 40798, 10: 26467}, + ("Category Two times Ones", 6, 0): {0: 100000}, + ("Category Two times Ones", 6, 1): {0: 33502, 2: 40413, 4: 26085}, + ("Category Two times Ones", 6, 2): {0: 11210, 2: 29638, 4: 32701, 6: 18988, 8: 7463}, + ("Category Two times Ones", 6, 3): {0: 3673, 2: 16459, 4: 29795, 6: 29102, 8: 20971}, + ("Category Two times Ones", 6, 4): {0: 1243, 4: 30025, 6: 31053, 8: 25066, 10: 12613}, + ("Category Two times Ones", 6, 5): {0: 4194, 4: 13949, 6: 28142, 8: 30723, 10: 22992}, + ("Category Two times Ones", 6, 6): {0: 1800, 6: 30677, 8: 32692, 10: 26213, 12: 8618}, + ("Category Two times Ones", 6, 7): {0: 775, 6: 21013, 8: 31410, 10: 32532, 12: 14270}, + ("Category Two times Ones", 6, 8): {0: 2855, 6: 11432, 8: 27864, 10: 37237, 12: 20612}, + ("Category Two times Ones", 7, 0): {0: 100000}, + ("Category Two times Ones", 7, 1): {0: 27683, 2: 39060, 4: 23574, 6: 9683}, + ("Category Two times Ones", 7, 2): {0: 7824, 2: 24031, 4: 31764, 6: 23095, 8: 13286}, + ("Category Two times Ones", 7, 3): {0: 2148, 2: 11019, 4: 24197, 6: 29599, 8: 21250, 10: 11787}, + ("Category Two times Ones", 7, 4): {0: 564, 4: 19036, 6: 26395, 8: 28409, 10: 18080, 12: 7516}, + ("Category Two times Ones", 7, 5): {0: 1913, 6: 27198, 8: 29039, 10: 26129, 12: 15721}, + ("Category Two times Ones", 7, 6): {0: 54, 6: 17506, 8: 25752, 10: 30413, 12: 26275}, + ("Category Two times Ones", 7, 7): {0: 2179, 8: 28341, 10: 32054, 12: 27347, 14: 10079}, + ("Category Two times Ones", 7, 8): {0: 942, 8: 19835, 10: 30248, 12: 33276, 14: 15699}, + ("Category Two times Ones", 8, 0): {0: 100000}, + ("Category Two times Ones", 8, 1): {0: 23378, 2: 37157, 4: 26082, 6: 13383}, + ("Category Two times Ones", 8, 2): {0: 5420, 2: 19164, 4: 29216, 6: 25677, 8: 20523}, + ("Category Two times Ones", 8, 3): {0: 1271, 4: 26082, 6: 27054, 8: 24712, 10: 20881}, + ("Category Two times Ones", 8, 4): {0: 2889, 6: 29552, 8: 27389, 10: 23232, 12: 16938}, + ("Category Two times Ones", 8, 5): {0: 879, 6: 16853, 8: 23322, 10: 27882, 12: 20768, 14: 10296}, + ("Category Two times Ones", 8, 6): {0: 2041, 8: 24140, 10: 27398, 12: 27048, 14: 19373}, + ("Category Two times Ones", 8, 7): {0: 74, 8: 15693, 10: 23675, 12: 30829, 14: 22454, 16: 7275}, + ("Category Two times Ones", 8, 8): {2: 2053, 10: 25677, 12: 31310, 14: 28983, 16: 11977}, + ("Category Half of Sixes", 0, 0): {0: 100000}, + ("Category Half of Sixes", 0, 1): {0: 100000}, + ("Category Half of Sixes", 0, 2): {0: 100000}, + ("Category Half of Sixes", 0, 3): {0: 100000}, + ("Category Half of Sixes", 0, 4): {0: 100000}, + ("Category Half of Sixes", 0, 5): {0: 100000}, + ("Category Half of Sixes", 0, 6): {0: 100000}, + ("Category Half of Sixes", 0, 7): {0: 100000}, + ("Category Half of Sixes", 0, 8): {0: 100000}, + ("Category Half of Sixes", 1, 0): {0: 100000}, + ("Category Half of Sixes", 1, 1): {0: 83343, 3: 16657}, + ("Category Half of Sixes", 1, 2): {0: 69569, 3: 30431}, + ("Category Half of Sixes", 1, 3): {0: 57872, 3: 42128}, + ("Category Half of Sixes", 1, 4): {0: 48081, 3: 51919}, + ("Category Half of Sixes", 1, 5): {0: 40271, 3: 59729}, + ("Category Half of Sixes", 1, 6): {0: 33201, 3: 66799}, + ("Category Half of Sixes", 1, 7): {0: 27903, 3: 72097}, + ("Category Half of Sixes", 1, 8): {0: 23240, 3: 76760}, + ("Category Half of Sixes", 2, 0): {0: 100000}, + ("Category Half of Sixes", 2, 1): {0: 69419, 3: 30581}, + ("Category Half of Sixes", 2, 2): {0: 48202, 3: 42590, 6: 9208}, + ("Category Half of Sixes", 2, 3): {0: 33376, 3: 48849, 6: 17775}, + ("Category Half of Sixes", 2, 4): {0: 23276, 3: 49810, 6: 26914}, + ("Category Half of Sixes", 2, 5): {0: 16092, 3: 47718, 6: 36190}, + ("Category Half of Sixes", 2, 6): {0: 11232, 3: 44515, 6: 44253}, + ("Category Half of Sixes", 2, 7): {0: 7589, 3: 40459, 6: 51952}, + ("Category Half of Sixes", 2, 8): {0: 5447, 3: 35804, 6: 58749}, + ("Category Half of Sixes", 3, 0): {0: 100000}, + ("Category Half of Sixes", 3, 1): {0: 57964, 3: 34701, 6: 7335}, + ("Category Half of Sixes", 3, 2): {0: 33637, 3: 44263, 6: 22100}, + ("Category Half of Sixes", 3, 3): {0: 19520, 3: 42382, 6: 30676, 9: 7422}, + ("Category Half of Sixes", 3, 4): {0: 11265, 3: 35772, 6: 39042, 9: 13921}, + ("Category Half of Sixes", 3, 5): {0: 6419, 3: 28916, 6: 43261, 9: 21404}, + ("Category Half of Sixes", 3, 6): {0: 3810, 3: 22496, 6: 44388, 9: 29306}, + ("Category Half of Sixes", 3, 7): {0: 2174, 3: 16875, 6: 43720, 9: 37231}, + ("Category Half of Sixes", 3, 8): {0: 1237, 3: 12471, 6: 41222, 9: 45070}, + ("Category Half of Sixes", 4, 0): {0: 100000}, + ("Category Half of Sixes", 4, 1): {0: 48121, 3: 38786, 6: 13093}, + ("Category Half of Sixes", 4, 2): {0: 23296, 3: 40989, 6: 26998, 9: 8717}, + ("Category Half of Sixes", 4, 3): {0: 11233, 3: 32653, 6: 35710, 9: 20404}, + ("Category Half of Sixes", 4, 4): {0: 5463, 3: 23270, 6: 37468, 9: 26734, 12: 7065}, + ("Category Half of Sixes", 4, 5): {0: 2691, 3: 15496, 6: 34539, 9: 34635, 12: 12639}, + ("Category Half of Sixes", 4, 6): {0: 1221, 3: 10046, 6: 29811, 9: 39190, 12: 19732}, + ("Category Half of Sixes", 4, 7): {0: 599, 6: 30742, 9: 41614, 12: 27045}, + ("Category Half of Sixes", 4, 8): {0: 309, 6: 22719, 9: 42236, 12: 34736}, + ("Category Half of Sixes", 5, 0): {0: 100000}, + ("Category Half of Sixes", 5, 1): {0: 40183, 3: 40377, 6: 19440}, + ("Category Half of Sixes", 5, 2): {0: 16197, 3: 35494, 6: 30937, 9: 17372}, + ("Category Half of Sixes", 5, 3): {0: 6583, 3: 23394, 6: 34432, 9: 25239, 12: 10352}, + ("Category Half of Sixes", 5, 4): {0: 2636, 3: 14072, 6: 30134, 9: 32371, 12: 20787}, + ("Category Half of Sixes", 5, 5): {0: 1075, 3: 7804, 6: 23010, 9: 34811, 12: 25702, 15: 7598}, + ("Category Half of Sixes", 5, 6): {0: 418, 6: 20888, 9: 32809, 12: 32892, 15: 12993}, + ("Category Half of Sixes", 5, 7): {0: 2365, 6: 11416, 9: 29072, 12: 37604, 15: 19543}, + ("Category Half of Sixes", 5, 8): {0: 1246, 6: 7425, 9: 24603, 12: 40262, 15: 26464}, + ("Category Half of Sixes", 6, 0): {0: 100000}, + ("Category Half of Sixes", 6, 1): {0: 33473, 3: 40175, 6: 20151, 9: 6201}, + ("Category Half of Sixes", 6, 2): {0: 11147, 3: 29592, 6: 32630, 9: 19287, 12: 7344}, + ("Category Half of Sixes", 6, 3): {0: 3628, 3: 16528, 6: 29814, 9: 29006, 12: 15888, 15: 5136}, + ("Category Half of Sixes", 6, 4): {0: 1262, 3: 8236, 6: 21987, 9: 30953, 12: 24833, 15: 12729}, + ("Category Half of Sixes", 6, 5): {0: 416, 6: 17769, 9: 27798, 12: 31197, 15: 18256, 18: 4564}, + ("Category Half of Sixes", 6, 6): {0: 1796, 6: 8372, 9: 22175, 12: 32897, 15: 26264, 18: 8496}, + ("Category Half of Sixes", 6, 7): {0: 791, 9: 21074, 12: 31385, 15: 32666, 18: 14084}, + ("Category Half of Sixes", 6, 8): {0: 20, 9: 14150, 12: 28320, 15: 36982, 18: 20528}, + ("Category Half of Sixes", 7, 0): {0: 100000}, + ("Category Half of Sixes", 7, 1): {0: 27933, 3: 39105, 6: 23338, 9: 9624}, + ("Category Half of Sixes", 7, 2): {0: 7794, 3: 23896, 6: 31832, 9: 23110, 12: 13368}, + ("Category Half of Sixes", 7, 3): {0: 2138, 3: 11098, 6: 24140, 9: 29316, 12: 21386, 15: 11922}, + ("Category Half of Sixes", 7, 4): {0: 590, 6: 19385, 9: 26233, 12: 28244, 15: 18118, 18: 7430}, + ("Category Half of Sixes", 7, 5): {0: 1941, 6: 7953, 9: 19439, 12: 28977, 15: 26078, 18: 15612}, + ("Category Half of Sixes", 7, 6): {0: 718, 9: 16963, 12: 25793, 15: 30535, 18: 20208, 21: 5783}, + ("Category Half of Sixes", 7, 7): {0: 2064, 9: 7941, 12: 20571, 15: 31859, 18: 27374, 21: 10191}, + ("Category Half of Sixes", 7, 8): {0: 963, 12: 19864, 15: 30313, 18: 33133, 21: 15727}, + ("Category Half of Sixes", 8, 0): {0: 100000}, + ("Category Half of Sixes", 8, 1): {0: 23337, 3: 37232, 6: 25968, 9: 13463}, + ("Category Half of Sixes", 8, 2): {0: 5310, 3: 18930, 6: 29232, 9: 26016, 12: 14399, 15: 6113}, + ("Category Half of Sixes", 8, 3): {0: 1328, 3: 7328, 6: 18754, 9: 27141, 12: 24703, 15: 14251, 18: 6495}, + ("Category Half of Sixes", 8, 4): {0: 2719, 6: 9554, 9: 20607, 12: 26898, 15: 23402, 18: 12452, 21: 4368}, + ("Category Half of Sixes", 8, 5): {0: 905, 9: 16848, 12: 23248, 15: 27931, 18: 20616, 21: 10452}, + ("Category Half of Sixes", 8, 6): {0: 1914, 9: 6890, 12: 17302, 15: 27235, 18: 27276, 21: 19383}, + ("Category Half of Sixes", 8, 7): {0: 800, 12: 15127, 15: 23682, 18: 30401, 21: 22546, 24: 7444}, + ("Category Half of Sixes", 8, 8): {0: 2041, 12: 7211, 15: 18980, 18: 30657, 21: 29074, 24: 12037}, + ("Category Twos and Threes", 1, 1): {0: 66466, 3: 33534}, + ("Category Twos and Threes", 1, 2): {0: 55640, 3: 44360}, + ("Category Twos and Threes", 1, 3): {0: 46223, 3: 53777}, + ("Category Twos and Threes", 1, 4): {0: 38552, 3: 61448}, + ("Category Twos and Threes", 1, 5): {0: 32320, 3: 67680}, + ("Category Twos and Threes", 1, 6): {0: 26733, 3: 73267}, + ("Category Twos and Threes", 1, 7): {0: 22289, 3: 77711}, + ("Category Twos and Threes", 1, 8): {0: 18676, 3: 81324}, + ("Category Twos and Threes", 2, 1): {0: 44565, 2: 21965, 3: 25172, 5: 8298}, + ("Category Twos and Threes", 2, 2): {0: 30855, 3: 51429, 6: 17716}, + ("Category Twos and Threes", 2, 3): {0: 21509, 3: 51178, 6: 27313}, + ("Category Twos and Threes", 2, 4): {0: 14935, 3: 48581, 6: 36484}, + ("Category Twos and Threes", 2, 5): {0: 10492, 3: 44256, 6: 45252}, + ("Category Twos and Threes", 2, 6): {0: 10775, 3: 35936, 6: 53289}, + ("Category Twos and Threes", 2, 7): {0: 7375, 3: 32469, 6: 60156}, + ("Category Twos and Threes", 2, 8): {0: 5212, 3: 35730, 6: 59058}, + ("Category Twos and Threes", 3, 1): {0: 29892, 2: 22136, 3: 27781, 6: 20191}, + ("Category Twos and Threes", 3, 2): {0: 17285, 3: 44257, 6: 38458}, + ("Category Twos and Threes", 3, 3): {0: 9889, 3: 36505, 6: 40112, 8: 13494}, + ("Category Twos and Threes", 3, 4): {0: 5717, 3: 28317, 6: 43044, 9: 22922}, + ("Category Twos and Threes", 3, 5): {0: 5795, 3: 19123, 6: 45004, 9: 30078}, + ("Category Twos and Threes", 3, 6): {0: 3273, 3: 21888, 6: 36387, 9: 38452}, + ("Category Twos and Threes", 3, 7): {0: 1917, 3: 16239, 6: 35604, 9: 46240}, + ("Category Twos and Threes", 3, 8): {0: 1124, 3: 12222, 6: 33537, 9: 53117}, + ("Category Twos and Threes", 4, 1): {0: 19619, 3: 46881, 6: 33500}, + ("Category Twos and Threes", 4, 2): {0: 9395, 3: 33926, 6: 37832, 9: 18847}, + ("Category Twos and Threes", 4, 3): {0: 4538, 3: 22968, 6: 38891, 9: 33603}, + ("Category Twos and Threes", 4, 4): {0: 4402, 3: 12654, 6: 35565, 9: 34784, 11: 12595}, + ("Category Twos and Threes", 4, 5): {0: 2065, 3: 14351, 6: 23592, 9: 38862, 12: 21130}, + ("Category Twos and Threes", 4, 6): {0: 1044, 3: 9056, 6: 20013, 9: 41255, 12: 28632}, + ("Category Twos and Threes", 4, 7): {0: 6310, 7: 24021, 9: 34297, 12: 35372}, + ("Category Twos and Threes", 4, 8): {0: 3694, 6: 18611, 9: 34441, 12: 43254}, + ("Category Twos and Threes", 5, 1): {0: 13070, 3: 33021, 5: 24568, 6: 16417, 8: 12924}, + ("Category Twos and Threes", 5, 2): {0: 5213, 3: 24275, 6: 37166, 9: 24746, 11: 8600}, + ("Category Twos and Threes", 5, 3): {0: 4707, 3: 10959, 6: 31388, 9: 33265, 12: 19681}, + ("Category Twos and Threes", 5, 4): {0: 1934, 3: 12081, 6: 17567, 9: 35282, 12: 33136}, + ("Category Twos and Threes", 5, 5): {0: 380, 2: 7025, 6: 13268, 9: 33274, 12: 33255, 14: 12798}, + ("Category Twos and Threes", 5, 6): {0: 3745, 6: 15675, 9: 22902, 12: 44665, 15: 13013}, + ("Category Twos and Threes", 5, 7): {0: 1969, 6: 10700, 9: 19759, 12: 39522, 15: 28050}, + ("Category Twos and Threes", 5, 8): {0: 13, 2: 7713, 10: 23957, 12: 32501, 15: 35816}, + ("Category Twos and Threes", 6, 1): {0: 8955, 3: 26347, 5: 24850, 8: 39848}, + ("Category Twos and Threes", 6, 2): {0: 2944, 3: 16894, 6: 32156, 9: 37468, 12: 10538}, + ("Category Twos and Threes", 6, 3): {0: 2484, 3: 13120, 6: 15999, 9: 32271, 12: 24898, 14: 11228}, + ("Category Twos and Threes", 6, 4): {0: 320, 2: 6913, 6: 10814, 9: 28622, 12: 31337, 15: 21994}, + ("Category Twos and Threes", 6, 5): {0: 3135, 6: 12202, 9: 16495, 12: 33605, 15: 26330, 17: 8233}, + ("Category Twos and Threes", 6, 6): {0: 98, 3: 8409, 9: 12670, 12: 31959, 15: 38296, 18: 8568}, + ("Category Twos and Threes", 6, 7): {0: 4645, 9: 15210, 12: 21906, 15: 44121, 18: 14118}, + ("Category Twos and Threes", 6, 8): {0: 2367, 9: 10679, 12: 18916, 15: 38806, 18: 29232}, + ("Category Twos and Threes", 7, 1): {0: 5802, 3: 28169, 6: 26411, 9: 31169, 11: 8449}, + ("Category Twos and Threes", 7, 2): {0: 4415, 6: 34992, 9: 31238, 12: 20373, 14: 8982}, + ("Category Twos and Threes", 7, 3): {0: 471, 2: 8571, 6: 10929, 9: 28058, 12: 28900, 14: 14953, 16: 8118}, + ("Category Twos and Threes", 7, 4): {0: 3487, 6: 12139, 9: 14001, 12: 30314, 15: 23096, 18: 16963}, + ("Category Twos and Threes", 7, 5): {0: 40, 2: 7460, 12: 36006, 15: 31388, 18: 25106}, + ("Category Twos and Threes", 7, 6): {0: 3554, 9: 11611, 12: 15116, 15: 32501, 18: 27524, 20: 9694}, + ("Category Twos and Threes", 7, 7): {0: 157, 6: 8396, 13: 19880, 15: 22333, 18: 39121, 21: 10113}, + ("Category Twos and Threes", 7, 8): {0: 31, 5: 4682, 12: 14446, 15: 20934, 18: 44127, 21: 15780}, + ("Category Twos and Threes", 8, 1): {0: 3799, 3: 22551, 6: 23754, 8: 29290, 10: 11990, 12: 8616}, + ("Category Twos and Threes", 8, 2): {0: 902, 4: 14360, 6: 13750, 9: 29893, 13: 30770, 15: 10325}, + ("Category Twos and Threes", 8, 3): {0: 2221, 4: 8122, 9: 23734, 12: 28527, 16: 28942, 18: 8454}, + ("Category Twos and Threes", 8, 4): {0: 140, 3: 8344, 12: 33635, 15: 28711, 18: 20093, 20: 9077}, + ("Category Twos and Threes", 8, 5): {0: 3601, 9: 10269, 12: 12458, 15: 28017, 18: 24815, 21: 20840}, + ("Category Twos and Threes", 8, 6): {0: 4104, 11: 10100, 15: 25259, 18: 30949, 21: 29588}, + ("Category Twos and Threes", 8, 7): {0: 3336, 12: 10227, 15: 14149, 18: 31155, 21: 29325, 23: 11808}, + ("Category Twos and Threes", 8, 8): {3: 7, 5: 7726, 16: 17997, 18: 21517, 21: 40641, 24: 12112}, + ("Category Sum of Odds", 1, 1): {0: 50084, 1: 16488, 3: 16584, 5: 16844}, + ("Category Sum of Odds", 1, 2): {0: 44489, 3: 27886, 5: 27625}, + ("Category Sum of Odds", 1, 3): {0: 27892, 3: 32299, 5: 39809}, + ("Category Sum of Odds", 1, 4): {0: 30917, 3: 19299, 5: 49784}, + ("Category Sum of Odds", 1, 5): {0: 25892, 3: 15941, 5: 58167}, + ("Category Sum of Odds", 1, 6): {0: 21678, 3: 13224, 5: 65098}, + ("Category Sum of Odds", 1, 7): {0: 17840, 3: 11191, 5: 70969}, + ("Category Sum of Odds", 1, 8): {0: 14690, 5: 85310}, + ("Category Sum of Odds", 2, 1): {0: 24611, 1: 19615, 3: 22234, 6: 25168, 8: 8372}, + ("Category Sum of Odds", 2, 2): {0: 11216, 3: 33181, 6: 32416, 8: 15414, 10: 7773}, + ("Category Sum of Odds", 2, 3): {0: 13730, 3: 17055, 5: 34933, 8: 18363, 10: 15919}, + ("Category Sum of Odds", 2, 4): {0: 9599, 3: 11842, 5: 34490, 8: 19129, 10: 24940}, + ("Category Sum of Odds", 2, 5): {0: 6652, 5: 40845, 8: 18712, 10: 33791}, + ("Category Sum of Odds", 2, 6): {0: 10404, 5: 20970, 8: 26124, 10: 42502}, + ("Category Sum of Odds", 2, 7): {0: 7262, 5: 26824, 8: 15860, 10: 50054}, + ("Category Sum of Odds", 2, 8): {0: 4950, 5: 23253, 8: 14179, 10: 57618}, + ("Category Sum of Odds", 3, 1): {0: 12467, 1: 16736, 4: 20970, 6: 29252, 8: 11660, 10: 8915}, + ("Category Sum of Odds", 3, 2): {0: 8635, 3: 15579, 6: 27649, 9: 30585, 13: 17552}, + ("Category Sum of Odds", 3, 3): {0: 5022, 6: 32067, 8: 21631, 11: 24032, 13: 17248}, + ("Category Sum of Odds", 3, 4): {0: 8260, 6: 17955, 8: 18530, 11: 28631, 13: 14216, 15: 12408}, + ("Category Sum of Odds", 3, 5): {0: 4685, 5: 13863, 8: 14915, 11: 30363, 13: 16370, 15: 19804}, + ("Category Sum of Odds", 3, 6): {0: 2766, 5: 10213, 8: 11372, 10: 30968, 13: 17133, 15: 27548}, + ("Category Sum of Odds", 3, 7): {0: 543, 3: 8448, 10: 28784, 13: 26258, 15: 35967}, + ("Category Sum of Odds", 3, 8): {0: 3760, 6: 8911, 11: 27672, 13: 16221, 15: 43436}, + ("Category Sum of Odds", 4, 1): {0: 18870, 5: 28873, 6: 18550, 9: 20881, 11: 12826}, + ("Category Sum of Odds", 4, 2): {0: 7974, 6: 23957, 9: 27982, 11: 15953, 13: 13643, 15: 10491}, + ("Category Sum of Odds", 4, 3): {0: 1778, 3: 8154, 8: 25036, 11: 24307, 13: 18030, 15: 14481, 18: 8214}, + ("Category Sum of Odds", 4, 4): {0: 1862, 4: 8889, 8: 11182, 11: 21997, 13: 19483, 16: 20879, 20: 15708}, + ("Category Sum of Odds", 4, 5): {0: 5687, 7: 8212, 11: 18674, 13: 17578, 16: 25572, 18: 12704, 20: 11573}, + ("Category Sum of Odds", 4, 6): {0: 6549, 11: 17161, 13: 15290, 16: 28355, 18: 14865, 20: 17780}, + ("Category Sum of Odds", 4, 7): {0: 5048, 10: 11824, 13: 12343, 16: 29544, 18: 15947, 20: 25294}, + ("Category Sum of Odds", 4, 8): {0: 3060, 10: 8747, 15: 29415, 18: 25762, 20: 33016}, + ("Category Sum of Odds", 5, 1): {0: 3061, 3: 22078, 6: 26935, 9: 23674, 11: 15144, 14: 9108}, + ("Category Sum of Odds", 5, 2): {0: 5813, 7: 19297, 9: 14666, 11: 17165, 14: 21681, 16: 10586, 18: 10792}, + ("Category Sum of Odds", 5, 3): {0: 3881, 6: 9272, 9: 10300, 11: 13443, 14: 24313, 16: 13969, 19: 16420, 21: 8402}, + ("Category Sum of Odds", 5, 4): {0: 4213, 8: 9656, 13: 24199, 16: 22188, 18: 16440, 20: 14313, 23: 8991}, + ("Category Sum of Odds", 5, 5): {0: 4997, 10: 9128, 13: 11376, 16: 20859, 18: 17548, 21: 20120, 25: 15972}, + ("Category Sum of Odds", 5, 6): { + 0: 4581, + 11: 8516, + 14: 11335, + 16: 10647, + 18: 16866, + 21: 24256, + 23: 11945, + 25: 11854, + }, + ("Category Sum of Odds", 5, 7): {0: 176, 6: 8052, 16: 17535, 18: 14878, 21: 27189, 23: 14100, 25: 18070}, + ("Category Sum of Odds", 5, 8): {0: 2, 2: 6622, 15: 12097, 18: 12454, 21: 28398, 23: 15254, 25: 25173}, + ("Category Sum of Odds", 6, 1): {0: 11634, 4: 12188, 6: 16257, 9: 23909, 11: 13671, 13: 13125, 16: 9216}, + ("Category Sum of Odds", 6, 2): {0: 1403, 4: 8241, 10: 22151, 12: 14245, 14: 15279, 17: 19690, 21: 18991}, + ("Category Sum of Odds", 6, 3): { + 0: 6079, + 9: 10832, + 12: 10094, + 14: 13221, + 17: 22538, + 19: 12673, + 21: 15363, + 24: 9200, + }, + ("Category Sum of Odds", 6, 4): {0: 5771, 11: 9419, 16: 22239, 19: 22715, 21: 12847, 23: 12798, 25: 9237, 28: 4974}, + ("Category Sum of Odds", 6, 5): { + 0: 2564, + 11: 8518, + 17: 20753, + 19: 14121, + 21: 13179, + 23: 15752, + 25: 14841, + 28: 10272, + }, + ("Category Sum of Odds", 6, 6): {0: 4310, 14: 8668, 19: 20891, 21: 12052, 23: 16882, 26: 19954, 30: 17243}, + ("Category Sum of Odds", 6, 7): { + 0: 5233, + 16: 8503, + 19: 11127, + 21: 10285, + 23: 16141, + 26: 23993, + 28: 12043, + 30: 12675, + }, + ("Category Sum of Odds", 6, 8): {0: 510, 12: 8107, 21: 17013, 23: 14396, 26: 26771, 28: 13964, 30: 19239}, + ("Category Sum of Odds", 7, 1): { + 0: 2591, + 2: 8436, + 5: 11759, + 7: 13733, + 9: 15656, + 11: 14851, + 13: 12301, + 15: 11871, + 18: 8802, + }, + ("Category Sum of Odds", 7, 2): { + 0: 4730, + 8: 8998, + 11: 10573, + 13: 13099, + 15: 13819, + 17: 13594, + 19: 12561, + 21: 12881, + 24: 9745, + }, + ("Category Sum of Odds", 7, 3): { + 0: 2549, + 9: 8523, + 15: 19566, + 17: 12251, + 19: 13562, + 21: 13473, + 23: 11918, + 27: 18158, + }, + ("Category Sum of Odds", 7, 4): {0: 6776, 14: 9986, 19: 20914, 22: 21006, 24: 12685, 26: 10835, 30: 17798}, + ("Category Sum of Odds", 7, 5): { + 0: 2943, + 14: 8009, + 20: 20248, + 22: 11896, + 24: 14166, + 26: 12505, + 28: 13136, + 30: 10486, + 33: 6611, + }, + ("Category Sum of Odds", 7, 6): { + 2: 1990, + 15: 8986, + 22: 19198, + 24: 13388, + 26: 12513, + 28: 15893, + 30: 15831, + 35: 12201, + }, + ("Category Sum of Odds", 7, 7): { + 4: 559, + 14: 8153, + 21: 11671, + 24: 12064, + 26: 11473, + 28: 16014, + 31: 20785, + 33: 10174, + 35: 9107, + }, + ("Category Sum of Odds", 7, 8): {0: 3, 8: 5190, 21: 8049, 24: 10585, 28: 25255, 31: 24333, 33: 12445, 35: 14140}, + ("Category Sum of Odds", 8, 1): {0: 7169, 7: 19762, 9: 14044, 11: 14858, 13: 13399, 15: 10801, 17: 11147, 20: 8820}, + ("Category Sum of Odds", 8, 2): { + 0: 7745, + 11: 10927, + 14: 10849, + 16: 13103, + 18: 13484, + 20: 12487, + 22: 10815, + 24: 11552, + 27: 9038, + }, + ("Category Sum of Odds", 8, 3): { + 0: 3867, + 12: 9356, + 18: 19408, + 20: 12379, + 22: 12519, + 24: 12260, + 26: 11008, + 28: 10726, + 31: 8477, + }, + ("Category Sum of Odds", 8, 4): { + 1: 3971, + 15: 9176, + 21: 18732, + 23: 12900, + 25: 13405, + 27: 11603, + 29: 10400, + 33: 19813, + }, + ("Category Sum of Odds", 8, 5): { + 1: 490, + 12: 8049, + 20: 9682, + 23: 10177, + 25: 12856, + 27: 12369, + 29: 12781, + 32: 18029, + 34: 11315, + 38: 4252, + }, + ("Category Sum of Odds", 8, 6): { + 4: 86, + 11: 8038, + 22: 9157, + 25: 10729, + 27: 11053, + 29: 13606, + 31: 12383, + 33: 14068, + 35: 12408, + 38: 8472, + }, + ("Category Sum of Odds", 8, 7): { + 6: 1852, + 20: 8020, + 27: 17455, + 29: 12898, + 31: 12181, + 33: 15650, + 35: 17577, + 40: 14367, + }, + ("Category Sum of Odds", 8, 8): { + 4: 8, + 11: 8008, + 26: 10314, + 29: 11446, + 31: 10714, + 33: 16060, + 36: 21765, + 38: 10622, + 40: 11063, + }, + ("Category Sum of Evens", 1, 1): {0: 49585, 2: 16733, 4: 16854, 6: 16828}, + ("Category Sum of Evens", 1, 2): {0: 33244, 2: 11087, 4: 28025, 6: 27644}, + ("Category Sum of Evens", 1, 3): {0: 22259, 4: 42357, 6: 35384}, + ("Category Sum of Evens", 1, 4): {0: 18511, 4: 35651, 6: 45838}, + ("Category Sum of Evens", 1, 5): {0: 15428, 4: 29656, 6: 54916}, + ("Category Sum of Evens", 1, 6): {0: 12927, 4: 24370, 6: 62703}, + ("Category Sum of Evens", 1, 7): {0: 14152, 4: 17087, 6: 68761}, + ("Category Sum of Evens", 1, 8): {0: 11920, 4: 14227, 6: 73853}, + ("Category Sum of Evens", 2, 1): {0: 25229, 2: 16545, 4: 19538, 6: 21987, 10: 16701}, + ("Category Sum of Evens", 2, 2): {0: 11179, 4: 27164, 6: 24451, 8: 13966, 10: 15400, 12: 7840}, + ("Category Sum of Evens", 2, 3): {0: 8099, 4: 16354, 6: 20647, 8: 17887, 10: 24736, 12: 12277}, + ("Category Sum of Evens", 2, 4): {0: 5687, 4: 11219, 6: 20711, 8: 14290, 10: 26976, 12: 21117}, + ("Category Sum of Evens", 2, 5): {0: 3991, 6: 27157, 8: 11641, 10: 26842, 12: 30369}, + ("Category Sum of Evens", 2, 6): {0: 2741, 6: 23123, 10: 35050, 12: 39086}, + ("Category Sum of Evens", 2, 7): {0: 1122, 6: 20538, 10: 30952, 12: 47388}, + ("Category Sum of Evens", 2, 8): {0: 3950, 6: 14006, 10: 27341, 12: 54703}, + ("Category Sum of Evens", 3, 1): {0: 12538, 2: 12516, 4: 16530, 6: 21270, 8: 13745, 10: 11209, 14: 12192}, + ("Category Sum of Evens", 3, 2): {0: 7404, 4: 10459, 6: 15644, 8: 15032, 10: 18955, 12: 15021, 16: 17485}, + ("Category Sum of Evens", 3, 3): {0: 2176, 6: 14148, 8: 12295, 10: 20247, 12: 18001, 14: 15953, 16: 17180}, + ("Category Sum of Evens", 3, 4): {0: 4556, 8: 15062, 10: 17232, 12: 18975, 14: 15832, 16: 18749, 18: 9594}, + ("Category Sum of Evens", 3, 5): {0: 2575, 8: 10825, 10: 13927, 12: 19533, 14: 14402, 16: 21954, 18: 16784}, + ("Category Sum of Evens", 3, 6): {0: 1475, 6: 7528, 10: 10614, 12: 19070, 14: 12940, 16: 23882, 18: 24491}, + ("Category Sum of Evens", 3, 7): {0: 862, 6: 5321, 12: 26291, 14: 10985, 16: 24254, 18: 32287}, + ("Category Sum of Evens", 3, 8): {0: 138, 4: 4086, 12: 22703, 16: 32516, 18: 40557}, + ("Category Sum of Evens", 4, 1): {0: 6214, 4: 20921, 6: 17434, 8: 15427, 10: 14158, 12: 11354, 16: 14492}, + ("Category Sum of Evens", 4, 2): { + 0: 2868, + 6: 13362, + 8: 10702, + 10: 15154, + 12: 15715, + 14: 14104, + 16: 12485, + 20: 15610, + }, + ("Category Sum of Evens", 4, 3): { + 0: 573, + 8: 10496, + 10: 10269, + 12: 12879, + 14: 16224, + 16: 17484, + 18: 13847, + 20: 10518, + 22: 7710, + }, + ("Category Sum of Evens", 4, 4): { + 0: 1119, + 6: 5124, + 12: 17394, + 14: 12763, + 16: 17947, + 18: 16566, + 20: 13338, + 22: 15749, + }, + ("Category Sum of Evens", 4, 5): {0: 3477, 12: 12738, 16: 26184, 18: 18045, 20: 14172, 22: 16111, 24: 9273}, + ("Category Sum of Evens", 4, 6): {0: 991, 12: 10136, 16: 21089, 18: 18805, 20: 13848, 22: 20013, 24: 15118}, + ("Category Sum of Evens", 4, 7): {0: 2931, 16: 21174, 18: 18952, 20: 12601, 22: 21947, 24: 22395}, + ("Category Sum of Evens", 4, 8): {0: 1798, 12: 6781, 18: 27146, 20: 11505, 22: 23056, 24: 29714}, + ("Category Sum of Evens", 5, 1): { + 0: 3192, + 4: 13829, + 6: 13373, + 8: 13964, + 10: 14656, + 12: 13468, + 14: 10245, + 18: 17273, + }, + ("Category Sum of Evens", 5, 2): { + 0: 3217, + 8: 10390, + 12: 22094, + 14: 13824, + 16: 14674, + 18: 12124, + 22: 16619, + 24: 7058, + }, + ("Category Sum of Evens", 5, 3): { + 0: 3904, + 12: 11004, + 14: 10339, + 16: 13128, + 18: 14686, + 20: 15282, + 22: 13294, + 26: 18363, + }, + ("Category Sum of Evens", 5, 4): { + 0: 43, + 4: 4025, + 14: 10648, + 16: 10437, + 18: 12724, + 20: 14710, + 22: 16005, + 24: 12896, + 28: 18512, + }, + ("Category Sum of Evens", 5, 5): { + 0: 350, + 8: 4392, + 16: 11641, + 18: 10297, + 20: 12344, + 22: 16826, + 24: 15490, + 26: 12235, + 28: 16425, + }, + ("Category Sum of Evens", 5, 6): { + 0: 374, + 10: 4670, + 18: 13498, + 22: 25729, + 24: 17286, + 26: 13565, + 28: 15274, + 30: 9604, + }, + ("Category Sum of Evens", 5, 7): {0: 1473, 18: 11310, 22: 21341, 24: 18114, 26: 13349, 28: 19048, 30: 15365}, + ("Category Sum of Evens", 5, 8): {0: 1, 4: 3753, 20: 10318, 22: 11699, 24: 18376, 26: 12500, 28: 21211, 30: 22142}, + ("Category Sum of Evens", 6, 1): { + 0: 4767, + 6: 15250, + 8: 11527, + 10: 13220, + 12: 13855, + 14: 12217, + 16: 10036, + 20: 19128, + }, + ("Category Sum of Evens", 6, 2): { + 0: 1380, + 6: 5285, + 12: 13888, + 14: 10495, + 16: 12112, + 18: 12962, + 20: 12458, + 22: 10842, + 26: 14076, + 28: 6502, + }, + ("Category Sum of Evens", 6, 3): { + 0: 1230, + 16: 17521, + 18: 10098, + 20: 12628, + 22: 13809, + 24: 13594, + 26: 11930, + 30: 19190, + }, + ("Category Sum of Evens", 6, 4): {0: 1235, 18: 15534, 22: 22081, 24: 13471, 26: 13991, 28: 12906, 32: 20782}, + ("Category Sum of Evens", 6, 5): {0: 1241, 20: 15114, 24: 21726, 26: 13874, 28: 15232, 30: 12927, 34: 19886}, + ("Category Sum of Evens", 6, 6): {0: 1224, 22: 15886, 26: 21708, 28: 15982, 30: 15534, 32: 12014, 34: 17652}, + ("Category Sum of Evens", 6, 7): {4: 1437, 24: 17624, 28: 24727, 30: 17083, 32: 13001, 34: 15604, 36: 10524}, + ("Category Sum of Evens", 6, 8): {4: 1707, 24: 11310, 28: 20871, 30: 18101, 32: 12842, 34: 18840, 36: 16329}, + ("Category Sum of Evens", 7, 1): { + 0: 6237, + 8: 15390, + 10: 11183, + 12: 12690, + 14: 12463, + 16: 11578, + 20: 17339, + 22: 8870, + 26: 4250, + }, + ("Category Sum of Evens", 7, 2): { + 0: 1433, + 14: 16705, + 18: 19797, + 20: 11747, + 22: 12101, + 24: 10947, + 28: 16547, + 32: 10723, + }, + ("Category Sum of Evens", 7, 3): { + 0: 2135, + 14: 5836, + 20: 13766, + 22: 10305, + 24: 12043, + 26: 13153, + 28: 12644, + 30: 10884, + 34: 19234, + }, + ("Category Sum of Evens", 7, 4): { + 0: 1762, + 22: 16471, + 26: 20839, + 28: 12907, + 30: 13018, + 32: 11907, + 34: 10022, + 38: 13074, + }, + ("Category Sum of Evens", 7, 5): { + 4: 1630, + 24: 14719, + 28: 20377, + 30: 12713, + 32: 13273, + 34: 13412, + 36: 10366, + 40: 13510, + }, + ("Category Sum of Evens", 7, 6): { + 4: 1436, + 26: 14275, + 30: 20680, + 32: 12798, + 34: 15385, + 36: 13346, + 38: 10011, + 40: 12069, + }, + ("Category Sum of Evens", 7, 7): { + 6: 2815, + 24: 6584, + 30: 16532, + 32: 11106, + 34: 15613, + 36: 15702, + 38: 12021, + 40: 12478, + 42: 7149, + }, + ("Category Sum of Evens", 7, 8): {10: 1490, 30: 16831, 34: 23888, 36: 16970, 38: 12599, 40: 16137, 42: 12085}, + ("Category Sum of Evens", 8, 1): { + 0: 3709, + 8: 10876, + 12: 19246, + 14: 11696, + 16: 11862, + 18: 11145, + 22: 16877, + 24: 9272, + 28: 5317, + }, + ("Category Sum of Evens", 8, 2): { + 0: 1361, + 16: 14530, + 20: 17637, + 22: 10922, + 24: 11148, + 26: 10879, + 30: 17754, + 34: 15769, + }, + ("Category Sum of Evens", 8, 3): { + 2: 1601, + 22: 14895, + 26: 18464, + 28: 11561, + 30: 12249, + 32: 11747, + 34: 10070, + 38: 19413, + }, + ("Category Sum of Evens", 8, 4): { + 0: 2339, + 20: 5286, + 26: 11746, + 30: 19858, + 32: 12344, + 34: 12243, + 36: 11307, + 40: 16632, + 42: 8245, + }, + ("Category Sum of Evens", 8, 5): { + 4: 1798, + 28: 14824, + 32: 18663, + 34: 12180, + 36: 12458, + 38: 12260, + 40: 10958, + 44: 16859, + }, + ("Category Sum of Evens", 8, 6): { + 6: 2908, + 26: 6292, + 32: 13573, + 34: 10367, + 36: 12064, + 38: 12862, + 40: 13920, + 42: 11359, + 46: 16655, + }, + ("Category Sum of Evens", 8, 7): { + 8: 2652, + 28: 6168, + 34: 13922, + 36: 10651, + 38: 12089, + 40: 14999, + 42: 13899, + 44: 10574, + 46: 15046, + }, + ("Category Sum of Evens", 8, 8): { + 10: 2547, + 30: 6023, + 36: 15354, + 38: 10354, + 40: 14996, + 42: 16214, + 44: 11803, + 46: 13670, + 48: 9039, + }, + ("Category Double Threes and Fours", 1, 1): {0: 66749, 6: 16591, 8: 16660}, + ("Category Double Threes and Fours", 1, 2): {0: 44675, 6: 27694, 8: 27631}, + ("Category Double Threes and Fours", 1, 3): {0: 29592, 6: 35261, 8: 35147}, + ("Category Double Threes and Fours", 1, 4): {0: 24601, 6: 29406, 8: 45993}, + ("Category Double Threes and Fours", 1, 5): {0: 20499, 6: 24420, 8: 55081}, + ("Category Double Threes and Fours", 1, 6): {0: 17116, 6: 20227, 8: 62657}, + ("Category Double Threes and Fours", 1, 7): {0: 14193, 6: 17060, 8: 68747}, + ("Category Double Threes and Fours", 1, 8): {0: 11977, 6: 13924, 8: 74099}, + ("Category Double Threes and Fours", 2, 1): {0: 44382, 6: 22191, 8: 22251, 14: 11176}, + ("Category Double Threes and Fours", 2, 2): {0: 19720, 6: 24652, 8: 24891, 14: 23096, 16: 7641}, + ("Category Double Threes and Fours", 2, 3): {0: 8765, 6: 21008, 8: 20929, 12: 12201, 14: 24721, 16: 12376}, + ("Category Double Threes and Fours", 2, 4): {0: 6164, 6: 14466, 8: 22828, 14: 35406, 16: 21136}, + ("Category Double Threes and Fours", 2, 5): {0: 4307, 6: 10005, 8: 22620, 14: 32879, 16: 30189}, + ("Category Double Threes and Fours", 2, 6): {0: 2879, 8: 28513, 14: 29530, 16: 39078}, + ("Category Double Threes and Fours", 2, 7): {0: 2042, 8: 24335, 14: 26250, 16: 47373}, + ("Category Double Threes and Fours", 2, 8): {0: 1385, 8: 23166, 14: 20907, 16: 54542}, + ("Category Double Threes and Fours", 3, 1): {0: 29378, 6: 22335, 8: 22138, 14: 16783, 16: 9366}, + ("Category Double Threes and Fours", 3, 2): { + 0: 8894, + 6: 16518, + 8: 16277, + 12: 10334, + 14: 20757, + 16: 12265, + 22: 14955, + }, + ("Category Double Threes and Fours", 3, 3): { + 0: 2643, + 8: 18522, + 12: 11066, + 14: 21922, + 16: 11045, + 20: 17235, + 22: 17567, + }, + ("Category Double Threes and Fours", 3, 4): { + 0: 1523, + 8: 13773, + 14: 26533, + 16: 18276, + 20: 11695, + 22: 18521, + 24: 9679, + }, + ("Category Double Threes and Fours", 3, 5): {0: 845, 8: 10218, 14: 20245, 16: 20293, 22: 31908, 24: 16491}, + ("Category Double Threes and Fours", 3, 6): {0: 499, 8: 7230, 14: 15028, 16: 20914, 22: 31835, 24: 24494}, + ("Category Double Threes and Fours", 3, 7): {0: 1298, 8: 5434, 16: 30595, 22: 29980, 24: 32693}, + ("Category Double Threes and Fours", 3, 8): {0: 178, 6: 4363, 16: 27419, 22: 27614, 24: 40426}, + ("Category Double Threes and Fours", 4, 1): {0: 19809, 6: 19538, 8: 19765, 14: 22348, 18: 12403, 22: 6137}, + ("Category Double Threes and Fours", 4, 2): { + 0: 3972, + 8: 19440, + 14: 27646, + 16: 12978, + 20: 11442, + 22: 11245, + 24: 6728, + 28: 6549, + }, + ("Category Double Threes and Fours", 4, 3): { + 0: 745, + 6: 7209, + 14: 19403, + 18: 11744, + 20: 15371, + 22: 15441, + 26: 13062, + 30: 17025, + }, + ("Category Double Threes and Fours", 4, 4): { + 0: 371, + 6: 4491, + 14: 13120, + 16: 10176, + 20: 11583, + 22: 18508, + 24: 10280, + 28: 15624, + 30: 15847, + }, + ("Category Double Threes and Fours", 4, 5): { + 0: 163, + 6: 4251, + 16: 15796, + 22: 26145, + 24: 17306, + 28: 10930, + 30: 16244, + 32: 9165, + }, + ("Category Double Threes and Fours", 4, 6): {0: 79, 16: 14439, 22: 21763, 24: 18861, 30: 29518, 32: 15340}, + ("Category Double Threes and Fours", 4, 7): {0: 1042, 16: 12543, 22: 13634, 24: 20162, 30: 30259, 32: 22360}, + ("Category Double Threes and Fours", 4, 8): {0: 20, 6: 2490, 16: 6901, 22: 10960, 24: 20269, 30: 29442, 32: 29918}, + ("Category Double Threes and Fours", 5, 1): { + 0: 13122, + 6: 16411, + 8: 16451, + 14: 24768, + 16: 10392, + 22: 14528, + 26: 4328, + }, + ("Category Double Threes and Fours", 5, 2): { + 0: 1676, + 8: 10787, + 14: 20218, + 18: 11102, + 20: 12668, + 22: 12832, + 26: 10994, + 30: 15390, + 34: 4333, + }, + ("Category Double Threes and Fours", 5, 3): { + 0: 223, + 14: 12365, + 16: 7165, + 20: 11385, + 22: 11613, + 26: 15182, + 28: 13665, + 32: 14400, + 36: 14002, + }, + ("Category Double Threes and Fours", 5, 4): { + 0: 95, + 6: 2712, + 16: 8862, + 22: 18696, + 26: 12373, + 28: 13488, + 30: 14319, + 34: 12414, + 38: 17041, + }, + ("Category Double Threes and Fours", 5, 5): { + 0: 1333, + 14: 5458, + 22: 13613, + 24: 10772, + 28: 11201, + 30: 16810, + 32: 10248, + 36: 14426, + 38: 16139, + }, + ("Category Double Threes and Fours", 5, 6): { + 0: 16, + 16: 6354, + 24: 16213, + 30: 25369, + 32: 16845, + 36: 10243, + 38: 15569, + 40: 9391, + }, + ("Category Double Threes and Fours", 5, 7): { + 0: 161, + 12: 3457, + 24: 12437, + 30: 21495, + 32: 18636, + 38: 28581, + 40: 15233, + }, + ("Category Double Threes and Fours", 5, 8): { + 0: 478, + 16: 4861, + 26: 10119, + 30: 13694, + 32: 19681, + 38: 29177, + 40: 21990, + }, + ("Category Double Threes and Fours", 6, 1): { + 0: 8738, + 6: 13463, + 8: 12988, + 14: 24653, + 16: 11068, + 22: 19621, + 26: 5157, + 30: 4312, + }, + ("Category Double Threes and Fours", 6, 2): { + 0: 784, + 6: 5735, + 14: 13407, + 16: 8170, + 20: 11349, + 22: 11356, + 26: 12465, + 28: 10790, + 30: 11527, + 38: 14417, + }, + ("Category Double Threes and Fours", 6, 3): { + 0: 72, + 14: 8986, + 22: 13700, + 26: 12357, + 28: 12114, + 32: 15882, + 36: 19286, + 40: 13540, + 44: 4063, + }, + ("Category Double Threes and Fours", 6, 4): { + 0: 439, + 18: 7427, + 22: 9284, + 28: 14203, + 30: 10836, + 34: 14646, + 36: 12511, + 38: 10194, + 42: 10202, + 46: 10258, + }, + ("Category Double Threes and Fours", 6, 5): { + 0: 166, + 20: 7618, + 24: 5198, + 30: 17479, + 34: 12496, + 36: 12190, + 38: 14163, + 42: 12571, + 46: 18119, + }, + ("Category Double Threes and Fours", 6, 6): { + 0: 1843, + 22: 5905, + 30: 12997, + 32: 10631, + 36: 10342, + 38: 16439, + 40: 10795, + 44: 13485, + 46: 17563, + }, + ("Category Double Threes and Fours", 6, 7): { + 0: 31, + 12: 2221, + 24: 5004, + 32: 15743, + 38: 24402, + 40: 17005, + 46: 25241, + 48: 10353, + }, + ("Category Double Threes and Fours", 6, 8): { + 8: 79, + 16: 4037, + 32: 12559, + 38: 20863, + 40: 18347, + 46: 27683, + 48: 16432, + }, + ("Category Double Threes and Fours", 7, 1): { + 0: 5803, + 6: 10242, + 8: 10404, + 14: 22886, + 16: 10934, + 22: 19133, + 24: 7193, + 28: 8167, + 32: 5238, + }, + ("Category Double Threes and Fours", 7, 2): { + 0: 357, + 14: 17082, + 22: 17524, + 26: 11974, + 28: 11132, + 32: 13186, + 36: 13959, + 40: 10028, + 44: 4758, + }, + ("Category Double Threes and Fours", 7, 3): { + 0: 361, + 18: 7136, + 22: 5983, + 28: 13899, + 32: 12974, + 34: 10088, + 36: 10081, + 40: 14481, + 44: 14127, + 46: 6547, + 50: 4323, + }, + ("Category Double Threes and Fours", 7, 4): { + 0: 1182, + 18: 4299, + 30: 16331, + 34: 11316, + 36: 10741, + 40: 16028, + 44: 18815, + 48: 15225, + 52: 6063, + }, + ("Category Double Threes and Fours", 7, 5): { + 0: 45, + 12: 3763, + 32: 17140, + 38: 19112, + 42: 13655, + 44: 11990, + 46: 11137, + 50: 10646, + 54: 12512, + }, + ("Category Double Threes and Fours", 7, 6): { + 8: 2400, + 28: 5277, + 32: 5084, + 38: 16047, + 42: 12133, + 44: 11451, + 46: 14027, + 50: 13198, + 54: 20383, + }, + ("Category Double Threes and Fours", 7, 7): { + 6: 1968, + 30: 5585, + 38: 12210, + 40: 10376, + 46: 25548, + 48: 15392, + 54: 21666, + 56: 7255, + }, + ("Category Double Threes and Fours", 7, 8): { + 8: 42, + 20: 2293, + 32: 4653, + 40: 15068, + 46: 23170, + 48: 17057, + 54: 25601, + 56: 12116, + }, + ("Category Double Threes and Fours", 8, 1): { + 0: 3982, + 8: 15658, + 14: 20388, + 16: 10234, + 20: 10167, + 22: 10162, + 28: 15330, + 32: 8758, + 36: 5321, + }, + ("Category Double Threes and Fours", 8, 2): { + 0: 161, + 6: 3169, + 14: 7106, + 22: 16559, + 28: 16400, + 32: 12950, + 36: 16399, + 40: 10090, + 44: 11474, + 48: 5692, + }, + ("Category Double Threes and Fours", 8, 3): { + 0: 856, + 16: 4092, + 30: 13686, + 34: 12838, + 38: 15010, + 42: 17085, + 46: 14067, + 50: 11844, + 52: 6500, + 56: 4022, + }, + ("Category Double Threes and Fours", 8, 4): { + 0: 36, + 12: 2795, + 30: 9742, + 36: 11726, + 40: 12404, + 44: 18791, + 48: 14662, + 52: 15518, + 54: 8066, + 58: 6260, + }, + ("Category Double Threes and Fours", 8, 5): { + 6: 8, + 12: 2948, + 30: 5791, + 38: 10658, + 42: 10175, + 46: 19359, + 50: 14449, + 52: 10531, + 56: 13257, + 60: 12824, + }, + ("Category Double Threes and Fours", 8, 6): { + 0: 2, + 12: 2528, + 32: 4832, + 40: 11436, + 46: 17832, + 50: 13016, + 52: 11631, + 54: 12058, + 58: 11458, + 62: 15207, + }, + ("Category Double Threes and Fours", 8, 7): { + 6: 2, + 12: 2204, + 40: 9320, + 46: 14688, + 50: 11494, + 52: 10602, + 54: 14541, + 58: 13849, + 62: 23300, + }, + ("Category Double Threes and Fours", 8, 8): { + 8: 1, + 16: 1773, + 42: 8766, + 48: 17452, + 54: 24338, + 56: 15722, + 62: 22745, + 64: 9203, + }, + ("Category Quadruple Ones and Twos", 1, 1): {0: 66567, 4: 16803, 8: 16630}, + ("Category Quadruple Ones and Twos", 1, 2): {0: 44809, 4: 27448, 8: 27743}, + ("Category Quadruple Ones and Twos", 1, 3): {0: 37100, 4: 23184, 8: 39716}, + ("Category Quadruple Ones and Twos", 1, 4): {0: 30963, 4: 19221, 8: 49816}, + ("Category Quadruple Ones and Twos", 1, 5): {0: 25316, 4: 16079, 8: 58605}, + ("Category Quadruple Ones and Twos", 1, 6): {0: 21505, 4: 13237, 8: 65258}, + ("Category Quadruple Ones and Twos", 1, 7): {0: 17676, 4: 11100, 8: 71224}, + ("Category Quadruple Ones and Twos", 1, 8): {0: 14971, 4: 9323, 8: 75706}, + ("Category Quadruple Ones and Twos", 2, 1): {0: 44566, 4: 22273, 8: 24842, 12: 8319}, + ("Category Quadruple Ones and Twos", 2, 2): {0: 19963, 4: 24890, 8: 32262, 12: 15172, 16: 7713}, + ("Category Quadruple Ones and Twos", 2, 3): {0: 13766, 4: 17158, 8: 34907, 12: 18539, 16: 15630}, + ("Category Quadruple Ones and Twos", 2, 4): {0: 9543, 4: 11981, 8: 34465, 12: 19108, 16: 24903}, + ("Category Quadruple Ones and Twos", 2, 5): {0: 6472, 4: 8302, 8: 32470, 12: 18612, 16: 34144}, + ("Category Quadruple Ones and Twos", 2, 6): {0: 4569, 4: 5737, 8: 29716, 12: 17216, 16: 42762}, + ("Category Quadruple Ones and Twos", 2, 7): {0: 3146, 8: 30463, 12: 15756, 16: 50635}, + ("Category Quadruple Ones and Twos", 2, 8): {0: 2265, 8: 26302, 12: 14167, 16: 57266}, + ("Category Quadruple Ones and Twos", 3, 1): {0: 29440, 4: 22574, 8: 27747, 12: 11557, 16: 8682}, + ("Category Quadruple Ones and Twos", 3, 2): {0: 8857, 4: 16295, 8: 26434, 12: 22986, 16: 16799, 20: 8629}, + ("Category Quadruple Ones and Twos", 3, 3): {0: 5063, 4: 9447, 8: 22255, 12: 21685, 16: 24084, 20: 11167, 24: 6299}, + ("Category Quadruple Ones and Twos", 3, 4): { + 0: 2864, + 4: 5531, + 8: 17681, + 12: 18400, + 16: 28524, + 20: 14552, + 24: 12448, + }, + ("Category Quadruple Ones and Twos", 3, 5): {0: 1676, 8: 16697, 12: 14755, 16: 30427, 20: 16602, 24: 19843}, + ("Category Quadruple Ones and Twos", 3, 6): {0: 2681, 8: 10259, 12: 11326, 16: 31125, 20: 16984, 24: 27625}, + ("Category Quadruple Ones and Twos", 3, 7): {0: 1688, 8: 7543, 12: 8769, 16: 29367, 20: 17085, 24: 35548}, + ("Category Quadruple Ones and Twos", 3, 8): {0: 941, 8: 5277, 12: 6388, 16: 27741, 20: 16170, 24: 43483}, + ("Category Quadruple Ones and Twos", 4, 1): {0: 19691, 4: 19657, 8: 27288, 12: 16126, 16: 11167, 24: 6071}, + ("Category Quadruple Ones and Twos", 4, 2): { + 0: 4023, + 4: 9776, + 8: 19015, + 12: 22094, + 16: 20986, + 20: 13805, + 24: 10301, + }, + ("Category Quadruple Ones and Twos", 4, 3): { + 0: 1848, + 8: 17116, + 12: 16853, + 16: 22831, + 20: 18400, + 24: 14480, + 28: 8472, + }, + ("Category Quadruple Ones and Twos", 4, 4): { + 0: 930, + 8: 10375, + 12: 12063, + 16: 21220, + 20: 19266, + 24: 20615, + 28: 9443, + 32: 6088, + }, + ("Category Quadruple Ones and Twos", 4, 5): { + 0: 1561, + 12: 12612, + 16: 18209, + 20: 17910, + 24: 25474, + 28: 12864, + 32: 11370, + }, + ("Category Quadruple Ones and Twos", 4, 6): { + 0: 722, + 12: 7979, + 16: 14796, + 20: 15416, + 24: 28256, + 28: 14675, + 32: 18156, + }, + ("Category Quadruple Ones and Twos", 4, 7): { + 0: 115, + 12: 5304, + 16: 11547, + 20: 12289, + 24: 29181, + 28: 16052, + 32: 25512, + }, + ("Category Quadruple Ones and Twos", 4, 8): {0: 164, 8: 2971, 16: 8888, 20: 9679, 24: 28785, 28: 16180, 32: 33333}, + ("Category Quadruple Ones and Twos", 5, 1): { + 0: 13112, + 4: 16534, + 8: 24718, + 12: 18558, + 16: 14547, + 20: 7055, + 24: 5476, + }, + ("Category Quadruple Ones and Twos", 5, 2): { + 0: 1764, + 4: 5529, + 8: 12216, + 12: 17687, + 16: 20808, + 20: 18149, + 24: 12849, + 28: 6991, + 32: 4007, + }, + ("Category Quadruple Ones and Twos", 5, 3): { + 0: 719, + 8: 8523, + 12: 11074, + 16: 17322, + 20: 19002, + 24: 18643, + 28: 12827, + 32: 7960, + 36: 3930, + }, + ("Category Quadruple Ones and Twos", 5, 4): { + 0: 1152, + 12: 9790, + 16: 12913, + 20: 15867, + 24: 20749, + 28: 16398, + 32: 14218, + 36: 8913, + }, + ("Category Quadruple Ones and Twos", 5, 5): { + 0: 98, + 12: 5549, + 16: 8863, + 20: 12037, + 24: 20010, + 28: 17568, + 32: 19789, + 36: 9319, + 40: 6767, + }, + ("Category Quadruple Ones and Twos", 5, 6): { + 0: 194, + 8: 2663, + 16: 5734, + 20: 8436, + 24: 17830, + 28: 16864, + 32: 24246, + 36: 12115, + 40: 11918, + }, + ("Category Quadruple Ones and Twos", 5, 7): { + 0: 1449, + 20: 9396, + 24: 14936, + 28: 14969, + 32: 27238, + 36: 14094, + 40: 17918, + }, + ("Category Quadruple Ones and Twos", 5, 8): { + 0: 747, + 20: 6034, + 24: 11929, + 28: 12517, + 32: 28388, + 36: 15339, + 40: 25046, + }, + ("Category Quadruple Ones and Twos", 6, 1): { + 0: 8646, + 4: 13011, + 8: 21357, + 12: 19385, + 16: 17008, + 20: 10409, + 24: 6249, + 28: 3935, + }, + ("Category Quadruple Ones and Twos", 6, 2): { + 0: 844, + 8: 10311, + 12: 12792, + 16: 17480, + 20: 18814, + 24: 16492, + 28: 11889, + 32: 6893, + 36: 4485, + }, + ("Category Quadruple Ones and Twos", 6, 3): { + 0: 1241, + 12: 9634, + 16: 11685, + 20: 15584, + 24: 17967, + 28: 16506, + 32: 13314, + 36: 8034, + 40: 6035, + }, + ("Category Quadruple Ones and Twos", 6, 4): { + 0: 1745, + 16: 9804, + 20: 10562, + 24: 15746, + 28: 17174, + 32: 17787, + 36: 12820, + 40: 9289, + 44: 5073, + }, + ("Category Quadruple Ones and Twos", 6, 5): { + 0: 2076, + 20: 10247, + 24: 12264, + 28: 14810, + 32: 19588, + 36: 16002, + 40: 14682, + 44: 6410, + 48: 3921, + }, + ("Category Quadruple Ones and Twos", 6, 6): { + 0: 884, + 20: 5943, + 24: 8774, + 28: 11481, + 32: 19145, + 36: 16864, + 40: 19906, + 44: 9386, + 48: 7617, + }, + ("Category Quadruple Ones and Twos", 6, 7): { + 0: 1386, + 24: 8138, + 28: 8372, + 32: 17207, + 36: 16148, + 40: 24051, + 44: 11862, + 48: 12836, + }, + ("Category Quadruple Ones and Twos", 6, 8): { + 0: 1841, + 28: 9606, + 32: 14489, + 36: 14585, + 40: 26779, + 44: 13821, + 48: 18879, + }, + ("Category Quadruple Ones and Twos", 7, 1): { + 0: 5780, + 4: 10185, + 8: 17905, + 12: 18364, + 16: 18160, + 20: 13115, + 24: 8617, + 32: 7874, + }, + ("Category Quadruple Ones and Twos", 7, 2): { + 0: 1795, + 12: 12828, + 16: 13204, + 20: 16895, + 24: 17562, + 28: 15061, + 32: 11122, + 36: 6507, + 40: 5026, + }, + ("Category Quadruple Ones and Twos", 7, 3): { + 0: 2065, + 16: 10495, + 20: 11008, + 24: 14839, + 28: 16393, + 32: 16118, + 36: 12681, + 40: 8773, + 48: 7628, + }, + ("Category Quadruple Ones and Twos", 7, 4): { + 0: 1950, + 20: 9612, + 24: 10535, + 28: 13596, + 32: 16527, + 36: 15938, + 40: 14071, + 44: 9192, + 48: 8579, + }, + ("Category Quadruple Ones and Twos", 7, 5): { + 0: 223, + 20: 5144, + 24: 6337, + 28: 9400, + 32: 14443, + 36: 15955, + 40: 17820, + 44: 13369, + 48: 10702, + 56: 6607, + }, + ("Category Quadruple Ones and Twos", 7, 6): { + 0: 271, + 24: 5976, + 28: 5988, + 32: 11398, + 36: 13738, + 40: 19063, + 44: 15587, + 48: 15867, + 52: 7202, + 56: 4910, + }, + ("Category Quadruple Ones and Twos", 7, 7): { + 0: 1032, + 28: 5724, + 32: 8275, + 36: 10801, + 40: 18184, + 44: 16470, + 48: 20467, + 52: 9969, + 56: 9078, + }, + ("Category Quadruple Ones and Twos", 7, 8): { + 0: 1508, + 32: 7832, + 36: 7770, + 40: 16197, + 44: 15477, + 48: 24388, + 52: 12403, + 56: 14425, + }, + ("Category Quadruple Ones and Twos", 8, 1): { + 0: 3811, + 4: 7682, + 8: 14638, + 12: 17214, + 16: 18191, + 20: 14651, + 24: 10976, + 28: 6591, + 36: 6246, + }, + ("Category Quadruple Ones and Twos", 8, 2): { + 0: 906, + 12: 7768, + 16: 9421, + 20: 13623, + 24: 16213, + 28: 16246, + 32: 14131, + 36: 10076, + 40: 6198, + 48: 5418, + }, + ("Category Quadruple Ones and Twos", 8, 3): { + 0: 224, + 8: 2520, + 20: 11222, + 24: 10733, + 28: 13934, + 32: 15751, + 36: 14882, + 40: 12409, + 44: 8920, + 48: 5462, + 52: 3943, + }, + ("Category Quadruple Ones and Twos", 8, 4): { + 0: 233, + 20: 5163, + 24: 6057, + 28: 9073, + 32: 12990, + 36: 14756, + 40: 15851, + 44: 13795, + 48: 10706, + 52: 6310, + 56: 5066, + }, + ("Category Quadruple Ones and Twos", 8, 5): { + 0: 76, + 12: 2105, + 28: 8316, + 32: 8993, + 36: 12039, + 40: 15561, + 44: 15382, + 48: 15278, + 52: 10629, + 56: 7377, + 60: 4244, + }, + ("Category Quadruple Ones and Twos", 8, 6): { + 4: 262, + 32: 10321, + 36: 8463, + 40: 13177, + 44: 14818, + 48: 17731, + 52: 14024, + 56: 12425, + 60: 5446, + 64: 3333, + }, + ("Category Quadruple Ones and Twos", 8, 7): { + 8: 300, + 32: 5443, + 36: 5454, + 40: 10276, + 44: 12582, + 48: 18487, + 52: 15549, + 56: 17187, + 60: 8149, + 64: 6573, + }, + ("Category Quadruple Ones and Twos", 8, 8): { + 8: 354, + 36: 5678, + 40: 7484, + 44: 9727, + 48: 17080, + 52: 15898, + 56: 21877, + 60: 10773, + 64: 11129, + }, + ("Category Micro Straight", 1, 1): {0: 100000}, + ("Category Micro Straight", 1, 2): {0: 100000}, + ("Category Micro Straight", 1, 3): {0: 100000}, + ("Category Micro Straight", 1, 4): {0: 100000}, + ("Category Micro Straight", 1, 5): {0: 100000}, + ("Category Micro Straight", 1, 6): {0: 100000}, + ("Category Micro Straight", 1, 7): {0: 100000}, + ("Category Micro Straight", 1, 8): {0: 100000}, + ("Category Micro Straight", 2, 1): {0: 72326, 10: 27674}, + ("Category Micro Straight", 2, 2): {0: 48546, 10: 51454}, + ("Category Micro Straight", 2, 3): {0: 32619, 10: 67381}, + ("Category Micro Straight", 2, 4): {0: 21659, 10: 78341}, + ("Category Micro Straight", 2, 5): {0: 14288, 10: 85712}, + ("Category Micro Straight", 2, 6): {0: 9882, 10: 90118}, + ("Category Micro Straight", 2, 7): {0: 6502, 10: 93498}, + ("Category Micro Straight", 2, 8): {0: 4161, 10: 95839}, + ("Category Micro Straight", 3, 1): {0: 41943, 10: 58057}, + ("Category Micro Straight", 3, 2): {0: 15524, 10: 84476}, + ("Category Micro Straight", 3, 3): {0: 5700, 10: 94300}, + ("Category Micro Straight", 3, 4): {0: 2127, 10: 97873}, + ("Category Micro Straight", 3, 5): {0: 744, 10: 99256}, + ("Category Micro Straight", 3, 6): {0: 260, 10: 99740}, + ("Category Micro Straight", 3, 7): {0: 115, 10: 99885}, + ("Category Micro Straight", 3, 8): {0: 34, 10: 99966}, + ("Category Micro Straight", 4, 1): {0: 22307, 10: 77693}, + ("Category Micro Straight", 4, 2): {0: 4420, 10: 95580}, + ("Category Micro Straight", 4, 3): {0: 806, 10: 99194}, + ("Category Micro Straight", 4, 4): {0: 205, 10: 99795}, + ("Category Micro Straight", 4, 5): {0: 20, 10: 99980}, + ("Category Micro Straight", 4, 6): {0: 5, 10: 99995}, + ("Category Micro Straight", 4, 7): {0: 1, 10: 99999}, + ("Category Micro Straight", 4, 8): {0: 1, 10: 99999}, + ("Category Micro Straight", 5, 1): {0: 11685, 10: 88315}, + ("Category Micro Straight", 5, 2): {0: 1141, 10: 98859}, + ("Category Micro Straight", 5, 3): {0: 119, 10: 99881}, + ("Category Micro Straight", 5, 4): {0: 11, 10: 99989}, + ("Category Micro Straight", 5, 5): {0: 1, 10: 99999}, + ("Category Micro Straight", 5, 6): {10: 100000}, + ("Category Micro Straight", 5, 7): {10: 100000}, + ("Category Micro Straight", 5, 8): {10: 100000}, + ("Category Micro Straight", 6, 1): {0: 5937, 10: 94063}, + ("Category Micro Straight", 6, 2): {0: 307, 10: 99693}, + ("Category Micro Straight", 6, 3): {0: 9, 10: 99991}, + ("Category Micro Straight", 6, 4): {0: 1, 10: 99999}, + ("Category Micro Straight", 6, 5): {10: 100000}, + ("Category Micro Straight", 6, 6): {10: 100000}, + ("Category Micro Straight", 6, 7): {10: 100000}, + ("Category Micro Straight", 6, 8): {10: 100000}, + ("Category Micro Straight", 7, 1): {0: 3072, 10: 96928}, + ("Category Micro Straight", 7, 2): {0: 85, 10: 99915}, + ("Category Micro Straight", 7, 3): {0: 2, 10: 99998}, + ("Category Micro Straight", 7, 4): {10: 100000}, + ("Category Micro Straight", 7, 5): {10: 100000}, + ("Category Micro Straight", 7, 6): {10: 100000}, + ("Category Micro Straight", 7, 7): {10: 100000}, + ("Category Micro Straight", 7, 8): {10: 100000}, + ("Category Micro Straight", 8, 1): {0: 1544, 10: 98456}, + ("Category Micro Straight", 8, 2): {0: 15, 10: 99985}, + ("Category Micro Straight", 8, 3): {10: 100000}, + ("Category Micro Straight", 8, 4): {10: 100000}, + ("Category Micro Straight", 8, 5): {10: 100000}, + ("Category Micro Straight", 8, 6): {10: 100000}, + ("Category Micro Straight", 8, 7): {10: 100000}, + ("Category Micro Straight", 8, 8): {10: 100000}, + ("Category Three Odds", 1, 1): {0: 100000}, + ("Category Three Odds", 1, 2): {0: 100000}, + ("Category Three Odds", 1, 3): {0: 100000}, + ("Category Three Odds", 1, 4): {0: 100000}, + ("Category Three Odds", 1, 5): {0: 100000}, + ("Category Three Odds", 1, 6): {0: 100000}, + ("Category Three Odds", 1, 7): {0: 100000}, + ("Category Three Odds", 1, 8): {0: 100000}, + ("Category Three Odds", 2, 1): {0: 100000}, + ("Category Three Odds", 2, 2): {0: 100000}, + ("Category Three Odds", 2, 3): {0: 100000}, + ("Category Three Odds", 2, 4): {0: 100000}, + ("Category Three Odds", 2, 5): {0: 100000}, + ("Category Three Odds", 2, 6): {0: 100000}, + ("Category Three Odds", 2, 7): {0: 100000}, + ("Category Three Odds", 2, 8): {0: 100000}, + ("Category Three Odds", 3, 1): {0: 87592, 20: 12408}, + ("Category Three Odds", 3, 2): {0: 57855, 20: 42145}, + ("Category Three Odds", 3, 3): {0: 32668, 20: 67332}, + ("Category Three Odds", 3, 4): {0: 17508, 20: 82492}, + ("Category Three Odds", 3, 5): {0: 9156, 20: 90844}, + ("Category Three Odds", 3, 6): {0: 4572, 20: 95428}, + ("Category Three Odds", 3, 7): {0: 2325, 20: 97675}, + ("Category Three Odds", 3, 8): {0: 1116, 20: 98884}, + ("Category Three Odds", 4, 1): {0: 68669, 20: 31331}, + ("Category Three Odds", 4, 2): {0: 26140, 20: 73860}, + ("Category Three Odds", 4, 3): {0: 7837, 20: 92163}, + ("Category Three Odds", 4, 4): {0: 2169, 20: 97831}, + ("Category Three Odds", 4, 5): {0: 516, 20: 99484}, + ("Category Three Odds", 4, 6): {0: 156, 20: 99844}, + ("Category Three Odds", 4, 7): {0: 40, 20: 99960}, + ("Category Three Odds", 4, 8): {0: 12, 20: 99988}, + ("Category Three Odds", 5, 1): {0: 49908, 20: 50092}, + ("Category Three Odds", 5, 2): {0: 10373, 20: 89627}, + ("Category Three Odds", 5, 3): {0: 1640, 20: 98360}, + ("Category Three Odds", 5, 4): {0: 223, 20: 99777}, + ("Category Three Odds", 5, 5): {0: 24, 20: 99976}, + ("Category Three Odds", 5, 6): {0: 3, 20: 99997}, + ("Category Three Odds", 5, 7): {0: 1, 20: 99999}, + ("Category Three Odds", 5, 8): {20: 100000}, + ("Category Three Odds", 6, 1): {0: 34566, 20: 65434}, + ("Category Three Odds", 6, 2): {0: 3766, 20: 96234}, + ("Category Three Odds", 6, 3): {0: 291, 20: 99709}, + ("Category Three Odds", 6, 4): {0: 22, 20: 99978}, + ("Category Three Odds", 6, 5): {20: 100000}, + ("Category Three Odds", 6, 6): {20: 100000}, + ("Category Three Odds", 6, 7): {20: 100000}, + ("Category Three Odds", 6, 8): {20: 100000}, + ("Category Three Odds", 7, 1): {0: 22722, 20: 77278}, + ("Category Three Odds", 7, 2): {0: 1291, 20: 98709}, + ("Category Three Odds", 7, 3): {0: 38, 20: 99962}, + ("Category Three Odds", 7, 4): {0: 2, 20: 99998}, + ("Category Three Odds", 7, 5): {20: 100000}, + ("Category Three Odds", 7, 6): {20: 100000}, + ("Category Three Odds", 7, 7): {20: 100000}, + ("Category Three Odds", 7, 8): {20: 100000}, + ("Category Three Odds", 8, 1): {0: 14556, 20: 85444}, + ("Category Three Odds", 8, 2): {0: 430, 20: 99570}, + ("Category Three Odds", 8, 3): {0: 3, 20: 99997}, + ("Category Three Odds", 8, 4): {20: 100000}, + ("Category Three Odds", 8, 5): {20: 100000}, + ("Category Three Odds", 8, 6): {20: 100000}, + ("Category Three Odds", 8, 7): {20: 100000}, + ("Category Three Odds", 8, 8): {20: 100000}, + ("Category 1-2-1 Consecutive", 1, 1): {0: 100000}, + ("Category 1-2-1 Consecutive", 1, 2): {0: 100000}, + ("Category 1-2-1 Consecutive", 1, 3): {0: 100000}, + ("Category 1-2-1 Consecutive", 1, 4): {0: 100000}, + ("Category 1-2-1 Consecutive", 1, 5): {0: 100000}, + ("Category 1-2-1 Consecutive", 1, 6): {0: 100000}, + ("Category 1-2-1 Consecutive", 1, 7): {0: 100000}, + ("Category 1-2-1 Consecutive", 1, 8): {0: 100000}, + ("Category 1-2-1 Consecutive", 2, 1): {0: 100000}, + ("Category 1-2-1 Consecutive", 2, 2): {0: 100000}, + ("Category 1-2-1 Consecutive", 2, 3): {0: 100000}, + ("Category 1-2-1 Consecutive", 2, 4): {0: 100000}, + ("Category 1-2-1 Consecutive", 2, 5): {0: 100000}, + ("Category 1-2-1 Consecutive", 2, 6): {0: 100000}, + ("Category 1-2-1 Consecutive", 2, 7): {0: 100000}, + ("Category 1-2-1 Consecutive", 2, 8): {0: 100000}, + ("Category 1-2-1 Consecutive", 3, 1): {0: 100000}, + ("Category 1-2-1 Consecutive", 3, 2): {0: 100000}, + ("Category 1-2-1 Consecutive", 3, 3): {0: 100000}, + ("Category 1-2-1 Consecutive", 3, 4): {0: 100000}, + ("Category 1-2-1 Consecutive", 3, 5): {0: 100000}, + ("Category 1-2-1 Consecutive", 3, 6): {0: 100000}, + ("Category 1-2-1 Consecutive", 3, 7): {0: 100000}, + ("Category 1-2-1 Consecutive", 3, 8): {0: 100000}, + ("Category 1-2-1 Consecutive", 4, 1): {0: 96371, 30: 3629}, + ("Category 1-2-1 Consecutive", 4, 2): {0: 86605, 30: 13395}, + ("Category 1-2-1 Consecutive", 4, 3): {0: 75037, 30: 24963}, + ("Category 1-2-1 Consecutive", 4, 4): {0: 63656, 30: 36344}, + ("Category 1-2-1 Consecutive", 4, 5): {0: 53869, 30: 46131}, + ("Category 1-2-1 Consecutive", 4, 6): {0: 45131, 30: 54869}, + ("Category 1-2-1 Consecutive", 4, 7): {0: 37535, 30: 62465}, + ("Category 1-2-1 Consecutive", 4, 8): {0: 31425, 30: 68575}, + ("Category 1-2-1 Consecutive", 5, 1): {0: 86632, 30: 13368}, + ("Category 1-2-1 Consecutive", 5, 2): {0: 62779, 30: 37221}, + ("Category 1-2-1 Consecutive", 5, 3): {0: 46034, 30: 53966}, + ("Category 1-2-1 Consecutive", 5, 4): {0: 34983, 30: 65017}, + ("Category 1-2-1 Consecutive", 5, 5): {0: 28056, 30: 71944}, + ("Category 1-2-1 Consecutive", 5, 6): {0: 23150, 30: 76850}, + ("Category 1-2-1 Consecutive", 5, 7): {0: 19577, 30: 80423}, + ("Category 1-2-1 Consecutive", 5, 8): {0: 17613, 30: 82387}, + ("Category 1-2-1 Consecutive", 6, 1): {0: 71928, 30: 28072}, + ("Category 1-2-1 Consecutive", 6, 2): {0: 40724, 30: 59276}, + ("Category 1-2-1 Consecutive", 6, 3): {0: 26723, 30: 73277}, + ("Category 1-2-1 Consecutive", 6, 4): {0: 19685, 30: 80315}, + ("Category 1-2-1 Consecutive", 6, 5): {0: 15460, 30: 84540}, + ("Category 1-2-1 Consecutive", 6, 6): {0: 12526, 30: 87474}, + ("Category 1-2-1 Consecutive", 6, 7): {0: 10014, 30: 89986}, + ("Category 1-2-1 Consecutive", 6, 8): {0: 8251, 30: 91749}, + ("Category 1-2-1 Consecutive", 7, 1): {0: 55544, 30: 44456}, + ("Category 1-2-1 Consecutive", 7, 2): {0: 24840, 30: 75160}, + ("Category 1-2-1 Consecutive", 7, 3): {0: 15102, 30: 84898}, + ("Category 1-2-1 Consecutive", 7, 4): {0: 10541, 30: 89459}, + ("Category 1-2-1 Consecutive", 7, 5): {0: 7720, 30: 92280}, + ("Category 1-2-1 Consecutive", 7, 6): {0: 5554, 30: 94446}, + ("Category 1-2-1 Consecutive", 7, 7): {0: 4106, 30: 95894}, + ("Category 1-2-1 Consecutive", 7, 8): {0: 3025, 30: 96975}, + ("Category 1-2-1 Consecutive", 8, 1): {0: 40693, 30: 59307}, + ("Category 1-2-1 Consecutive", 8, 2): {0: 14827, 30: 85173}, + ("Category 1-2-1 Consecutive", 8, 3): {0: 8195, 30: 91805}, + ("Category 1-2-1 Consecutive", 8, 4): {0: 5383, 30: 94617}, + ("Category 1-2-1 Consecutive", 8, 5): {0: 3395, 30: 96605}, + ("Category 1-2-1 Consecutive", 8, 6): {0: 2299, 30: 97701}, + ("Category 1-2-1 Consecutive", 8, 7): {0: 1412, 30: 98588}, + ("Category 1-2-1 Consecutive", 8, 8): {0: 872, 30: 99128}, + ("Category Three Distinct Dice", 1, 1): {0: 100000}, + ("Category Three Distinct Dice", 1, 2): {0: 100000}, + ("Category Three Distinct Dice", 1, 3): {0: 100000}, + ("Category Three Distinct Dice", 1, 4): {0: 100000}, + ("Category Three Distinct Dice", 1, 5): {0: 100000}, + ("Category Three Distinct Dice", 1, 6): {0: 100000}, + ("Category Three Distinct Dice", 1, 7): {0: 100000}, + ("Category Three Distinct Dice", 1, 8): {0: 100000}, + ("Category Three Distinct Dice", 2, 1): {0: 100000}, + ("Category Three Distinct Dice", 2, 2): {0: 100000}, + ("Category Three Distinct Dice", 2, 3): {0: 100000}, + ("Category Three Distinct Dice", 2, 4): {0: 100000}, + ("Category Three Distinct Dice", 2, 5): {0: 100000}, + ("Category Three Distinct Dice", 2, 6): {0: 100000}, + ("Category Three Distinct Dice", 2, 7): {0: 100000}, + ("Category Three Distinct Dice", 2, 8): {0: 100000}, + ("Category Three Distinct Dice", 3, 1): {0: 44707, 20: 55293}, + ("Category Three Distinct Dice", 3, 2): {0: 15078, 20: 84922}, + ("Category Three Distinct Dice", 3, 3): {0: 5056, 20: 94944}, + ("Category Three Distinct Dice", 3, 4): {0: 1688, 20: 98312}, + ("Category Three Distinct Dice", 3, 5): {0: 516, 20: 99484}, + ("Category Three Distinct Dice", 3, 6): {0: 182, 20: 99818}, + ("Category Three Distinct Dice", 3, 7): {0: 56, 20: 99944}, + ("Category Three Distinct Dice", 3, 8): {0: 15, 20: 99985}, + ("Category Three Distinct Dice", 4, 1): {0: 16721, 20: 83279}, + ("Category Three Distinct Dice", 4, 2): {0: 1826, 20: 98174}, + ("Category Three Distinct Dice", 4, 3): {0: 203, 20: 99797}, + ("Category Three Distinct Dice", 4, 4): {0: 18, 20: 99982}, + ("Category Three Distinct Dice", 4, 5): {0: 3, 20: 99997}, + ("Category Three Distinct Dice", 4, 6): {20: 100000}, + ("Category Three Distinct Dice", 4, 7): {20: 100000}, + ("Category Three Distinct Dice", 4, 8): {20: 100000}, + ("Category Three Distinct Dice", 5, 1): {0: 5904, 20: 94096}, + ("Category Three Distinct Dice", 5, 2): {0: 236, 20: 99764}, + ("Category Three Distinct Dice", 5, 3): {0: 12, 20: 99988}, + ("Category Three Distinct Dice", 5, 4): {20: 100000}, + ("Category Three Distinct Dice", 5, 5): {20: 100000}, + ("Category Three Distinct Dice", 5, 6): {20: 100000}, + ("Category Three Distinct Dice", 5, 7): {20: 100000}, + ("Category Three Distinct Dice", 5, 8): {20: 100000}, + ("Category Three Distinct Dice", 6, 1): {0: 1992, 20: 98008}, + ("Category Three Distinct Dice", 6, 2): {0: 21, 20: 99979}, + ("Category Three Distinct Dice", 6, 3): {20: 100000}, + ("Category Three Distinct Dice", 6, 4): {20: 100000}, + ("Category Three Distinct Dice", 6, 5): {20: 100000}, + ("Category Three Distinct Dice", 6, 6): {20: 100000}, + ("Category Three Distinct Dice", 6, 7): {20: 100000}, + ("Category Three Distinct Dice", 6, 8): {20: 100000}, + ("Category Three Distinct Dice", 7, 1): {0: 692, 20: 99308}, + ("Category Three Distinct Dice", 7, 2): {0: 4, 20: 99996}, + ("Category Three Distinct Dice", 7, 3): {20: 100000}, + ("Category Three Distinct Dice", 7, 4): {20: 100000}, + ("Category Three Distinct Dice", 7, 5): {20: 100000}, + ("Category Three Distinct Dice", 7, 6): {20: 100000}, + ("Category Three Distinct Dice", 7, 7): {20: 100000}, + ("Category Three Distinct Dice", 7, 8): {20: 100000}, + ("Category Three Distinct Dice", 8, 1): {0: 243, 20: 99757}, + ("Category Three Distinct Dice", 8, 2): {0: 1, 20: 99999}, + ("Category Three Distinct Dice", 8, 3): {20: 100000}, + ("Category Three Distinct Dice", 8, 4): {20: 100000}, + ("Category Three Distinct Dice", 8, 5): {20: 100000}, + ("Category Three Distinct Dice", 8, 6): {20: 100000}, + ("Category Three Distinct Dice", 8, 7): {20: 100000}, + ("Category Three Distinct Dice", 8, 8): {20: 100000}, + ("Category Two Pair", 1, 1): {0: 100000}, + ("Category Two Pair", 1, 2): {0: 100000}, + ("Category Two Pair", 1, 3): {0: 100000}, + ("Category Two Pair", 1, 4): {0: 100000}, + ("Category Two Pair", 1, 5): {0: 100000}, + ("Category Two Pair", 1, 6): {0: 100000}, + ("Category Two Pair", 1, 7): {0: 100000}, + ("Category Two Pair", 1, 8): {0: 100000}, + ("Category Two Pair", 2, 1): {0: 100000}, + ("Category Two Pair", 2, 2): {0: 100000}, + ("Category Two Pair", 2, 3): {0: 100000}, + ("Category Two Pair", 2, 4): {0: 100000}, + ("Category Two Pair", 2, 5): {0: 100000}, + ("Category Two Pair", 2, 6): {0: 100000}, + ("Category Two Pair", 2, 7): {0: 100000}, + ("Category Two Pair", 2, 8): {0: 100000}, + ("Category Two Pair", 3, 1): {0: 100000}, + ("Category Two Pair", 3, 2): {0: 100000}, + ("Category Two Pair", 3, 3): {0: 100000}, + ("Category Two Pair", 3, 4): {0: 100000}, + ("Category Two Pair", 3, 5): {0: 100000}, + ("Category Two Pair", 3, 6): {0: 100000}, + ("Category Two Pair", 3, 7): {0: 100000}, + ("Category Two Pair", 3, 8): {0: 100000}, + ("Category Two Pair", 4, 1): {0: 93065, 30: 6935}, + ("Category Two Pair", 4, 2): {0: 82102, 30: 17898}, + ("Category Two Pair", 4, 3): {0: 71209, 30: 28791}, + ("Category Two Pair", 4, 4): {0: 61609, 30: 38391}, + ("Category Two Pair", 4, 5): {0: 53036, 30: 46964}, + ("Category Two Pair", 4, 6): {0: 45705, 30: 54295}, + ("Category Two Pair", 4, 7): {0: 39398, 30: 60602}, + ("Category Two Pair", 4, 8): {0: 33673, 30: 66327}, + ("Category Two Pair", 5, 1): {0: 72847, 30: 27153}, + ("Category Two Pair", 5, 2): {0: 46759, 30: 53241}, + ("Category Two Pair", 5, 3): {0: 29462, 30: 70538}, + ("Category Two Pair", 5, 4): {0: 18351, 30: 81649}, + ("Category Two Pair", 5, 5): {0: 11793, 30: 88207}, + ("Category Two Pair", 5, 6): {0: 7385, 30: 92615}, + ("Category Two Pair", 5, 7): {0: 4610, 30: 95390}, + ("Category Two Pair", 5, 8): {0: 2938, 30: 97062}, + ("Category Two Pair", 6, 1): {0: 44431, 30: 55569}, + ("Category Two Pair", 6, 2): {0: 17183, 30: 82817}, + ("Category Two Pair", 6, 3): {0: 6759, 30: 93241}, + ("Category Two Pair", 6, 4): {0: 2562, 30: 97438}, + ("Category Two Pair", 6, 5): {0: 948, 30: 99052}, + ("Category Two Pair", 6, 6): {0: 375, 30: 99625}, + ("Category Two Pair", 6, 7): {0: 138, 30: 99862}, + ("Category Two Pair", 6, 8): {0: 57, 30: 99943}, + ("Category Two Pair", 7, 1): {0: 19888, 30: 80112}, + ("Category Two Pair", 7, 2): {0: 3935, 30: 96065}, + ("Category Two Pair", 7, 3): {0: 801, 30: 99199}, + ("Category Two Pair", 7, 4): {0: 175, 30: 99825}, + ("Category Two Pair", 7, 5): {0: 31, 30: 99969}, + ("Category Two Pair", 7, 6): {0: 7, 30: 99993}, + ("Category Two Pair", 7, 7): {0: 2, 30: 99998}, + ("Category Two Pair", 7, 8): {30: 100000}, + ("Category Two Pair", 8, 1): {0: 6791, 30: 93209}, + ("Category Two Pair", 8, 2): {0: 588, 30: 99412}, + ("Category Two Pair", 8, 3): {0: 61, 30: 99939}, + ("Category Two Pair", 8, 4): {0: 6, 30: 99994}, + ("Category Two Pair", 8, 5): {30: 100000}, + ("Category Two Pair", 8, 6): {30: 100000}, + ("Category Two Pair", 8, 7): {30: 100000}, + ("Category Two Pair", 8, 8): {30: 100000}, + ("Category 2-1-2 Consecutive", 1, 1): {0: 100000}, + ("Category 2-1-2 Consecutive", 1, 2): {0: 100000}, + ("Category 2-1-2 Consecutive", 1, 3): {0: 100000}, + ("Category 2-1-2 Consecutive", 1, 4): {0: 100000}, + ("Category 2-1-2 Consecutive", 1, 5): {0: 100000}, + ("Category 2-1-2 Consecutive", 1, 6): {0: 100000}, + ("Category 2-1-2 Consecutive", 1, 7): {0: 100000}, + ("Category 2-1-2 Consecutive", 1, 8): {0: 100000}, + ("Category 2-1-2 Consecutive", 2, 1): {0: 100000}, + ("Category 2-1-2 Consecutive", 2, 2): {0: 100000}, + ("Category 2-1-2 Consecutive", 2, 3): {0: 100000}, + ("Category 2-1-2 Consecutive", 2, 4): {0: 100000}, + ("Category 2-1-2 Consecutive", 2, 5): {0: 100000}, + ("Category 2-1-2 Consecutive", 2, 6): {0: 100000}, + ("Category 2-1-2 Consecutive", 2, 7): {0: 100000}, + ("Category 2-1-2 Consecutive", 2, 8): {0: 100000}, + ("Category 2-1-2 Consecutive", 3, 1): {0: 100000}, + ("Category 2-1-2 Consecutive", 3, 2): {0: 100000}, + ("Category 2-1-2 Consecutive", 3, 3): {0: 100000}, + ("Category 2-1-2 Consecutive", 3, 4): {0: 100000}, + ("Category 2-1-2 Consecutive", 3, 5): {0: 100000}, + ("Category 2-1-2 Consecutive", 3, 6): {0: 100000}, + ("Category 2-1-2 Consecutive", 3, 7): {0: 100000}, + ("Category 2-1-2 Consecutive", 3, 8): {0: 100000}, + ("Category 2-1-2 Consecutive", 4, 1): {0: 100000}, + ("Category 2-1-2 Consecutive", 4, 2): {0: 100000}, + ("Category 2-1-2 Consecutive", 4, 3): {0: 100000}, + ("Category 2-1-2 Consecutive", 4, 4): {0: 100000}, + ("Category 2-1-2 Consecutive", 4, 5): {0: 100000}, + ("Category 2-1-2 Consecutive", 4, 6): {0: 100000}, + ("Category 2-1-2 Consecutive", 4, 7): {0: 100000}, + ("Category 2-1-2 Consecutive", 4, 8): {0: 100000}, + ("Category 2-1-2 Consecutive", 5, 1): {0: 98403, 40: 1597}, + ("Category 2-1-2 Consecutive", 5, 2): {0: 90651, 40: 9349}, + ("Category 2-1-2 Consecutive", 5, 3): {0: 80100, 40: 19900}, + ("Category 2-1-2 Consecutive", 5, 4): {0: 69131, 40: 30869}, + ("Category 2-1-2 Consecutive", 5, 5): {0: 58252, 40: 41748}, + ("Category 2-1-2 Consecutive", 5, 6): {0: 49405, 40: 50595}, + ("Category 2-1-2 Consecutive", 5, 7): {0: 41585, 40: 58415}, + ("Category 2-1-2 Consecutive", 5, 8): {0: 34952, 40: 65048}, + ("Category 2-1-2 Consecutive", 6, 1): {0: 93465, 40: 6535}, + ("Category 2-1-2 Consecutive", 6, 2): {0: 73416, 40: 26584}, + ("Category 2-1-2 Consecutive", 6, 3): {0: 54041, 40: 45959}, + ("Category 2-1-2 Consecutive", 6, 4): {0: 38535, 40: 61465}, + ("Category 2-1-2 Consecutive", 6, 5): {0: 27366, 40: 72634}, + ("Category 2-1-2 Consecutive", 6, 6): {0: 18924, 40: 81076}, + ("Category 2-1-2 Consecutive", 6, 7): {0: 13387, 40: 86613}, + ("Category 2-1-2 Consecutive", 6, 8): {0: 9134, 40: 90866}, + ("Category 2-1-2 Consecutive", 7, 1): {0: 84168, 40: 15832}, + ("Category 2-1-2 Consecutive", 7, 2): {0: 52659, 40: 47341}, + ("Category 2-1-2 Consecutive", 7, 3): {0: 30435, 40: 69565}, + ("Category 2-1-2 Consecutive", 7, 4): {0: 17477, 40: 82523}, + ("Category 2-1-2 Consecutive", 7, 5): {0: 9782, 40: 90218}, + ("Category 2-1-2 Consecutive", 7, 6): {0: 5316, 40: 94684}, + ("Category 2-1-2 Consecutive", 7, 7): {0: 2995, 40: 97005}, + ("Category 2-1-2 Consecutive", 7, 8): {0: 1689, 40: 98311}, + ("Category 2-1-2 Consecutive", 8, 1): {0: 71089, 40: 28911}, + ("Category 2-1-2 Consecutive", 8, 2): {0: 33784, 40: 66216}, + ("Category 2-1-2 Consecutive", 8, 3): {0: 14820, 40: 85180}, + ("Category 2-1-2 Consecutive", 8, 4): {0: 6265, 40: 93735}, + ("Category 2-1-2 Consecutive", 8, 5): {0: 2600, 40: 97400}, + ("Category 2-1-2 Consecutive", 8, 6): {0: 1155, 40: 98845}, + ("Category 2-1-2 Consecutive", 8, 7): {0: 487, 40: 99513}, + ("Category 2-1-2 Consecutive", 8, 8): {0: 190, 40: 99810}, + ("Category Five Distinct Dice", 1, 1): {0: 100000}, + ("Category Five Distinct Dice", 1, 2): {0: 100000}, + ("Category Five Distinct Dice", 1, 3): {0: 100000}, + ("Category Five Distinct Dice", 1, 4): {0: 100000}, + ("Category Five Distinct Dice", 1, 5): {0: 100000}, + ("Category Five Distinct Dice", 1, 6): {0: 100000}, + ("Category Five Distinct Dice", 1, 7): {0: 100000}, + ("Category Five Distinct Dice", 1, 8): {0: 100000}, + ("Category Five Distinct Dice", 2, 1): {0: 100000}, + ("Category Five Distinct Dice", 2, 2): {0: 100000}, + ("Category Five Distinct Dice", 2, 3): {0: 100000}, + ("Category Five Distinct Dice", 2, 4): {0: 100000}, + ("Category Five Distinct Dice", 2, 5): {0: 100000}, + ("Category Five Distinct Dice", 2, 6): {0: 100000}, + ("Category Five Distinct Dice", 2, 7): {0: 100000}, + ("Category Five Distinct Dice", 2, 8): {0: 100000}, + ("Category Five Distinct Dice", 3, 1): {0: 100000}, + ("Category Five Distinct Dice", 3, 2): {0: 100000}, + ("Category Five Distinct Dice", 3, 3): {0: 100000}, + ("Category Five Distinct Dice", 3, 4): {0: 100000}, + ("Category Five Distinct Dice", 3, 5): {0: 100000}, + ("Category Five Distinct Dice", 3, 6): {0: 100000}, + ("Category Five Distinct Dice", 3, 7): {0: 100000}, + ("Category Five Distinct Dice", 3, 8): {0: 100000}, + ("Category Five Distinct Dice", 4, 1): {0: 100000}, + ("Category Five Distinct Dice", 4, 2): {0: 100000}, + ("Category Five Distinct Dice", 4, 3): {0: 100000}, + ("Category Five Distinct Dice", 4, 4): {0: 100000}, + ("Category Five Distinct Dice", 4, 5): {0: 100000}, + ("Category Five Distinct Dice", 4, 6): {0: 100000}, + ("Category Five Distinct Dice", 4, 7): {0: 100000}, + ("Category Five Distinct Dice", 4, 8): {0: 100000}, + ("Category Five Distinct Dice", 5, 1): {0: 90907, 25: 9093}, + ("Category Five Distinct Dice", 5, 2): {0: 68020, 25: 31980}, + ("Category Five Distinct Dice", 5, 3): {0: 47692, 25: 52308}, + ("Category Five Distinct Dice", 5, 4): {0: 32383, 25: 67617}, + ("Category Five Distinct Dice", 5, 5): {0: 21631, 25: 78369}, + ("Category Five Distinct Dice", 5, 6): {0: 14366, 25: 85634}, + ("Category Five Distinct Dice", 5, 7): {0: 9568, 25: 90432}, + ("Category Five Distinct Dice", 5, 8): {0: 6360, 25: 93640}, + ("Category Five Distinct Dice", 6, 1): {0: 75051, 25: 24949}, + ("Category Five Distinct Dice", 6, 2): {0: 38409, 25: 61591}, + ("Category Five Distinct Dice", 6, 3): {0: 17505, 25: 82495}, + ("Category Five Distinct Dice", 6, 4): {0: 7862, 25: 92138}, + ("Category Five Distinct Dice", 6, 5): {0: 3538, 25: 96462}, + ("Category Five Distinct Dice", 6, 6): {0: 1645, 25: 98355}, + ("Category Five Distinct Dice", 6, 7): {0: 714, 25: 99286}, + ("Category Five Distinct Dice", 6, 8): {0: 341, 25: 99659}, + ("Category Five Distinct Dice", 7, 1): {0: 58588, 25: 41412}, + ("Category Five Distinct Dice", 7, 2): {0: 19487, 25: 80513}, + ("Category Five Distinct Dice", 7, 3): {0: 6043, 25: 93957}, + ("Category Five Distinct Dice", 7, 4): {0: 1799, 25: 98201}, + ("Category Five Distinct Dice", 7, 5): {0: 544, 25: 99456}, + ("Category Five Distinct Dice", 7, 6): {0: 169, 25: 99831}, + ("Category Five Distinct Dice", 7, 7): {0: 59, 25: 99941}, + ("Category Five Distinct Dice", 7, 8): {0: 11, 25: 99989}, + ("Category Five Distinct Dice", 8, 1): {0: 43586, 25: 56414}, + ("Category Five Distinct Dice", 8, 2): {0: 9615, 25: 90385}, + ("Category Five Distinct Dice", 8, 3): {0: 1944, 25: 98056}, + ("Category Five Distinct Dice", 8, 4): {0: 383, 25: 99617}, + ("Category Five Distinct Dice", 8, 5): {0: 77, 25: 99923}, + ("Category Five Distinct Dice", 8, 6): {0: 18, 25: 99982}, + ("Category Five Distinct Dice", 8, 7): {0: 3, 25: 99997}, + ("Category Five Distinct Dice", 8, 8): {0: 2, 25: 99998}, + ("Category 4&5 Full House", 1, 1): {0: 100000}, + ("Category 4&5 Full House", 1, 2): {0: 100000}, + ("Category 4&5 Full House", 1, 3): {0: 100000}, + ("Category 4&5 Full House", 1, 4): {0: 100000}, + ("Category 4&5 Full House", 1, 5): {0: 100000}, + ("Category 4&5 Full House", 1, 6): {0: 100000}, + ("Category 4&5 Full House", 1, 7): {0: 100000}, + ("Category 4&5 Full House", 1, 8): {0: 100000}, + ("Category 4&5 Full House", 2, 1): {0: 100000}, + ("Category 4&5 Full House", 2, 2): {0: 100000}, + ("Category 4&5 Full House", 2, 3): {0: 100000}, + ("Category 4&5 Full House", 2, 4): {0: 100000}, + ("Category 4&5 Full House", 2, 5): {0: 100000}, + ("Category 4&5 Full House", 2, 6): {0: 100000}, + ("Category 4&5 Full House", 2, 7): {0: 100000}, + ("Category 4&5 Full House", 2, 8): {0: 100000}, + ("Category 4&5 Full House", 3, 1): {0: 100000}, + ("Category 4&5 Full House", 3, 2): {0: 100000}, + ("Category 4&5 Full House", 3, 3): {0: 100000}, + ("Category 4&5 Full House", 3, 4): {0: 100000}, + ("Category 4&5 Full House", 3, 5): {0: 100000}, + ("Category 4&5 Full House", 3, 6): {0: 100000}, + ("Category 4&5 Full House", 3, 7): {0: 100000}, + ("Category 4&5 Full House", 3, 8): {0: 100000}, + ("Category 4&5 Full House", 4, 1): {0: 100000}, + ("Category 4&5 Full House", 4, 2): {0: 100000}, + ("Category 4&5 Full House", 4, 3): {0: 100000}, + ("Category 4&5 Full House", 4, 4): {0: 100000}, + ("Category 4&5 Full House", 4, 5): {0: 100000}, + ("Category 4&5 Full House", 4, 6): {0: 100000}, + ("Category 4&5 Full House", 4, 7): {0: 100000}, + ("Category 4&5 Full House", 4, 8): {0: 100000}, + ("Category 4&5 Full House", 5, 1): {0: 99724, 50: 276}, + ("Category 4&5 Full House", 5, 2): {0: 96607, 50: 3393}, + ("Category 4&5 Full House", 5, 3): {0: 88788, 50: 11212}, + ("Category 4&5 Full House", 5, 4): {0: 77799, 50: 22201}, + ("Category 4&5 Full House", 5, 5): {0: 65797, 50: 34203}, + ("Category 4&5 Full House", 5, 6): {0: 54548, 50: 45452}, + ("Category 4&5 Full House", 5, 7): {0: 44898, 50: 55102}, + ("Category 4&5 Full House", 5, 8): {0: 36881, 50: 63119}, + ("Category 4&5 Full House", 6, 1): {0: 98841, 50: 1159}, + ("Category 4&5 Full House", 6, 2): {0: 88680, 50: 11320}, + ("Category 4&5 Full House", 6, 3): {0: 70215, 50: 29785}, + ("Category 4&5 Full House", 6, 4): {0: 50801, 50: 49199}, + ("Category 4&5 Full House", 6, 5): {0: 35756, 50: 64244}, + ("Category 4&5 Full House", 6, 6): {0: 24698, 50: 75302}, + ("Category 4&5 Full House", 6, 7): {0: 17145, 50: 82855}, + ("Category 4&5 Full House", 6, 8): {0: 11846, 50: 88154}, + ("Category 4&5 Full House", 7, 1): {0: 97090, 50: 2910}, + ("Category 4&5 Full House", 7, 2): {0: 77440, 50: 22560}, + ("Category 4&5 Full House", 7, 3): {0: 51372, 50: 48628}, + ("Category 4&5 Full House", 7, 4): {0: 30566, 50: 69434}, + ("Category 4&5 Full House", 7, 5): {0: 17866, 50: 82134}, + ("Category 4&5 Full House", 7, 6): {0: 10521, 50: 89479}, + ("Category 4&5 Full House", 7, 7): {0: 6204, 50: 93796}, + ("Category 4&5 Full House", 7, 8): {0: 3670, 50: 96330}, + ("Category 4&5 Full House", 8, 1): {0: 94172, 50: 5828}, + ("Category 4&5 Full House", 8, 2): {0: 64693, 50: 35307}, + ("Category 4&5 Full House", 8, 3): {0: 35293, 50: 64707}, + ("Category 4&5 Full House", 8, 4): {0: 17749, 50: 82251}, + ("Category 4&5 Full House", 8, 5): {0: 8740, 50: 91260}, + ("Category 4&5 Full House", 8, 6): {0: 4550, 50: 95450}, + ("Category 4&5 Full House", 8, 7): {0: 2218, 50: 97782}, + ("Category 4&5 Full House", 8, 8): {0: 1084, 50: 98916}, +} diff --git a/worlds/yachtdice/__init__.py b/worlds/yachtdice/__init__.py new file mode 100644 index 000000000000..c36c59544f15 --- /dev/null +++ b/worlds/yachtdice/__init__.py @@ -0,0 +1,533 @@ +import math +from typing import Dict + +from BaseClasses import CollectionState, Entrance, Item, Region, Tutorial + +from worlds.AutoWorld import WebWorld, World + +from .Items import YachtDiceItem, item_groups, item_table +from .Locations import YachtDiceLocation, all_locations, ini_locations +from .Options import ( + AddExtraPoints, + AddStoryChapters, + GameDifficulty, + MinimalNumberOfDiceAndRolls, + MinimizeExtraItems, + PointsSize, + YachtDiceOptions, + yd_option_groups, +) +from .Rules import dice_simulation_fill_pool, set_yacht_completion_rules, set_yacht_rules + + +class YachtDiceWeb(WebWorld): + tutorials = [ + Tutorial( + "Multiworld Setup Guide", + "A guide to setting up Yacht Dice. This guide covers single-player, multiworld, and website.", + "English", + "setup_en.md", + "setup/en", + ["Spineraks"], + ) + ] + + option_groups = yd_option_groups + + +class YachtDiceWorld(World): + """ + Yacht Dice is a straightforward game, custom-made for Archipelago, + where you cast your dice to chart a course for high scores, + unlocking valuable treasures along the way. + Discover more dice, extra rolls, multipliers, + and unlockable categories to navigate the depths of the game. + Roll your way to victory by reaching the target score! + """ + + game: str = "Yacht Dice" + options_dataclass = YachtDiceOptions + + web = YachtDiceWeb() + + item_name_to_id = {name: data.code for name, data in item_table.items()} + + location_name_to_id = {name: data.id for name, data in all_locations.items()} + + item_name_groups = item_groups + + ap_world_version = "2.1.1" + + def _get_yachtdice_data(self): + return { + # "world_seed": self.multiworld.per_slot_randoms[self.player].getrandbits(32), + "seed_name": self.multiworld.seed_name, + "player_name": self.multiworld.get_player_name(self.player), + "player_id": self.player, + "race": self.multiworld.is_race, + } + + def generate_early(self): + """ + In generate early, we fill the item-pool, then determine the number of locations, and add filler items. + """ + self.itempool = [] + self.precollected = [] + + # number of dice and rolls in the pull + opt_dice_and_rolls = self.options.minimal_number_of_dice_and_rolls + + if opt_dice_and_rolls == MinimalNumberOfDiceAndRolls.option_5_dice_and_3_rolls: + num_of_dice = 5 + num_of_rolls = 3 + elif opt_dice_and_rolls == MinimalNumberOfDiceAndRolls.option_5_dice_and_5_rolls: + num_of_dice = 5 + num_of_rolls = 5 + elif opt_dice_and_rolls == MinimalNumberOfDiceAndRolls.option_6_dice_and_4_rolls: + num_of_dice = 6 + num_of_rolls = 4 + elif opt_dice_and_rolls == MinimalNumberOfDiceAndRolls.option_7_dice_and_3_rolls: + num_of_dice = 7 + num_of_rolls = 3 + elif opt_dice_and_rolls == MinimalNumberOfDiceAndRolls.option_8_dice_and_2_rolls: + num_of_dice = 8 + num_of_rolls = 2 + else: + raise Exception(f"[Yacht Dice] Unknown MinimalNumberOfDiceAndRolls options {opt_dice_and_rolls}") + + # amount of dice and roll fragments needed to get a dice or roll + self.frags_per_dice = self.options.number_of_dice_fragments_per_dice.value + self.frags_per_roll = self.options.number_of_roll_fragments_per_roll.value + + if self.options.minimize_extra_items == MinimizeExtraItems.option_yes_please: + self.frags_per_dice = min(self.frags_per_dice, 2) + self.frags_per_roll = min(self.frags_per_roll, 2) + + # set difficulty + diff_value = self.options.game_difficulty + if diff_value == GameDifficulty.option_easy: + self.difficulty = 1 + elif diff_value == GameDifficulty.option_medium: + self.difficulty = 2 + elif diff_value == GameDifficulty.option_hard: + self.difficulty = 3 + elif diff_value == GameDifficulty.option_extreme: + self.difficulty = 4 + else: + raise Exception(f"[Yacht Dice] Unknown GameDifficulty options {diff_value}") + + # Create a list with the specified number of 1s + num_ones = self.options.alternative_categories.value + categorylist = [1] * num_ones + [0] * (16 - num_ones) + + # Shuffle the list to randomize the order + self.random.shuffle(categorylist) + + # A list of all possible categories. + # Every entry in the list has two categories, one 'default' category and one 'alt'. + # You get either of the two for every entry, so a total of 16 unique categories. + all_categories = [ + ["Category Choice", "Category Double Threes and Fours"], + ["Category Inverse Choice", "Category Quadruple Ones and Twos"], + ["Category Ones", "Category Distincts"], + ["Category Twos", "Category Two times Ones"], + ["Category Threes", "Category Half of Sixes"], + ["Category Fours", "Category Twos and Threes"], + ["Category Fives", "Category Sum of Odds"], + ["Category Sixes", "Category Sum of Evens"], + ["Category Pair", "Category Micro Straight"], + ["Category Three of a Kind", "Category Three Odds"], + ["Category Four of a Kind", "Category 1-2-1 Consecutive"], + ["Category Tiny Straight", "Category Three Distinct Dice"], + ["Category Small Straight", "Category Two Pair"], + ["Category Large Straight", "Category 2-1-2 Consecutive"], + ["Category Full House", "Category Five Distinct Dice"], + ["Category Yacht", "Category 4&5 Full House"], + ] + + # categories used in this game. + self.possible_categories = [] + + for index, cats in enumerate(all_categories): + self.possible_categories.append(cats[categorylist[index]]) + + # Add Choice and Inverse choice (or their alts) to the precollected list. + if index == 0 or index == 1: + self.precollected.append(cats[categorylist[index]]) + else: + self.itempool.append(cats[categorylist[index]]) + + # Also start with one Roll and one Dice + self.precollected.append("Dice") + num_of_dice_to_add = num_of_dice - 1 + self.precollected.append("Roll") + num_of_rolls_to_add = num_of_rolls - 1 + + self.skip_early_locations = False + if self.options.minimize_extra_items == MinimizeExtraItems.option_yes_please: + self.precollected.append("Dice") + num_of_dice_to_add -= 1 + self.precollected.append("Roll") + num_of_rolls_to_add -= 1 + self.skip_early_locations = True + + if num_of_dice_to_add > 0: + self.itempool.append("Dice") + num_of_dice_to_add -= 1 + if num_of_rolls_to_add > 0: + self.itempool.append("Roll") + num_of_rolls_to_add -= 1 + + # if one fragment per dice, just add "Dice" objects + if num_of_dice_to_add > 0: + if self.frags_per_dice == 1: + self.itempool += ["Dice"] * num_of_dice_to_add # minus one because one is in start inventory + else: + self.itempool += ["Dice Fragment"] * (self.frags_per_dice * num_of_dice_to_add) + + # if one fragment per roll, just add "Roll" objects + if num_of_rolls_to_add > 0: + if self.frags_per_roll == 1: + self.itempool += ["Roll"] * num_of_rolls_to_add # minus one because one is in start inventory + else: + self.itempool.append("Roll") # always add a full roll to make generation easier (will be early) + self.itempool += ["Roll Fragment"] * (self.frags_per_roll * num_of_rolls_to_add) + + already_items = len(self.itempool) + + # Yacht Dice needs extra filler items so it doesn't get stuck in generation. + # For now, we calculate the number of extra items we'll need later. + if self.options.minimize_extra_items == MinimizeExtraItems.option_yes_please: + extra_percentage = max(0.1, 0.8 - self.multiworld.players / 10) + elif self.options.minimize_extra_items == MinimizeExtraItems.option_no_dont: + extra_percentage = 0.72 + else: + raise Exception(f"[Yacht Dice] Unknown MinimizeExtraItems options {self.options.minimize_extra_items}") + extra_locations_needed = max(10, math.ceil(already_items * extra_percentage)) + + # max score is the value of the last check. Goal score is the score needed to 'finish' the game + self.max_score = self.options.score_for_last_check.value + self.goal_score = min(self.max_score, self.options.score_for_goal.value) + + # Yacht Dice adds items into the pool until a score of at least 1000 is reached. + # the yaml contains weights, which determine how likely it is that specific items get added. + # If all weights are 0, some of them will be made to be non-zero later. + weights: Dict[str, float] = { + "Dice": self.options.weight_of_dice.value, + "Roll": self.options.weight_of_roll.value, + "Fixed Score Multiplier": self.options.weight_of_fixed_score_multiplier.value, + "Step Score Multiplier": self.options.weight_of_step_score_multiplier.value, + "Double category": self.options.weight_of_double_category.value, + "Points": self.options.weight_of_points.value, + } + + # if the player wants extra rolls or dice, fill the pool with fragments until close to an extra roll/dice + if weights["Dice"] > 0 and self.frags_per_dice > 1: + self.itempool += ["Dice Fragment"] * (self.frags_per_dice - 1) + if weights["Roll"] > 0 and self.frags_per_roll > 1: + self.itempool += ["Roll Fragment"] * (self.frags_per_roll - 1) + + # calibrate the weights, since the impact of each of the items is different + weights["Dice"] = weights["Dice"] / 5 * self.frags_per_dice + weights["Roll"] = weights["Roll"] / 5 * self.frags_per_roll + + extra_points_added = 0 + multipliers_added = 0 + items_added = 0 + + def get_item_to_add(weights, extra_points_added, multipliers_added, items_added): + items_added += 1 + + all_items = self.itempool + self.precollected + dice_fragments_in_pool = all_items.count("Dice") * self.frags_per_dice + all_items.count("Dice Fragment") + if dice_fragments_in_pool + 1 >= 9 * self.frags_per_dice: + weights["Dice"] = 0 # don't allow >=9 dice + roll_fragments_in_pool = all_items.count("Roll") * self.frags_per_roll + all_items.count("Roll Fragment") + if roll_fragments_in_pool + 1 >= 6 * self.frags_per_roll: + weights["Roll"] = 0 # don't allow >= 6 rolls + + # Don't allow too many multipliers + if multipliers_added > 50: + weights["Fixed Score Multiplier"] = 0 + weights["Step Score Multiplier"] = 0 + + # Don't allow too many extra points + if extra_points_added > 300: + weights["Points"] = 0 + + # if all weights are zero, allow to add fixed score multiplier, double category, points. + if sum(weights.values()) == 0: + if multipliers_added <= 50: + weights["Fixed Score Multiplier"] = 1 + weights["Double category"] = 1 + if extra_points_added <= 300: + weights["Points"] = 1 + + # Next, add the appropriate item. We'll slightly alter weights to avoid too many of the same item + which_item_to_add = self.random.choices(list(weights.keys()), weights=list(weights.values()))[0] + + if which_item_to_add == "Dice": + weights["Dice"] /= 1 + self.frags_per_dice + return "Dice" if self.frags_per_dice == 1 else "Dice Fragment" + elif which_item_to_add == "Roll": + weights["Roll"] /= 1 + self.frags_per_roll + return "Roll" if self.frags_per_roll == 1 else "Roll Fragment" + elif which_item_to_add == "Fixed Score Multiplier": + weights["Fixed Score Multiplier"] /= 1.05 + multipliers_added += 1 + return "Fixed Score Multiplier" + elif which_item_to_add == "Step Score Multiplier": + weights["Step Score Multiplier"] /= 1.1 + multipliers_added += 1 + return "Step Score Multiplier" + elif which_item_to_add == "Double category": + # Below entries are the weights to add each category. + # Prefer to add choice or number categories, because the other categories are too "all or nothing", + # which often don't give any points, until you get overpowered, and then they give all points. + cat_weights = [2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1] + weights["Double category"] /= 1.1 + return self.random.choices(self.possible_categories, weights=cat_weights)[0] + elif which_item_to_add == "Points": + score_dist = self.options.points_size + probs = {"1 Point": 1, "10 Points": 0, "100 Points": 0} + if score_dist == PointsSize.option_small: + probs = {"1 Point": 0.9, "10 Points": 0.1, "100 Points": 0} + elif score_dist == PointsSize.option_medium: + probs = {"1 Point": 0, "10 Points": 1, "100 Points": 0} + elif score_dist == PointsSize.option_large: + probs = {"1 Point": 0, "10 Points": 0.3, "100 Points": 0.7} + elif score_dist == PointsSize.option_mix: + probs = {"1 Point": 0.3, "10 Points": 0.4, "100 Points": 0.3} + else: + raise Exception(f"[Yacht Dice] Unknown PointsSize options {score_dist}") + choice = self.random.choices(list(probs.keys()), weights=list(probs.values()))[0] + if choice == "1 Point": + weights["Points"] /= 1.01 + extra_points_added += 1 + return "1 Point" + elif choice == "10 Points": + weights["Points"] /= 1.1 + extra_points_added += 10 + return "10 Points" + elif choice == "100 Points": + weights["Points"] /= 2 + extra_points_added += 100 + return "100 Points" + else: + raise Exception("Unknown point value (Yacht Dice)") + else: + raise Exception(f"Invalid index when adding new items in Yacht Dice: {which_item_to_add}") + + # adding 17 items as a start seems like the smartest way to get close to 1000 points + for _ in range(17): + self.itempool.append(get_item_to_add(weights, extra_points_added, multipliers_added, items_added)) + + score_in_logic = dice_simulation_fill_pool( + self.itempool + self.precollected, + self.frags_per_dice, + self.frags_per_roll, + self.possible_categories, + self.difficulty, + self.player, + ) + + # if we overshoot, remove items until you get below 1000, then return the last removed item + if score_in_logic > 1000: + removed_item = "" + while score_in_logic > 1000: + removed_item = self.itempool.pop() + score_in_logic = dice_simulation_fill_pool( + self.itempool + self.precollected, + self.frags_per_dice, + self.frags_per_roll, + self.possible_categories, + self.difficulty, + self.player, + ) + self.itempool.append(removed_item) + else: + # Keep adding items until a score of 1000 is in logic + while score_in_logic < 1000: + item_to_add = get_item_to_add(weights, extra_points_added, multipliers_added, items_added) + self.itempool.append(item_to_add) + if item_to_add == "1 Point": + score_in_logic += 1 + elif item_to_add == "10 Points": + score_in_logic += 10 + elif item_to_add == "100 Points": + score_in_logic += 100 + else: + score_in_logic = dice_simulation_fill_pool( + self.itempool + self.precollected, + self.frags_per_dice, + self.frags_per_roll, + self.possible_categories, + self.difficulty, + self.player, + ) + + # count the number of locations in the game. + already_items = len(self.itempool) + 1 # +1 because of Victory item + + # We need to add more filler/useful items if there are many items in the pool to guarantee successful generation + extra_locations_needed += (already_items - 45) // 15 + self.number_of_locations = already_items + extra_locations_needed + + # From here, we will count the number of items in the self.itempool, and add useful/filler items to the pool, + # making sure not to exceed the number of locations. + + # first, we flood the entire pool with extra points (useful), if that setting is chosen. + if self.options.add_bonus_points == AddExtraPoints.option_all_of_it: # all of the extra points + already_items = len(self.itempool) + 1 + self.itempool += ["Bonus Point"] * min(self.number_of_locations - already_items, 100) + + # second, we flood the entire pool with story chapters (filler), if that setting is chosen. + if self.options.add_story_chapters == AddStoryChapters.option_all_of_it: # all of the story chapters + already_items = len(self.itempool) + 1 + number_of_items = min(self.number_of_locations - already_items, 100) + number_of_items = (number_of_items // 10) * 10 # story chapters always come in multiples of 10 + self.itempool += ["Story Chapter"] * number_of_items + + # add some extra points (useful) + if self.options.add_bonus_points == AddExtraPoints.option_sure: # add extra points if wanted + already_items = len(self.itempool) + 1 + self.itempool += ["Bonus Point"] * min(self.number_of_locations - already_items, 10) + + # add some story chapters (filler) + if self.options.add_story_chapters == AddStoryChapters.option_sure: # add extra points if wanted + already_items = len(self.itempool) + 1 + if self.number_of_locations - already_items >= 10: + self.itempool += ["Story Chapter"] * 10 + + # add some more extra points if there is still room + if self.options.add_bonus_points == AddExtraPoints.option_sure: + already_items = len(self.itempool) + 1 + self.itempool += ["Bonus Point"] * min(self.number_of_locations - already_items, 10) + + # add some encouragements filler-items if there is still room + already_items = len(self.itempool) + 1 + self.itempool += ["Encouragement"] * min(self.number_of_locations - already_items, 5) + + # add some fun facts filler-items if there is still room + already_items = len(self.itempool) + 1 + self.itempool += ["Fun Fact"] * min(self.number_of_locations - already_items, 5) + + # finally, add some "Good RNG" and "Bad RNG" items to complete the item pool + # these items are filler and do not do anything. + + # probability of Good and Bad rng, based on difficulty for fun :) + + p = 1.1 - 0.25 * self.difficulty + already_items = len(self.itempool) + 1 + self.itempool += self.random.choices( + ["Good RNG", "Bad RNG"], weights=[p, 1 - p], k=self.number_of_locations - already_items + ) + + # we are done adding items. Now because of the last step, number of items should be number of locations + already_items = len(self.itempool) + 1 + if already_items != self.number_of_locations: + raise Exception( + f"[Yacht Dice] Number in self.itempool is not number of locations " + f"{already_items} {self.number_of_locations}." + ) + + # add precollected items using push_precollected. Items in self.itempool get created in create_items + for item in self.precollected: + self.multiworld.push_precollected(self.create_item(item)) + + # make sure one dice and one roll is early, so that you will have 2 dice and 2 rolls soon + self.multiworld.early_items[self.player]["Dice"] = 1 + self.multiworld.early_items[self.player]["Roll"] = 1 + + def create_items(self): + self.multiworld.itempool += [self.create_item(name) for name in self.itempool] + + def create_regions(self): + # call the ini_locations function, that generates locations based on the inputs. + location_table = ini_locations( + self.goal_score, + self.max_score, + self.number_of_locations, + self.difficulty, + self.skip_early_locations, + self.multiworld.players, + ) + + # simple menu-board construction + menu = Region("Menu", self.player, self.multiworld) + board = Region("Board", self.player, self.multiworld) + + # add locations to board, one for every location in the location_table + board.locations = [ + YachtDiceLocation(self.player, loc_name, loc_data.score, loc_data.id, board) + for loc_name, loc_data in location_table.items() + if loc_data.region == board.name + ] + + # Add the victory item to the correct location. + # The website declares that the game is complete when the victory item is obtained. + victory_location_name = f"{self.goal_score} score" + self.get_location(victory_location_name).place_locked_item(self.create_item("Victory")) + + # add the regions + connection = Entrance(self.player, "New Board", menu) + menu.exits.append(connection) + connection.connect(board) + self.multiworld.regions += [menu, board] + + def set_rules(self): + """ + set rules per location, and add the rule for beating the game + """ + set_yacht_rules( + self.multiworld, + self.player, + self.frags_per_dice, + self.frags_per_roll, + self.possible_categories, + self.difficulty, + ) + set_yacht_completion_rules(self.multiworld, self.player) + + def fill_slot_data(self): + """ + make slot data, which consists of yachtdice_data, options, and some other variables. + """ + yacht_dice_data = self._get_yachtdice_data() + yacht_dice_options = self.options.as_dict( + "game_difficulty", + "score_for_last_check", + "score_for_goal", + "number_of_dice_fragments_per_dice", + "number_of_roll_fragments_per_roll", + "which_story", + "allow_manual_input", + ) + slot_data = {**yacht_dice_data, **yacht_dice_options} # combine the two + slot_data["number_of_dice_fragments_per_dice"] = self.frags_per_dice + slot_data["number_of_roll_fragments_per_roll"] = self.frags_per_roll + slot_data["goal_score"] = self.goal_score + slot_data["last_check_score"] = self.max_score + slot_data["allowed_categories"] = self.possible_categories + slot_data["ap_world_version"] = self.ap_world_version + return slot_data + + def create_item(self, name: str) -> Item: + item_data = item_table[name] + item = YachtDiceItem(name, item_data.classification, item_data.code, self.player) + return item + + # We overwrite these function to monitor when states have changed. See also dice_simulation in Rules.py + def collect(self, state: CollectionState, item: Item) -> bool: + change = super().collect(state, item) + if change: + state.prog_items[self.player]["state_is_fresh"] = 0 + + return change + + def remove(self, state: CollectionState, item: Item) -> bool: + change = super().remove(state, item) + if change: + state.prog_items[self.player]["state_is_fresh"] = 0 + + return change diff --git a/worlds/yachtdice/docs/en_Yacht Dice.md b/worlds/yachtdice/docs/en_Yacht Dice.md new file mode 100644 index 000000000000..53eefe9e9c4b --- /dev/null +++ b/worlds/yachtdice/docs/en_Yacht Dice.md @@ -0,0 +1,15 @@ +# Yacht Dice + +Welcome to Yacht Dice, the ultimate dice-rolling adventure in Archipelago! Cast your dice, chase high scores, and unlock valuable treasures. Discover new dice, extra rolls, multipliers, and special scoring categories to enhance your game. Roll your way to victory by reaching the target score! + +## Understanding Location Checks +In Yacht Dice, location checks happen when you hit certain scores for the first time. The target score for your next location check is always displayed on the website. + +## Items and Their Effects +When you receive an item, it could be extra dice, extra rolls, score multipliers, or new scoring categories. These boosts help you sail towards higher scores and more loot. Other items include extra points, lore, and fun facts to enrich your journey. + +## Winning the Game +Victory in Yacht Dice is all about reaching the target score. You can set your own target score, which is displayed on the website. Once you hit it, you've conquered the game! + +## How to Access Options +Need to tweak your game? Head over to the [player options page](../player-options) for all your configuration options and to export your config file. diff --git a/worlds/yachtdice/docs/setup_en.md b/worlds/yachtdice/docs/setup_en.md new file mode 100644 index 000000000000..ae5f92d93ea0 --- /dev/null +++ b/worlds/yachtdice/docs/setup_en.md @@ -0,0 +1,21 @@ +# Yacht Dice Randomizer Setup Guide + +## Required Software + +- A browser (you are probably using one right now!). +- Archipelago from the [Archipelago Releases Page](https://github.com/ArchipelagoMW/Archipelago/releases). + +## Playing the game +Open the Yacht Dice website. There are two options: +- Download the latest release from [Yacht Dice Releases](https://github.com/spinerak/ArchipelagoYachtDice/releases) and unzip the Website.zip. Then open player.html in your browser. +- Cruise over to the [Yacht Dice website](https://yacht-dice-ap.netlify.app/). This also works on mobile. If the website is not available, use the first option. + +Both options have an "offline" play option to try out the game without having to generate a game first. + +## Play with Archipelago + +- Create your yaml file via the [Yacht Dice Player Options Page](../player-options). +- After generating, open the Yacht Dice website. After the tutoroll, fill in the room information. +- After logging in, you are good to go. The website has a built-in client, where you can chat and send commands. + +For more information on yaml files, generating Archipelago games, and connecting to servers, please see the [Basic Multiworld Setup Guide](/tutorial/Archipelago/setup/en). From 3cdcb8c455d7f1951a4becf8bf06d2933feb3a28 Mon Sep 17 00:00:00 2001 From: Spineraks Date: Wed, 21 Aug 2024 21:40:40 +0200 Subject: [PATCH 18/60] Yacht Dice: setup: change release-link to latest (#3827) On the installation page, link to the latest release, instead of the page with all releases --- worlds/yachtdice/docs/setup_en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/yachtdice/docs/setup_en.md b/worlds/yachtdice/docs/setup_en.md index ae5f92d93ea0..c76cd398ce55 100644 --- a/worlds/yachtdice/docs/setup_en.md +++ b/worlds/yachtdice/docs/setup_en.md @@ -7,7 +7,7 @@ ## Playing the game Open the Yacht Dice website. There are two options: -- Download the latest release from [Yacht Dice Releases](https://github.com/spinerak/ArchipelagoYachtDice/releases) and unzip the Website.zip. Then open player.html in your browser. +- Download the latest release from [Yacht Dice Release](https://github.com/spinerak/ArchipelagoYachtDice/releases/latest) and unzip the Website.zip. Then open player.html in your browser. - Cruise over to the [Yacht Dice website](https://yacht-dice-ap.netlify.app/). This also works on mobile. If the website is not available, use the first option. Both options have an "offline" play option to try out the game without having to generate a game first. From e35addf5b26a380e36af425445f6b9b459ccddfb Mon Sep 17 00:00:00 2001 From: B1t Date: Thu, 22 Aug 2024 11:59:11 -0600 Subject: [PATCH 19/60] ALTTP: Minor Tweaks to the Adjuster UI (#2533) * Tweak ALTTP Adjuster padding/size to accommodate resizing - Set minsize so the actions buttons on bottom are always visible. - Added a minor amount of padding around the top level objects. - Increased the size of the entry fields for roms to match general button size. - Updated layout calls so vertical spacing doesn't increase between fields when maximizing the window - Added a little bit of spacing on the rom label so it more closely lines up with the other rom selection field * Tweak ALTTP Adjuster padding/size to accommodate resizing - Set minsize so the actions buttons on bottom are always visible. - Added a minor amount of padding around the top level objects. - Increased the size of the entry fields for roms to match general button size. - Updated layout calls so vertical spacing doesn't increase between fields when maximizing the window - Added a little bit of spacing on the rom label so it more closely lines up with the other rom selection field --- LttPAdjuster.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/LttPAdjuster.py b/LttPAdjuster.py index 9c5bd102440b..7e33a3d5efe8 100644 --- a/LttPAdjuster.py +++ b/LttPAdjuster.py @@ -14,7 +14,7 @@ from argparse import Namespace from concurrent.futures import as_completed, ThreadPoolExecutor from glob import glob -from tkinter import Tk, Frame, Label, StringVar, Entry, filedialog, messagebox, Button, Radiobutton, LEFT, X, TOP, LabelFrame, \ +from tkinter import Tk, Frame, Label, StringVar, Entry, filedialog, messagebox, Button, Radiobutton, LEFT, X, BOTH, TOP, LabelFrame, \ IntVar, Checkbutton, E, W, OptionMenu, Toplevel, BOTTOM, RIGHT, font as font, PhotoImage from tkinter.constants import DISABLED, NORMAL from urllib.parse import urlparse @@ -29,7 +29,8 @@ GAME_ALTTP = "A Link to the Past" - +WINDOW_MIN_HEIGHT = 525 +WINDOW_MIN_WIDTH = 425 class AdjusterWorld(object): def __init__(self, sprite_pool): @@ -242,16 +243,17 @@ def adjustGUI(): from argparse import Namespace from Utils import __version__ as MWVersion adjustWindow = Tk() + adjustWindow.minsize(WINDOW_MIN_WIDTH, WINDOW_MIN_HEIGHT) adjustWindow.wm_title("Archipelago %s LttP Adjuster" % MWVersion) set_icon(adjustWindow) rom_options_frame, rom_vars, set_sprite = get_rom_options_frame(adjustWindow) - bottomFrame2 = Frame(adjustWindow) + bottomFrame2 = Frame(adjustWindow, padx=8, pady=2) romFrame, romVar = get_rom_frame(adjustWindow) - romDialogFrame = Frame(adjustWindow) + romDialogFrame = Frame(adjustWindow, padx=8, pady=2) baseRomLabel2 = Label(romDialogFrame, text='Rom to adjust') romVar2 = StringVar() romEntry2 = Entry(romDialogFrame, textvariable=romVar2) @@ -261,9 +263,9 @@ def RomSelect2(): romVar2.set(rom) romSelectButton2 = Button(romDialogFrame, text='Select Rom', command=RomSelect2) - romDialogFrame.pack(side=TOP, expand=True, fill=X) - baseRomLabel2.pack(side=LEFT) - romEntry2.pack(side=LEFT, expand=True, fill=X) + romDialogFrame.pack(side=TOP, expand=False, fill=X) + baseRomLabel2.pack(side=LEFT, expand=False, fill=X, padx=(0, 8)) + romEntry2.pack(side=LEFT, expand=True, fill=BOTH, pady=1) romSelectButton2.pack(side=LEFT) def adjustRom(): @@ -331,12 +333,11 @@ def saveGUISettings(): messagebox.showinfo(title="Success", message="Settings saved to persistent storage") adjustButton = Button(bottomFrame2, text='Adjust Rom', command=adjustRom) - rom_options_frame.pack(side=TOP) + rom_options_frame.pack(side=TOP, padx=8, pady=8, fill=BOTH, expand=True) adjustButton.pack(side=LEFT, padx=(5,5)) saveButton = Button(bottomFrame2, text='Save Settings', command=saveGUISettings) saveButton.pack(side=LEFT, padx=(5,5)) - bottomFrame2.pack(side=TOP, pady=(5,5)) tkinter_center_window(adjustWindow) @@ -576,7 +577,7 @@ def hide(self): def get_rom_frame(parent=None): adjuster_settings = get_adjuster_settings(GAME_ALTTP) - romFrame = Frame(parent) + romFrame = Frame(parent, padx=8, pady=8) baseRomLabel = Label(romFrame, text='LttP Base Rom: ') romVar = StringVar(value=adjuster_settings.baserom) romEntry = Entry(romFrame, textvariable=romVar) @@ -596,20 +597,19 @@ def RomSelect(): romSelectButton = Button(romFrame, text='Select Rom', command=RomSelect) baseRomLabel.pack(side=LEFT) - romEntry.pack(side=LEFT, expand=True, fill=X) + romEntry.pack(side=LEFT, expand=True, fill=BOTH, pady=1) romSelectButton.pack(side=LEFT) - romFrame.pack(side=TOP, expand=True, fill=X) + romFrame.pack(side=TOP, fill=X) return romFrame, romVar def get_rom_options_frame(parent=None): adjuster_settings = get_adjuster_settings(GAME_ALTTP) - romOptionsFrame = LabelFrame(parent, text="Rom options") - romOptionsFrame.columnconfigure(0, weight=1) - romOptionsFrame.columnconfigure(1, weight=1) + romOptionsFrame = LabelFrame(parent, text="Rom options", padx=8, pady=8) + for i in range(5): - romOptionsFrame.rowconfigure(i, weight=1) + romOptionsFrame.rowconfigure(i, weight=0, pad=4) vars = Namespace() vars.MusicVar = IntVar() @@ -660,7 +660,7 @@ def SpriteSelect(): spriteSelectButton = Button(spriteDialogFrame, text='...', command=SpriteSelect) baseSpriteLabel.pack(side=LEFT) - spriteEntry.pack(side=LEFT) + spriteEntry.pack(side=LEFT, expand=True, fill=X) spriteSelectButton.pack(side=LEFT) oofDialogFrame = Frame(romOptionsFrame) From 31852801c9849c9f9c015030839086b3188fc6bd Mon Sep 17 00:00:00 2001 From: Kappatechy Date: Thu, 22 Aug 2024 15:35:29 -0600 Subject: [PATCH 20/60] LTTP: Fix a bug in Triforce Pieces Mode: Extra (#3784) When triforce_pieces_mode is set to "extra", the number of Triforce pieces in the pool should be equal to the number required plus the number extra. The number available was being used in this calculation, instead of the number required. --- worlds/alttp/ItemPool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/alttp/ItemPool.py b/worlds/alttp/ItemPool.py index 125475561bb2..c6c1770414db 100644 --- a/worlds/alttp/ItemPool.py +++ b/worlds/alttp/ItemPool.py @@ -682,7 +682,7 @@ def place_item(loc, item): if 'triforce_hunt' in goal: if world.triforce_pieces_mode[player].value == TriforcePiecesMode.option_extra: - treasure_hunt_total = (world.triforce_pieces_available[player].value + treasure_hunt_total = (world.triforce_pieces_required[player].value + world.triforce_pieces_extra[player].value) elif world.triforce_pieces_mode[player].value == TriforcePiecesMode.option_percentage: percentage = float(world.triforce_pieces_percentage[player].value) / 100 From f390b33c17132ef37563847496106479992111db Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Fri, 23 Aug 2024 00:23:05 +0200 Subject: [PATCH 21/60] The Witness: Ban Excluded Panels from Panel Hunt (#3818) * excluded panels should not be picked by panel hunt * ban excluded panels from panel hunt * Get rid of an unused variable --- worlds/witness/__init__.py | 2 +- worlds/witness/entity_hunt.py | 1 + worlds/witness/locations.py | 2 +- worlds/witness/player_logic.py | 5 ++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py index b228842019cf..3b599bc9e70e 100644 --- a/worlds/witness/__init__.py +++ b/worlds/witness/__init__.py @@ -90,7 +90,7 @@ def _get_slot_data(self) -> Dict[str, Any]: "laser_ids_to_hints": self.laser_ids_to_hints, "progressive_item_lists": self.player_items.get_progressive_item_ids_in_pool(), "obelisk_side_id_to_EPs": static_witness_logic.OBELISK_SIDE_ID_TO_EP_HEXES, - "precompleted_puzzles": [int(h, 16) for h in self.player_logic.EXCLUDED_LOCATIONS], + "precompleted_puzzles": [int(h, 16) for h in self.player_logic.EXCLUDED_ENTITIES], "entity_to_name": static_witness_logic.ENTITY_ID_TO_NAME, "panel_hunt_required_absolute": self.panel_hunt_required_count } diff --git a/worlds/witness/entity_hunt.py b/worlds/witness/entity_hunt.py index 29b914799fdb..34cf7d3d7f88 100644 --- a/worlds/witness/entity_hunt.py +++ b/worlds/witness/entity_hunt.py @@ -77,6 +77,7 @@ def _entity_is_eligible(self, panel_hex: str) -> bool: return ( self.player_logic.solvability_guaranteed(panel_hex) + and panel_hex not in self.player_logic.EXCLUDED_ENTITIES and not ( # Due to an edge case, Discards have to be on in disable_non_randomized even if Discard Shuffle is off. # However, I don't think they should be hunt panels in this case. diff --git a/worlds/witness/locations.py b/worlds/witness/locations.py index f1c16550399a..d095b8bed4c5 100644 --- a/worlds/witness/locations.py +++ b/worlds/witness/locations.py @@ -44,7 +44,7 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic) -> N self.CHECK_LOCATIONS = self.CHECK_LOCATIONS - { static_witness_logic.ENTITIES_BY_HEX[entity_hex]["checkName"] - for entity_hex in player_logic.COMPLETELY_DISABLED_ENTITIES | player_logic.PRECOMPLETED_LOCATIONS + for entity_hex in player_logic.COMPLETELY_DISABLED_ENTITIES } self.CHECK_PANELHEX_TO_ID = { diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py index 5125dfef0aa1..3321983dd8e7 100644 --- a/worlds/witness/player_logic.py +++ b/worlds/witness/player_logic.py @@ -108,8 +108,7 @@ def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_in self.EVENT_ITEM_PAIRS: Dict[str, Tuple[str, str]] = {} self.COMPLETELY_DISABLED_ENTITIES: Set[str] = set() self.DISABLE_EVERYTHING_BEHIND: Set[str] = set() - self.PRECOMPLETED_LOCATIONS: Set[str] = set() - self.EXCLUDED_LOCATIONS: Set[str] = set() + self.EXCLUDED_ENTITIES: Set[str] = set() self.ADDED_CHECKS: Set[str] = set() self.VICTORY_LOCATION = "0x0356B" @@ -659,7 +658,7 @@ def make_options_adjustments(self, world: "WitnessWorld") -> None: self.COMPLETELY_DISABLED_ENTITIES.add(loc_obj["entity_hex"]) elif loc_obj["entityType"] == "Panel": - self.EXCLUDED_LOCATIONS.add(loc_obj["entity_hex"]) + self.EXCLUDED_ENTITIES.add(loc_obj["entity_hex"]) for adjustment_lineset in adjustment_linesets_in_order: current_adjustment_type = None From 74aab81f79bc0c2e0356efbcf1ad7b4211b23ce8 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Fri, 23 Aug 2024 00:23:22 +0200 Subject: [PATCH 22/60] Purge the world: multiworld evil from osrs (#3751) --- worlds/osrs/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worlds/osrs/__init__.py b/worlds/osrs/__init__.py index d74dc7cfd9c2..1b7ca9c1e0f4 100644 --- a/worlds/osrs/__init__.py +++ b/worlds/osrs/__init__.py @@ -56,8 +56,8 @@ class OSRSWorld(World): locations_by_category: typing.Dict[str, typing.List[LocationRow]] - def __init__(self, world: MultiWorld, player: int): - super().__init__(world, player) + def __init__(self, multiworld: MultiWorld, player: int): + super().__init__(multiworld, player) self.region_name_to_data = {} self.location_name_to_data = {} From 64b654d42ec016c4e94b81842f3b6bac73f54740 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Fri, 23 Aug 2024 01:15:05 +0200 Subject: [PATCH 23/60] Core, some worlds: Rename sweep_for_events to sweep_for_advancements (#3571) * Rename sweep_for_events to sweep_for_advancements * more event->advancement renames * oops accidentally deleted the deprecation thing in the force push * Update TestDungeon.py * Update BaseClasses.py * Update BaseClasses.py * oops * utils.deprecate * treble, you had no idea how right you were * Update test_panel_hunt.py * Update BaseClasses.py Co-authored-by: Fabian Dill --------- Co-authored-by: Fabian Dill --- BaseClasses.py | 37 +++++++++++++---------- Fill.py | 14 ++++----- test/bases.py | 6 ++-- test/general/test_fill.py | 6 ++-- worlds/alttp/Dungeons.py | 6 ++-- worlds/alttp/test/dungeons/TestDungeon.py | 4 +-- worlds/lingo/__init__.py | 2 +- worlds/oot/EntranceShuffle.py | 6 ++-- worlds/oot/Rules.py | 2 +- worlds/oot/__init__.py | 6 ++-- worlds/pokemon_rb/__init__.py | 2 +- worlds/pokemon_rb/regions.py | 4 +-- worlds/witness/__init__.py | 2 +- worlds/witness/test/test_panel_hunt.py | 4 +-- 14 files changed, 53 insertions(+), 48 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 1188e72261f6..61f3f8f67c88 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -430,7 +430,7 @@ def get_all_state(self, use_cache: bool) -> CollectionState: subworld = self.worlds[player] for item in subworld.get_pre_fill_items(): subworld.collect(ret, item) - ret.sweep_for_events() + ret.sweep_for_advancements() if use_cache: self._all_state = ret @@ -661,7 +661,7 @@ class CollectionState(): multiworld: MultiWorld reachable_regions: Dict[int, Set[Region]] blocked_connections: Dict[int, Set[Entrance]] - events: Set[Location] + advancements: Set[Location] path: Dict[Union[Region, Entrance], PathValue] locations_checked: Set[Location] stale: Dict[int, bool] @@ -673,7 +673,7 @@ def __init__(self, parent: MultiWorld): self.multiworld = parent self.reachable_regions = {player: set() for player in parent.get_all_ids()} self.blocked_connections = {player: set() for player in parent.get_all_ids()} - self.events = set() + self.advancements = set() self.path = {} self.locations_checked = set() self.stale = {player: True for player in parent.get_all_ids()} @@ -722,7 +722,7 @@ def copy(self) -> CollectionState: self.reachable_regions.items()} ret.blocked_connections = {player: entrance_set.copy() for player, entrance_set in self.blocked_connections.items()} - ret.events = self.events.copy() + ret.advancements = self.advancements.copy() ret.path = self.path.copy() ret.locations_checked = self.locations_checked.copy() for function in self.additional_copy_functions: @@ -755,19 +755,24 @@ def can_reach_region(self, spot: str, player: int) -> bool: return self.multiworld.get_region(spot, player).can_reach(self) def sweep_for_events(self, locations: Optional[Iterable[Location]] = None) -> None: + Utils.deprecate("sweep_for_events has been renamed to sweep_for_advancements. The functionality is the same. " + "Please switch over to sweep_for_advancements.") + return self.sweep_for_advancements(locations) + + def sweep_for_advancements(self, locations: Optional[Iterable[Location]] = None) -> None: if locations is None: locations = self.multiworld.get_filled_locations() - reachable_events = True - # since the loop has a good chance to run more than once, only filter the events once - locations = {location for location in locations if location.advancement and location not in self.events} - - while reachable_events: - reachable_events = {location for location in locations if location.can_reach(self)} - locations -= reachable_events - for event in reachable_events: - self.events.add(event) - assert isinstance(event.item, Item), "tried to collect Event with no Item" - self.collect(event.item, True, event) + reachable_advancements = True + # since the loop has a good chance to run more than once, only filter the advancements once + locations = {location for location in locations if location.advancement and location not in self.advancements} + + while reachable_advancements: + reachable_advancements = {location for location in locations if location.can_reach(self)} + locations -= reachable_advancements + for advancement in reachable_advancements: + self.advancements.add(advancement) + assert isinstance(advancement.item, Item), "tried to collect Event with no Item" + self.collect(advancement.item, True, advancement) # item name related def has(self, item: str, player: int, count: int = 1) -> bool: @@ -871,7 +876,7 @@ def collect(self, item: Item, prevent_sweep: bool = False, location: Optional[Lo self.stale[item.player] = True if changed and not prevent_sweep: - self.sweep_for_events() + self.sweep_for_advancements() return changed diff --git a/Fill.py b/Fill.py index 15d5842e2904..e2fcff00358e 100644 --- a/Fill.py +++ b/Fill.py @@ -29,7 +29,7 @@ def sweep_from_pool(base_state: CollectionState, itempool: typing.Sequence[Item] new_state = base_state.copy() for item in itempool: new_state.collect(item, True) - new_state.sweep_for_events(locations=locations) + new_state.sweep_for_advancements(locations=locations) return new_state @@ -329,8 +329,8 @@ def accessibility_corrections(multiworld: MultiWorld, state: CollectionState, lo pool.append(location.item) state.remove(location.item) location.item = None - if location in state.events: - state.events.remove(location) + if location in state.advancements: + state.advancements.remove(location) locations.append(location) if pool and locations: locations.sort(key=lambda loc: loc.progress_type != LocationProgressType.PRIORITY) @@ -363,7 +363,7 @@ def distribute_early_items(multiworld: MultiWorld, early_priority_locations: typing.List[Location] = [] loc_indexes_to_remove: typing.Set[int] = set() base_state = multiworld.state.copy() - base_state.sweep_for_events(locations=(loc for loc in multiworld.get_filled_locations() if loc.address is None)) + base_state.sweep_for_advancements(locations=(loc for loc in multiworld.get_filled_locations() if loc.address is None)) for i, loc in enumerate(fill_locations): if loc.can_reach(base_state): if loc.progress_type == LocationProgressType.PRIORITY: @@ -558,7 +558,7 @@ def flood_items(multiworld: MultiWorld) -> None: progress_done = False # sweep once to pick up preplaced items - multiworld.state.sweep_for_events() + multiworld.state.sweep_for_advancements() # fill multiworld from top of itempool while we can while not progress_done: @@ -746,7 +746,7 @@ def item_percentage(player: int, num: int) -> float: ), items_to_test): reducing_state.collect(location.item, True, location) - reducing_state.sweep_for_events(locations=locations_to_test) + reducing_state.sweep_for_advancements(locations=locations_to_test) if multiworld.has_beaten_game(balancing_state): if not multiworld.has_beaten_game(reducing_state): @@ -829,7 +829,7 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None: warn(warning, force) swept_state = multiworld.state.copy() - swept_state.sweep_for_events() + swept_state.sweep_for_advancements() reachable = frozenset(multiworld.get_reachable_locations(swept_state)) early_locations: typing.Dict[int, typing.List[str]] = collections.defaultdict(list) non_early_locations: typing.Dict[int, typing.List[str]] = collections.defaultdict(list) diff --git a/test/bases.py b/test/bases.py index 83461b158f4f..a3ea233174dd 100644 --- a/test/bases.py +++ b/test/bases.py @@ -24,7 +24,7 @@ def get_state(self, items): for item in items: item.classification = ItemClassification.progression state.collect(item, prevent_sweep=True) - state.sweep_for_events() + state.sweep_for_advancements() state.update_reachable_regions(1) self._state_cache[self.multiworld, tuple(items)] = state return state @@ -221,8 +221,8 @@ def remove(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None: if isinstance(items, Item): items = (items,) for item in items: - if item.location and item.advancement and item.location in self.multiworld.state.events: - self.multiworld.state.events.remove(item.location) + if item.location and item.advancement and item.location in self.multiworld.state.advancements: + self.multiworld.state.advancements.remove(item.location) self.multiworld.state.remove(item) def can_reach_location(self, location: str) -> bool: diff --git a/test/general/test_fill.py b/test/general/test_fill.py index db24b706918c..2dba147aca84 100644 --- a/test/general/test_fill.py +++ b/test/general/test_fill.py @@ -192,7 +192,7 @@ def test_minimal_mixed_fill(self): location_pool = player1.locations[1:] + player2.locations item_pool = player1.prog_items[:-1] + player2.prog_items fill_restrictive(multiworld, multiworld.state, location_pool, item_pool) - multiworld.state.sweep_for_events() # collect everything + multiworld.state.sweep_for_advancements() # collect everything # all of player2's locations and items should be accessible (not all of player1's) for item in player2.prog_items: @@ -443,8 +443,8 @@ def test_double_sweep(self): item = player1.prog_items[0] item.code = None location.place_locked_item(item) - multiworld.state.sweep_for_events() - multiworld.state.sweep_for_events() + multiworld.state.sweep_for_advancements() + multiworld.state.sweep_for_advancements() self.assertTrue(multiworld.state.prog_items[item.player][item.name], "Sweep did not collect - Test flawed") self.assertEqual(multiworld.state.prog_items[item.player][item.name], 1, "Sweep collected multiple times") diff --git a/worlds/alttp/Dungeons.py b/worlds/alttp/Dungeons.py index 150d52cc6c58..8405fc4480a1 100644 --- a/worlds/alttp/Dungeons.py +++ b/worlds/alttp/Dungeons.py @@ -248,7 +248,7 @@ def fill_dungeons_restrictive(multiworld: MultiWorld): pass for item in pre_fill_items: multiworld.worlds[item.player].collect(all_state_base, item) - all_state_base.sweep_for_events() + all_state_base.sweep_for_advancements() # Remove completion condition so that minimal-accessibility worlds place keys properly for player in {item.player for item in in_dungeon_items}: @@ -262,8 +262,8 @@ def fill_dungeons_restrictive(multiworld: MultiWorld): all_state_base.remove(item_factory(key_data[3], multiworld.worlds[player])) loc = multiworld.get_location(key_loc, player) - if loc in all_state_base.events: - all_state_base.events.remove(loc) + if loc in all_state_base.advancements: + all_state_base.advancements.remove(loc) fill_restrictive(multiworld, all_state_base, locations, in_dungeon_items, lock=True, allow_excluded=True, name="LttP Dungeon Items") diff --git a/worlds/alttp/test/dungeons/TestDungeon.py b/worlds/alttp/test/dungeons/TestDungeon.py index 796bfeec3f0e..5ab1b23065f2 100644 --- a/worlds/alttp/test/dungeons/TestDungeon.py +++ b/worlds/alttp/test/dungeons/TestDungeon.py @@ -54,7 +54,7 @@ def run_tests(self, access_pool): for item in items: item.classification = ItemClassification.progression - state.collect(item, prevent_sweep=True) # prevent_sweep=True prevents running sweep_for_events() and picking up - state.sweep_for_events() # key drop keys repeatedly + state.collect(item, prevent_sweep=True) # prevent_sweep=True prevents running sweep_for_advancements() and picking up + state.sweep_for_advancements() # key drop keys repeatedly self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), access, f"failed {self.multiworld.get_location(location, 1)} with: {item_pool}") diff --git a/worlds/lingo/__init__.py b/worlds/lingo/__init__.py index 9853be73fa9b..2a61a71f5fce 100644 --- a/worlds/lingo/__init__.py +++ b/worlds/lingo/__init__.py @@ -85,7 +85,7 @@ def create_regions(self): state.collect(self.create_item(self.player_logic.forced_good_item), True) all_locations = self.multiworld.get_locations(self.player) - state.sweep_for_events(locations=all_locations) + state.sweep_for_advancements(locations=all_locations) unreachable_locations = [location for location in all_locations if not state.can_reach_location(location.name, self.player)] diff --git a/worlds/oot/EntranceShuffle.py b/worlds/oot/EntranceShuffle.py index 058fdbed0011..cda442ffb109 100644 --- a/worlds/oot/EntranceShuffle.py +++ b/worlds/oot/EntranceShuffle.py @@ -445,7 +445,7 @@ def shuffle_random_entrances(ootworld): # Gather locations to keep reachable for validation all_state = ootworld.get_state_with_complete_itempool() - all_state.sweep_for_events(locations=ootworld.get_locations()) + all_state.sweep_for_advancements(locations=ootworld.get_locations()) locations_to_ensure_reachable = {loc for loc in world.get_reachable_locations(all_state, player) if not (loc.type == 'Drop' or (loc.type == 'Event' and 'Subrule' in loc.name))} # Set entrance data for all entrances @@ -791,8 +791,8 @@ def validate_world(ootworld, entrance_placed, locations_to_ensure_reachable, all all_state = all_state_orig.copy() none_state = none_state_orig.copy() - all_state.sweep_for_events(locations=ootworld.get_locations()) - none_state.sweep_for_events(locations=ootworld.get_locations()) + all_state.sweep_for_advancements(locations=ootworld.get_locations()) + none_state.sweep_for_advancements(locations=ootworld.get_locations()) if ootworld.shuffle_interior_entrances or ootworld.shuffle_overworld_entrances or ootworld.spawn_positions: time_travel_state = none_state.copy() diff --git a/worlds/oot/Rules.py b/worlds/oot/Rules.py index 529411f6fc2c..4bbf15435cfe 100644 --- a/worlds/oot/Rules.py +++ b/worlds/oot/Rules.py @@ -228,7 +228,7 @@ def set_shop_rules(ootworld): def set_entrances_based_rules(ootworld): all_state = ootworld.get_state_with_complete_itempool() - all_state.sweep_for_events(locations=ootworld.get_locations()) + all_state.sweep_for_advancements(locations=ootworld.get_locations()) for location in filter(lambda location: location.type == 'Shop', ootworld.get_locations()): # If a shop is not reachable as adult, it can't have Goron Tunic or Zora Tunic as child can't buy these diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py index 24be303f822b..ee78958b2dbe 100644 --- a/worlds/oot/__init__.py +++ b/worlds/oot/__init__.py @@ -847,7 +847,7 @@ def generate_basic(self): # mostly killing locations that shouldn't exist by se # Make sure to only kill actual internal events, not in-game "events" all_state = self.get_state_with_complete_itempool() all_locations = self.get_locations() - all_state.sweep_for_events(locations=all_locations) + all_state.sweep_for_advancements(locations=all_locations) reachable = self.multiworld.get_reachable_locations(all_state, self.player) unreachable = [loc for loc in all_locations if (loc.internal or loc.type == 'Drop') and loc.address is None and loc.locked and loc not in reachable] @@ -875,7 +875,7 @@ def prefill_state(base_state): state = base_state.copy() for item in self.get_pre_fill_items(): self.collect(state, item) - state.sweep_for_events(locations=self.get_locations()) + state.sweep_for_advancements(locations=self.get_locations()) return state # Prefill shops, songs, and dungeon items @@ -887,7 +887,7 @@ def prefill_state(base_state): state = CollectionState(self.multiworld) for item in self.itempool: self.collect(state, item) - state.sweep_for_events(locations=self.get_locations()) + state.sweep_for_advancements(locations=self.get_locations()) # Place dungeon items special_fill_types = ['GanonBossKey', 'BossKey', 'SmallKey', 'HideoutSmallKey', 'Map', 'Compass'] diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py index 277d73b2258b..c1d843189820 100644 --- a/worlds/pokemon_rb/__init__.py +++ b/worlds/pokemon_rb/__init__.py @@ -296,7 +296,7 @@ def fill_hook(self, progitempool, usefulitempool, filleritempool, fill_locations if attempt > 1: for mon in poke_data.pokemon_data.keys(): state.collect(self.create_item(mon), True) - state.sweep_for_events() + state.sweep_for_advancements() self.multiworld.random.shuffle(badges) self.multiworld.random.shuffle(badgelocs) badgelocs_copy = badgelocs.copy() diff --git a/worlds/pokemon_rb/regions.py b/worlds/pokemon_rb/regions.py index a9206fe66753..938c39b32090 100644 --- a/worlds/pokemon_rb/regions.py +++ b/worlds/pokemon_rb/regions.py @@ -2439,7 +2439,7 @@ def adds_reachable_entrances(item): state_copy = state.copy() state_copy.collect(item, True) - state.sweep_for_events(locations=event_locations) + state.sweep_for_advancements(locations=event_locations) new_reachable_entrances = len([entrance for entrance in entrances if entrance in reachable_entrances or entrance.parent_region.can_reach(state_copy)]) return new_reachable_entrances > len(reachable_entrances) @@ -2480,7 +2480,7 @@ def dead_end(e): while entrances: state.update_reachable_regions(player) - state.sweep_for_events(locations=event_locations) + state.sweep_for_advancements(locations=event_locations) multiworld.random.shuffle(entrances) diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py index 3b599bc9e70e..02d11373b250 100644 --- a/worlds/witness/__init__.py +++ b/worlds/witness/__init__.py @@ -219,7 +219,7 @@ def create_regions(self) -> None: # Only sweeps for events because having this behavior be random based on Tutorial Gate would be strange. state = CollectionState(self.multiworld) - state.sweep_for_events(locations=event_locations) + state.sweep_for_advancements(locations=event_locations) num_early_locs = sum(1 for loc in self.multiworld.get_reachable_locations(state, self.player) if loc.address) diff --git a/worlds/witness/test/test_panel_hunt.py b/worlds/witness/test/test_panel_hunt.py index 2fc16f787e67..af6855dc696e 100644 --- a/worlds/witness/test/test_panel_hunt.py +++ b/worlds/witness/test/test_panel_hunt.py @@ -23,7 +23,7 @@ def test_correct_panels_were_picked(self): for _ in range(100): state_100.collect(panel_hunt_item, True) - state_100.sweep_for_events([self.world.get_location("Tutorial Gate Open Solved")]) + state_100.sweep_for_advancements([self.world.get_location("Tutorial Gate Open Solved")]) self.assertTrue(self.multiworld.completion_condition[self.player](state_100)) @@ -33,7 +33,7 @@ def test_correct_panels_were_picked(self): for _ in range(99): state_99.collect(panel_hunt_item, True) - state_99.sweep_for_events([self.world.get_location("Tutorial Gate Open Solved")]) + state_99.sweep_for_advancements([self.world.get_location("Tutorial Gate Open Solved")]) self.assertFalse(self.multiworld.completion_condition[self.player](state_99)) From 43cb9611fb28a02f594ed2170281043285ae8101 Mon Sep 17 00:00:00 2001 From: Doug Hoskisson Date: Fri, 23 Aug 2024 17:05:30 -0700 Subject: [PATCH 24/60] Core: some typing and cleaning in `BaseClasses.py` (#3391) * Core: some typing and cleaning in `BaseClasses.py` * more backwards `__repr__` * double-quote string * remove some end-of-line whitespace --- BaseClasses.py | 91 +++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 61f3f8f67c88..29264f34ab0f 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -11,8 +11,10 @@ from collections import Counter, deque from collections.abc import Collection, MutableSequence from enum import IntEnum, IntFlag -from typing import Any, Callable, Dict, Iterable, Iterator, List, Mapping, NamedTuple, Optional, Set, Tuple, \ - TypedDict, Union, Type, ClassVar +from typing import (AbstractSet, Any, Callable, ClassVar, Dict, Iterable, Iterator, List, Mapping, NamedTuple, + Optional, Protocol, Set, Tuple, Union, Type) + +from typing_extensions import NotRequired, TypedDict import NetUtils import Options @@ -22,16 +24,16 @@ from worlds import AutoWorld -class Group(TypedDict, total=False): +class Group(TypedDict): name: str game: str world: "AutoWorld.World" - players: Set[int] - item_pool: Set[str] - replacement_items: Dict[int, Optional[str]] - local_items: Set[str] - non_local_items: Set[str] - link_replacement: bool + players: AbstractSet[int] + item_pool: NotRequired[Set[str]] + replacement_items: NotRequired[Dict[int, Optional[str]]] + local_items: NotRequired[Set[str]] + non_local_items: NotRequired[Set[str]] + link_replacement: NotRequired[bool] class ThreadBarrierProxy: @@ -48,6 +50,11 @@ def __getattr__(self, name: str) -> Any: "Please use multiworld.per_slot_randoms[player] or randomize ahead of output.") +class HasNameAndPlayer(Protocol): + name: str + player: int + + class MultiWorld(): debug_types = False player_name: Dict[int, str] @@ -156,7 +163,7 @@ def __init__(self, players: int): self.start_inventory_from_pool: Dict[int, Options.StartInventoryPool] = {} for player in range(1, players + 1): - def set_player_attr(attr, val): + def set_player_attr(attr: str, val) -> None: self.__dict__.setdefault(attr, {})[player] = val set_player_attr('plando_items', []) set_player_attr('plando_texts', {}) @@ -165,13 +172,13 @@ def set_player_attr(attr, val): set_player_attr('completion_condition', lambda state: True) self.worlds = {} self.per_slot_randoms = Utils.DeprecateDict("Using per_slot_randoms is now deprecated. Please use the " - "world's random object instead (usually self.random)") + "world's random object instead (usually self.random)") self.plando_options = PlandoOptions.none def get_all_ids(self) -> Tuple[int, ...]: return self.player_ids + tuple(self.groups) - def add_group(self, name: str, game: str, players: Set[int] = frozenset()) -> Tuple[int, Group]: + def add_group(self, name: str, game: str, players: AbstractSet[int] = frozenset()) -> Tuple[int, Group]: """Create a group with name and return the assigned player ID and group. If a group of this name already exists, the set of players is extended instead of creating a new one.""" from worlds import AutoWorld @@ -195,7 +202,7 @@ def add_group(self, name: str, game: str, players: Set[int] = frozenset()) -> Tu return new_id, new_group - def get_player_groups(self, player) -> Set[int]: + def get_player_groups(self, player: int) -> Set[int]: return {group_id for group_id, group in self.groups.items() if player in group["players"]} def set_seed(self, seed: Optional[int] = None, secure: bool = False, name: Optional[str] = None): @@ -258,7 +265,7 @@ def set_item_links(self): "link_replacement": replacement_prio.index(item_link["link_replacement"]), } - for name, item_link in item_links.items(): + for _name, item_link in item_links.items(): current_item_name_groups = AutoWorld.AutoWorldRegister.world_types[item_link["game"]].item_name_groups pool = set() local_items = set() @@ -388,7 +395,7 @@ def get_game_worlds(self, game_name: str): return tuple(world for player, world in self.worlds.items() if player not in self.groups and self.game[player] == game_name) - def get_name_string_for_object(self, obj) -> str: + def get_name_string_for_object(self, obj: HasNameAndPlayer) -> str: return obj.name if self.players == 1 else f'{obj.name} ({self.get_player_name(obj.player)})' def get_player_name(self, player: int) -> str: @@ -439,7 +446,7 @@ def get_all_state(self, use_cache: bool) -> CollectionState: def get_items(self) -> List[Item]: return [loc.item for loc in self.get_filled_locations()] + self.itempool - def find_item_locations(self, item, player: int, resolve_group_locations: bool = False) -> List[Location]: + def find_item_locations(self, item: str, player: int, resolve_group_locations: bool = False) -> List[Location]: if resolve_group_locations: player_groups = self.get_player_groups(player) return [location for location in self.get_locations() if @@ -448,7 +455,7 @@ def find_item_locations(self, item, player: int, resolve_group_locations: bool = return [location for location in self.get_locations() if location.item and location.item.name == item and location.item.player == player] - def find_item(self, item, player: int) -> Location: + def find_item(self, item: str, player: int) -> Location: return next(location for location in self.get_locations() if location.item and location.item.name == item and location.item.player == player) @@ -806,7 +813,7 @@ def has_from_list(self, items: Iterable[str], player: int, count: int) -> bool: if found >= count: return True return False - + def has_from_list_unique(self, items: Iterable[str], player: int, count: int) -> bool: """Returns True if the state contains at least `count` items matching any of the item names from a list. Ignores duplicates of the same item.""" @@ -821,7 +828,7 @@ def has_from_list_unique(self, items: Iterable[str], player: int, count: int) -> def count_from_list(self, items: Iterable[str], player: int) -> int: """Returns the cumulative count of items from a list present in state.""" return sum(self.prog_items[player][item_name] for item_name in items) - + def count_from_list_unique(self, items: Iterable[str], player: int) -> int: """Returns the cumulative count of items from a list present in state. Ignores duplicates of the same item.""" return sum(self.prog_items[player][item_name] > 0 for item_name in items) @@ -900,7 +907,7 @@ class Entrance: addresses = None target = None - def __init__(self, player: int, name: str = '', parent: Region = None): + def __init__(self, player: int, name: str = "", parent: Optional[Region] = None) -> None: self.name = name self.parent_region = parent self.player = player @@ -920,9 +927,6 @@ def connect(self, region: Region, addresses: Any = None, target: Any = None) -> region.entrances.append(self) def __repr__(self): - return self.__str__() - - def __str__(self): multiworld = self.parent_region.multiworld if self.parent_region else None return multiworld.get_name_string_for_object(self) if multiworld else f'{self.name} (Player {self.player})' @@ -1048,7 +1052,7 @@ def add_locations(self, locations: Dict[str, Optional[int]], self.locations.append(location_type(self.player, location, address, self)) def connect(self, connecting_region: Region, name: Optional[str] = None, - rule: Optional[Callable[[CollectionState], bool]] = None) -> entrance_type: + rule: Optional[Callable[[CollectionState], bool]] = None) -> Entrance: """ Connects this Region to another Region, placing the provided rule on the connection. @@ -1088,9 +1092,6 @@ def add_exits(self, exits: Union[Iterable[str], Dict[str, Optional[str]]], rules[connecting_region] if rules and connecting_region in rules else None) def __repr__(self): - return self.__str__() - - def __str__(self): return self.multiworld.get_name_string_for_object(self) if self.multiworld else f'{self.name} (Player {self.player})' @@ -1109,9 +1110,9 @@ class Location: locked: bool = False show_in_spoiler: bool = True progress_type: LocationProgressType = LocationProgressType.DEFAULT - always_allow = staticmethod(lambda state, item: False) + always_allow: Callable[[CollectionState, Item], bool] = staticmethod(lambda state, item: False) access_rule: Callable[[CollectionState], bool] = staticmethod(lambda state: True) - item_rule = staticmethod(lambda item: True) + item_rule: Callable[[Item], bool] = staticmethod(lambda item: True) item: Optional[Item] = None def __init__(self, player: int, name: str = '', address: Optional[int] = None, parent: Optional[Region] = None): @@ -1120,11 +1121,15 @@ def __init__(self, player: int, name: str = '', address: Optional[int] = None, p self.address = address self.parent_region = parent - def can_fill(self, state: CollectionState, item: Item, check_access=True) -> bool: - return ((self.always_allow(state, item) and item.name not in state.multiworld.worlds[item.player].options.non_local_items) - or ((self.progress_type != LocationProgressType.EXCLUDED or not (item.advancement or item.useful)) - and self.item_rule(item) - and (not check_access or self.can_reach(state)))) + def can_fill(self, state: CollectionState, item: Item, check_access: bool = True) -> bool: + return (( + self.always_allow(state, item) + and item.name not in state.multiworld.worlds[item.player].options.non_local_items + ) or ( + (self.progress_type != LocationProgressType.EXCLUDED or not (item.advancement or item.useful)) + and self.item_rule(item) + and (not check_access or self.can_reach(state)) + )) def can_reach(self, state: CollectionState) -> bool: # Region.can_reach is just a cache lookup, so placing it first for faster abort on average @@ -1139,9 +1144,6 @@ def place_locked_item(self, item: Item): self.locked = True def __repr__(self): - return self.__str__() - - def __str__(self): multiworld = self.parent_region.multiworld if self.parent_region and self.parent_region.multiworld else None return multiworld.get_name_string_for_object(self) if multiworld else f'{self.name} (Player {self.player})' @@ -1163,7 +1165,7 @@ def is_event(self) -> bool: @property def native_item(self) -> bool: """Returns True if the item in this location matches game.""" - return self.item and self.item.game == self.game + return self.item is not None and self.item.game == self.game @property def hint_text(self) -> str: @@ -1246,9 +1248,6 @@ def __hash__(self) -> int: return hash((self.name, self.player)) def __repr__(self) -> str: - return self.__str__() - - def __str__(self) -> str: if self.location and self.location.parent_region and self.location.parent_region.multiworld: return self.location.parent_region.multiworld.get_name_string_for_object(self) return f"{self.name} (Player {self.player})" @@ -1326,9 +1325,9 @@ def create_playthrough(self, create_paths: bool = True) -> None: # in the second phase, we cull each sphere such that the game is still beatable, # reducing each range of influence to the bare minimum required inside it - restore_later = {} + restore_later: Dict[Location, Item] = {} for num, sphere in reversed(tuple(enumerate(collection_spheres))): - to_delete = set() + to_delete: Set[Location] = set() for location in sphere: # we remove the item at location and check if game is still beatable logging.debug('Checking if %s (Player %d) is required to beat the game.', location.item.name, @@ -1346,7 +1345,7 @@ def create_playthrough(self, create_paths: bool = True) -> None: sphere -= to_delete # second phase, sphere 0 - removed_precollected = [] + removed_precollected: List[Item] = [] for item in (i for i in chain.from_iterable(multiworld.precollected_items.values()) if i.advancement): logging.debug('Checking if %s (Player %d) is required to beat the game.', item.name, item.player) multiworld.precollected_items[item.player].remove(item) @@ -1499,9 +1498,9 @@ def write_option(option_key: str, option_obj: Options.AssembleOptions) -> None: if self.paths: outfile.write('\n\nPaths:\n\n') - path_listings = [] + path_listings: List[str] = [] for location, path in sorted(self.paths.items()): - path_lines = [] + path_lines: List[str] = [] for region, exit in path: if exit is not None: path_lines.append("{} -> {}".format(region, exit)) From 56dbba6a31a8be06d698155c3ef2d419c5b8388c Mon Sep 17 00:00:00 2001 From: PoryGone <98504756+PoryGone@users.noreply.github.com> Date: Fri, 23 Aug 2024 20:05:42 -0400 Subject: [PATCH 25/60] Celeste 64: Typo #3840 oops --- worlds/celeste64/docs/guide_en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/celeste64/docs/guide_en.md b/worlds/celeste64/docs/guide_en.md index 24fea92e3528..74ab94b913d1 100644 --- a/worlds/celeste64/docs/guide_en.md +++ b/worlds/celeste64/docs/guide_en.md @@ -28,7 +28,7 @@ An Example `AP.json` file: ``` { - "Url": "archipelago:12345", + "Url": "archipelago.gg:12345", "SlotName": "Maddy", "Password": "" } From 6efa065867332fc7fa91d3cc4add38c9fff96231 Mon Sep 17 00:00:00 2001 From: gaithern <36639398+gaithern@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:06:08 -0500 Subject: [PATCH 26/60] Kingdom Hearts: Make Ceiling Division Human-Readable #3839 --- worlds/kh1/Rules.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worlds/kh1/Rules.py b/worlds/kh1/Rules.py index c8cb71ffd636..e1f72f5b3e54 100644 --- a/worlds/kh1/Rules.py +++ b/worlds/kh1/Rules.py @@ -1,5 +1,6 @@ from BaseClasses import CollectionState from worlds.generic.Rules import add_rule +from math import ceil SINGLE_PUPPIES = ["Puppy " + str(i).rjust(2,"0") for i in range(1,100)] TRIPLE_PUPPIES = ["Puppies " + str(3*(i-1)+1).rjust(2, "0") + "-" + str(3*(i-1)+3).rjust(2, "0") for i in range(1,34)] @@ -28,7 +29,7 @@ def has_puppies_all(state: CollectionState, player: int, puppies_required: int) return state.has("All Puppies", player) def has_puppies_triplets(state: CollectionState, player: int, puppies_required: int) -> bool: - return state.has_from_list_unique(TRIPLE_PUPPIES, player, -(puppies_required / -3)) + return state.has_from_list_unique(TRIPLE_PUPPIES, player, ceil(puppies_required / 3)) def has_puppies_individual(state: CollectionState, player: int, puppies_required: int) -> bool: return state.has_from_list_unique(SINGLE_PUPPIES, player, puppies_required) From e61d521ba8df5a1dfd1dda44a4e7c7e9989865a9 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Sat, 24 Aug 2024 02:08:04 +0200 Subject: [PATCH 27/60] The Witness: Shuffle Dog (#3425) * Town Pet the Dog * Add shuffle dog to options presets * I cri evritim * I guess it's as good a time as any * :( * fix the soft conflict * add all the shuffle dog options to some of the unit tests bc why not * Laser Panels are just 'General' now, I'm pretty sure * Could I really call it allsanity? --- worlds/witness/__init__.py | 20 +++++++++++-------- worlds/witness/data/static_locations.py | 2 ++ worlds/witness/data/static_logic.py | 3 +++ worlds/witness/locations.py | 6 +----- worlds/witness/options.py | 14 +++++++++++-- worlds/witness/player_items.py | 2 +- worlds/witness/player_logic.py | 5 ++++- worlds/witness/presets.py | 6 ++++++ .../witness/test/test_roll_other_options.py | 3 +++ 9 files changed, 44 insertions(+), 17 deletions(-) diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py index 02d11373b250..33c63eddbed3 100644 --- a/worlds/witness/__init__.py +++ b/worlds/witness/__init__.py @@ -189,12 +189,13 @@ def create_regions(self) -> None: event_locations.append(location_obj) # Place other locked items - dog_puzzle_skip = self.create_item("Puzzle Skip") - self.get_location("Town Pet the Dog").place_locked_item(dog_puzzle_skip) - self.own_itempool.append(dog_puzzle_skip) + if self.options.shuffle_dog == "puzzle_skip": + dog_puzzle_skip = self.create_item("Puzzle Skip") + self.get_location("Town Pet the Dog").place_locked_item(dog_puzzle_skip) - self.items_placed_early.append("Puzzle Skip") + self.own_itempool.append(dog_puzzle_skip) + self.items_placed_early.append("Puzzle Skip") if self.options.early_symbol_item: # Pick an early item to place on the tutorial gate. @@ -213,7 +214,7 @@ def create_regions(self) -> None: self.own_itempool.append(gate_item) self.items_placed_early.append(random_early_item) - # There are some really restrictive settings in The Witness. + # There are some really restrictive options in The Witness. # They are rarely played, but when they are, we add some extra sphere 1 locations. # This is done both to prevent generation failures, but also to make the early game less linear. # Only sweeps for events because having this behavior be random based on Tutorial Gate would be strange. @@ -221,11 +222,14 @@ def create_regions(self) -> None: state = CollectionState(self.multiworld) state.sweep_for_advancements(locations=event_locations) - num_early_locs = sum(1 for loc in self.multiworld.get_reachable_locations(state, self.player) if loc.address) + num_early_locs = sum( + 1 for loc in self.multiworld.get_reachable_locations(state, self.player) + if loc.address and not loc.item + ) - # Adjust the needed size for sphere 1 based on how restrictive the settings are in terms of items + # Adjust the needed size for sphere 1 based on how restrictive the options are in terms of items - needed_size = 3 + needed_size = 2 needed_size += self.options.puzzle_randomization == "sigma_expert" needed_size += self.options.shuffle_symbols needed_size += self.options.shuffle_doors > 0 diff --git a/worlds/witness/data/static_locations.py b/worlds/witness/data/static_locations.py index d9566080a04c..5c5ad554ddab 100644 --- a/worlds/witness/data/static_locations.py +++ b/worlds/witness/data/static_locations.py @@ -104,6 +104,8 @@ "Town RGB House Upstairs Right", "Town RGB House Sound Room Right", + "Town Pet the Dog", + "Windmill Theater Entry Panel", "Theater Exit Left Panel", "Theater Exit Right Panel", diff --git a/worlds/witness/data/static_logic.py b/worlds/witness/data/static_logic.py index b61b0f9d2f92..87e1015257c7 100644 --- a/worlds/witness/data/static_logic.py +++ b/worlds/witness/data/static_logic.py @@ -147,6 +147,9 @@ def read_logic_file(self, lines: List[str]) -> None: elif "EP" in entity_name: entity_type = "EP" location_type = "EP" + elif "Pet the Dog" in entity_name: + entity_type = "Event" + location_type = "Good Boi" elif entity_hex.startswith("0xFF"): entity_type = "Event" location_type = None diff --git a/worlds/witness/locations.py b/worlds/witness/locations.py index d095b8bed4c5..49a4437c5ab7 100644 --- a/worlds/witness/locations.py +++ b/worlds/witness/locations.py @@ -19,7 +19,7 @@ class WitnessPlayerLocations: def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic) -> None: """Defines locations AFTER logic changes due to options""" - self.PANEL_TYPES_TO_SHUFFLE = {"General", "Laser"} + self.PANEL_TYPES_TO_SHUFFLE = {"General", "Good Boi"} self.CHECK_LOCATIONS = static_witness_locations.GENERAL_LOCATIONS.copy() if world.options.shuffle_discarded_panels: @@ -53,10 +53,6 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic) -> N if static_witness_logic.ENTITIES_BY_NAME[ch]["locationType"] in self.PANEL_TYPES_TO_SHUFFLE } - dog_hex = static_witness_logic.ENTITIES_BY_NAME["Town Pet the Dog"]["entity_hex"] - dog_id = static_witness_locations.ALL_LOCATIONS_TO_ID["Town Pet the Dog"] - self.CHECK_PANELHEX_TO_ID[dog_hex] = dog_id - self.CHECK_PANELHEX_TO_ID = dict( sorted(self.CHECK_PANELHEX_TO_ID.items(), key=lambda item: item[1]) ) diff --git a/worlds/witness/options.py b/worlds/witness/options.py index 6f7222d5f9b4..f91e5218c35e 100644 --- a/worlds/witness/options.py +++ b/worlds/witness/options.py @@ -129,12 +129,18 @@ class ShuffleEnvironmentalPuzzles(Choice): option_obelisk_sides = 2 -class ShuffleDog(Toggle): +class ShuffleDog(Choice): """ - Adds petting the Town dog into the location pool. + Adds petting the dog statue in Town into the location pool. + Alternatively, you can force it to be a Puzzle Skip. """ display_name = "Pet the Dog" + option_off = 0 + option_puzzle_skip = 1 + option_random_item = 2 + default = 1 + class EnvironmentalPuzzlesDifficulty(Choice): """ @@ -424,6 +430,7 @@ class TheWitnessOptions(PerGameCommonOptions): laser_hints: LaserHints death_link: DeathLink death_link_amnesty: DeathLinkAmnesty + shuffle_dog: ShuffleDog witness_option_groups = [ @@ -471,5 +478,8 @@ class TheWitnessOptions(PerGameCommonOptions): ElevatorsComeToYou, DeathLink, DeathLinkAmnesty, + ]), + OptionGroup("Silly Options", [ + ShuffleDog, ]) ] diff --git a/worlds/witness/player_items.py b/worlds/witness/player_items.py index 44a959f2b428..3e09fe2ddbce 100644 --- a/worlds/witness/player_items.py +++ b/worlds/witness/player_items.py @@ -215,7 +215,7 @@ def get_progressive_item_ids_in_pool(self) -> Dict[int, List[int]]: item = self.item_data[item_name] if isinstance(item.definition, ProgressiveItemDefinition): # Note: we need to reference the static table here rather than the player-specific one because the child - # items were removed from the pool when we pruned out all progression items not in the settings. + # items were removed from the pool when we pruned out all progression items not in the options. output[cast(int, item.ap_code)] = [cast(int, static_witness_items.ITEM_DATA[child_item].ap_code) for child_item in item.definition.child_item_names] return output diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py index 3321983dd8e7..7313d8238cc6 100644 --- a/worlds/witness/player_logic.py +++ b/worlds/witness/player_logic.py @@ -609,6 +609,9 @@ def make_options_adjustments(self, world: "WitnessWorld") -> None: adjustment_linesets_in_order.append(get_complex_doors()) adjustment_linesets_in_order.append(get_complex_additional_panels()) + if not world.options.shuffle_dog: + adjustment_linesets_in_order.append(["Disabled Locations:", "0xFFF80 (Town Pet the Dog)"]) + if world.options.shuffle_boat: adjustment_linesets_in_order.append(get_boat()) @@ -890,7 +893,7 @@ def is_disabled(self, entity_hex: str) -> bool: ) def determine_unrequired_entities(self, world: "WitnessWorld") -> None: - """Figure out which major items are actually useless in this world's settings""" + """Figure out which major items are actually useless in this world's options""" # Gather quick references to relevant options eps_shuffled = world.options.shuffle_EPs diff --git a/worlds/witness/presets.py b/worlds/witness/presets.py index 2a53484a4c77..105514c91eda 100644 --- a/worlds/witness/presets.py +++ b/worlds/witness/presets.py @@ -37,6 +37,8 @@ "laser_hints": LaserHints.default, "death_link": DeathLink.default, "death_link_amnesty": DeathLinkAmnesty.default, + + "shuffle_dog": ShuffleDog.default, }, # For relative beginners who want to move to the next step. @@ -73,6 +75,8 @@ "laser_hints": LaserHints.default, "death_link": DeathLink.default, "death_link_amnesty": DeathLinkAmnesty.default, + + "shuffle_dog": ShuffleDog.default, }, # Allsanity but without the BS (no expert, no tedious EPs). @@ -109,5 +113,7 @@ "laser_hints": LaserHints.default, "death_link": DeathLink.default, "death_link_amnesty": DeathLinkAmnesty.default, + + "shuffle_dog": ShuffleDog.option_random_item, }, } diff --git a/worlds/witness/test/test_roll_other_options.py b/worlds/witness/test/test_roll_other_options.py index 3912ce252e53..bea278a04287 100644 --- a/worlds/witness/test/test_roll_other_options.py +++ b/worlds/witness/test/test_roll_other_options.py @@ -12,6 +12,7 @@ class TestExpertNonRandomizedEPs(WitnessTestBase): "victory_condition": "challenge", "shuffle_discarded_panels": False, "shuffle_boat": False, + "shuffle_dog": "off", } @@ -24,6 +25,7 @@ class TestVanillaAutoElevatorsPanels(WitnessTestBase): "early_caves": True, "shuffle_vault_boxes": True, "mountain_lasers": 11, + "shuffle_dog": "puzzle_skip", } @@ -46,6 +48,7 @@ class TestMaxEntityShuffle(WitnessTestBase): "obelisk_keys": True, "shuffle_lasers": "anywhere", "victory_condition": "mountain_box_long", + "shuffle_dog": "random_item", } From 35c9061c9cb3fbb12687e7afba73824c27e4ec1e Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Sat, 24 Aug 2024 02:08:46 +0200 Subject: [PATCH 28/60] The Witness: Switch to world.player_name (#3693) * lint * player_name * oops lmao * shorten --- worlds/witness/__init__.py | 15 ++++++++------- worlds/witness/hints.py | 13 +++++-------- worlds/witness/player_logic.py | 3 +-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py index 33c63eddbed3..ee5eba915032 100644 --- a/worlds/witness/__init__.py +++ b/worlds/witness/__init__.py @@ -128,10 +128,10 @@ def determine_sufficient_progression(self) -> None: ) if not has_locally_relevant_progression and self.multiworld.players == 1: - warning(f"{self.multiworld.get_player_name(self.player)}'s Witness world doesn't have any progression" + warning(f"{self.player_name}'s Witness world doesn't have any progression" f" items. Please turn on Symbol Shuffle, Door Shuffle or Laser Shuffle if that doesn't seem right.") elif not interacts_sufficiently_with_multiworld and self.multiworld.players > 1: - raise OptionError(f"{self.multiworld.get_player_name(self.player)}'s Witness world doesn't have enough" + raise OptionError(f"{self.player_name}'s Witness world doesn't have enough" f" progression items that can be placed in other players' worlds. Please turn on Symbol" f" Shuffle, Door Shuffle, or Obelisk Keys.") @@ -251,9 +251,10 @@ def create_regions(self) -> None: self.player_locations.add_location_late(loc) self.get_region(region).add_locations({loc: self.location_name_to_id[loc]}) - player = self.multiworld.get_player_name(self.player) - - warning(f"""Location "{loc}" had to be added to {player}'s world due to insufficient sphere 1 size.""") + warning( + f"""Location "{loc}" had to be added to {self.player_name}'s world + due to insufficient sphere 1 size.""" + ) def create_items(self) -> None: # Determine pool size. @@ -290,7 +291,7 @@ def create_items(self) -> None: self.multiworld.push_precollected(self.create_item(inventory_item_name)) if len(item_pool) > pool_size: - error(f"{self.multiworld.get_player_name(self.player)}'s Witness world has too few locations ({pool_size})" + error(f"{self.player_name}'s Witness world has too few locations ({pool_size})" f" to place its necessary items ({len(item_pool)}).") return @@ -300,7 +301,7 @@ def create_items(self) -> None: num_puzzle_skips = self.options.puzzle_skip_amount.value if num_puzzle_skips > remaining_item_slots: - warning(f"{self.multiworld.get_player_name(self.player)}'s Witness world has insufficient locations" + warning(f"{self.player_name}'s Witness world has insufficient locations" f" to place all requested puzzle skips.") num_puzzle_skips = remaining_item_slots item_pool["Puzzle Skip"] = num_puzzle_skips diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py index c8ddf260d4e6..cd1d38f6e759 100644 --- a/worlds/witness/hints.py +++ b/worlds/witness/hints.py @@ -220,7 +220,7 @@ def try_getting_location_group_for_location(world: "WitnessWorld", hint_loc: Loc def word_direct_hint(world: "WitnessWorld", hint: WitnessLocationHint) -> WitnessWordedHint: location_name = hint.location.name if hint.location.player != world.player: - location_name += " (" + world.multiworld.get_player_name(hint.location.player) + ")" + location_name += " (" + world.player_name + ")" item = hint.location.item @@ -229,7 +229,7 @@ def word_direct_hint(world: "WitnessWorld", hint: WitnessLocationHint) -> Witnes item_name = item.name if item.player != world.player: - item_name += " (" + world.multiworld.get_player_name(item.player) + ")" + item_name += " (" + world.player_name + ")" hint_text = "" area: Optional[str] = None @@ -388,8 +388,7 @@ def make_extra_location_hints(world: "WitnessWorld", hint_amount: int, own_itemp while len(hints) < hint_amount: if not prog_items_in_this_world and not locations_in_this_world and not hints_to_use_first: - player_name = world.multiworld.get_player_name(world.player) - logging.warning(f"Ran out of items/locations to hint for player {player_name}.") + logging.warning(f"Ran out of items/locations to hint for player {world.player_name}.") break location_hint: Optional[WitnessLocationHint] @@ -590,8 +589,7 @@ def make_area_hints(world: "WitnessWorld", amount: int, already_hinted_locations hints.append(WitnessWordedHint(hint_string, None, f"hinted_area:{hinted_area}", prog_amount, hunt_panels)) if len(hinted_areas) < amount: - player_name = world.multiworld.get_player_name(world.player) - logging.warning(f"Was not able to make {amount} area hints for player {player_name}. " + logging.warning(f"Was not able to make {amount} area hints for player {world.player_name}. " f"Made {len(hinted_areas)} instead, and filled the rest with random location hints.") return hints, unhinted_locations_per_area @@ -680,8 +678,7 @@ def create_all_hints(world: "WitnessWorld", hint_amount: int, area_hints: int, # If we still don't have enough for whatever reason, throw a warning, proceed with the lower amount if len(generated_hints) != hint_amount: - player_name = world.multiworld.get_player_name(world.player) - logging.warning(f"Couldn't generate {hint_amount} hints for player {player_name}. " + logging.warning(f"Couldn't generate {hint_amount} hints for player {world.player_name}. " f"Generated {len(generated_hints)} instead.") return generated_hints diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py index 7313d8238cc6..b0e330c90c1c 100644 --- a/worlds/witness/player_logic.py +++ b/worlds/witness/player_logic.py @@ -774,8 +774,7 @@ def find_unsolvable_entities(self, world: "WitnessWorld") -> None: # If we are disabling a laser, something has gone wrong. if static_witness_logic.ENTITIES_BY_HEX[entity]["entityType"] == "Laser": laser_name = static_witness_logic.ENTITIES_BY_HEX[entity]["checkName"] - player_name = world.multiworld.get_player_name(world.player) - raise RuntimeError(f"Somehow, {laser_name} was disabled for player {player_name}." + raise RuntimeError(f"Somehow, {laser_name} was disabled for player {world.player_name}." f" This is not allowed to happen, please report to Violet.") newly_discovered_disabled_entities.add(entity) From 6f617e302d65058fc4602991f465b3db2fbebe44 Mon Sep 17 00:00:00 2001 From: Scipio Wright Date: Fri, 23 Aug 2024 20:09:50 -0400 Subject: [PATCH 29/60] Launcher: Update message that displays when installing a custom apworld for a game in main (#3607) --- worlds/LauncherComponents.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py index 18c1a1661ef0..d127bbea36ed 100644 --- a/worlds/LauncherComponents.py +++ b/worlds/LauncherComponents.py @@ -132,7 +132,8 @@ def _install_apworld(apworld_src: str = "") -> Optional[Tuple[pathlib.Path, path break if found_already_loaded: raise Exception(f"Installed APWorld successfully, but '{module_name}' is already loaded,\n" - "so a Launcher restart is required to use the new installation.") + "so a Launcher restart is required to use the new installation.\n" + "If the Launcher is not open, no action needs to be taken.") world_source = worlds.WorldSource(str(target), is_zip=True) bisect.insort(worlds.world_sources, world_source) world_source.load() From 5c5f2ffc947a6fc2befd09f528694964e44edc9f Mon Sep 17 00:00:00 2001 From: qwint Date: Fri, 23 Aug 2024 19:12:01 -0500 Subject: [PATCH 30/60] kvui: assert kivy is not imported before kvui (#3823) --- kvui.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kvui.py b/kvui.py index f83590a819d5..65cf52c7a4aa 100644 --- a/kvui.py +++ b/kvui.py @@ -5,6 +5,8 @@ import re from collections import deque +assert "kivy" not in sys.modules, "kvui should be imported before kivy for frozen compatibility" + if sys.platform == "win32": import ctypes From d1a7fd7da118d9470c037f7374445f0f086ede6a Mon Sep 17 00:00:00 2001 From: Bryce Wilson Date: Fri, 23 Aug 2024 17:51:52 -0700 Subject: [PATCH 31/60] Pokemon Emerald: Send current map to trackers (#3726) --- worlds/pokemon_emerald/client.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/worlds/pokemon_emerald/client.py b/worlds/pokemon_emerald/client.py index a830957e9c7e..eeae3a5248a5 100644 --- a/worlds/pokemon_emerald/client.py +++ b/worlds/pokemon_emerald/client.py @@ -137,6 +137,8 @@ class PokemonEmeraldClient(BizHawkClient): previous_death_link: float ignore_next_death_link: bool + current_map: Optional[int] + def __init__(self) -> None: super().__init__() self.local_checked_locations = set() @@ -150,6 +152,7 @@ def __init__(self) -> None: self.death_counter = None self.previous_death_link = 0 self.ignore_next_death_link = False + self.current_map = None async def validate_rom(self, ctx: "BizHawkClientContext") -> bool: from CommonClient import logger @@ -243,6 +246,7 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None: sb1_address = int.from_bytes(guards["SAVE BLOCK 1"][1], "little") sb2_address = int.from_bytes(guards["SAVE BLOCK 2"][1], "little") + await self.handle_tracker_info(ctx, guards) await self.handle_death_link(ctx, guards) await self.handle_received_items(ctx, guards) await self.handle_wonder_trade(ctx, guards) @@ -403,6 +407,31 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None: # Exit handler and return to main loop to reconnect pass + async def handle_tracker_info(self, ctx: "BizHawkClientContext", guards: Dict[str, Tuple[int, bytes, str]]) -> None: + # Current map + sb1_address = int.from_bytes(guards["SAVE BLOCK 1"][1], "little") + + read_result = await bizhawk.guarded_read( + ctx.bizhawk_ctx, + [(sb1_address + 0x4, 2, "System Bus")], + [guards["SAVE BLOCK 1"]] + ) + if read_result is None: # Save block moved + return + + current_map = int.from_bytes(read_result[0], "big") + if current_map != self.current_map: + self.current_map = current_map + await ctx.send_msgs([{ + "cmd": "Bounce", + "slots": [ctx.slot], + "tags": ["Tracker"], + "data": { + "type": "MapUpdate", + "mapId": current_map, + }, + }]) + async def handle_death_link(self, ctx: "BizHawkClientContext", guards: Dict[str, Tuple[int, bytes, str]]) -> None: """ Checks whether the player has died while connected and sends a death link if so. Queues a death link in the game From 0fcca25870be3ec343d13a3ab7b4e0d63c13b84b Mon Sep 17 00:00:00 2001 From: Silvris <58583688+Silvris@users.noreply.github.com> Date: Fri, 23 Aug 2024 22:41:00 -0500 Subject: [PATCH 32/60] Core: deepcopy plando items #3841 --- Generate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Generate.py b/Generate.py index d7dd6523e7f1..6220c0eb8188 100644 --- a/Generate.py +++ b/Generate.py @@ -511,7 +511,7 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b continue logging.warning(f"{option_key} is not a valid option name for {ret.game} and is not present in triggers.") if PlandoOptions.items in plando_options: - ret.plando_items = game_weights.get("plando_items", []) + ret.plando_items = copy.deepcopy(game_weights.get("plando_items", [])) if ret.game == "A Link to the Past": roll_alttp_settings(ret, game_weights) From 83367c694602beff5fd84e1160909cc85ce771fb Mon Sep 17 00:00:00 2001 From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Date: Sat, 24 Aug 2024 04:53:56 -0400 Subject: [PATCH 33/60] ALttP: Fix accessibility (locations -> full) (#3801) --- worlds/alttp/Rules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worlds/alttp/Rules.py b/worlds/alttp/Rules.py index f596749ae669..a664f8ac9b79 100644 --- a/worlds/alttp/Rules.py +++ b/worlds/alttp/Rules.py @@ -412,7 +412,7 @@ def global_rules(multiworld: MultiWorld, player: int): lambda state: ((state._lttp_has_key('Small Key (Thieves Town)', player, 3)) or (location_item_name(state, 'Thieves\' Town - Big Chest', player) == ("Small Key (Thieves Town)", player)) and state._lttp_has_key('Small Key (Thieves Town)', player, 2)) and state.has('Hammer', player)) set_rule(multiworld.get_location('Thieves\' Town - Blind\'s Cell', player), lambda state: state._lttp_has_key('Small Key (Thieves Town)', player)) - if multiworld.accessibility[player] != 'locations' and not multiworld.key_drop_shuffle[player]: + if multiworld.accessibility[player] != 'full' and not multiworld.key_drop_shuffle[player]: set_always_allow(multiworld.get_location('Thieves\' Town - Big Chest', player), lambda state, item: item.name == 'Small Key (Thieves Town)' and item.player == player) set_rule(multiworld.get_location('Thieves\' Town - Attic', player), lambda state: state._lttp_has_key('Small Key (Thieves Town)', player, 3)) set_rule(multiworld.get_location('Thieves\' Town - Spike Switch Pot Key', player), @@ -547,7 +547,7 @@ def global_rules(multiworld: MultiWorld, player: int): location_item_name(state, 'Ganons Tower - Map Chest', player) in [('Big Key (Ganons Tower)', player)] and state._lttp_has_key('Small Key (Ganons Tower)', player, 6))) # this seemed to be causing generation failure, disable for now - # if world.accessibility[player] != 'locations': + # if world.accessibility[player] != 'full': # set_always_allow(world.get_location('Ganons Tower - Map Chest', player), lambda state, item: item.name == 'Small Key (Ganons Tower)' and item.player == player and state._lttp_has_key('Small Key (Ganons Tower)', player, 7) and state.can_reach('Ganons Tower (Hookshot Room)', 'region', player)) # It is possible to need more than 6 keys to get through this entrance if you spend keys elsewhere. We reflect this in the chest requirements. From dddffa1660423a379faf3a4808b962679084dc68 Mon Sep 17 00:00:00 2001 From: Aaron Wagener Date: Sat, 24 Aug 2024 03:54:33 -0500 Subject: [PATCH 34/60] LTTP: fix own_dungeon setting from not being placed in the player's own world (#3816) --- worlds/alttp/__init__.py | 2 + .../alttp/test/options/test_dungeon_fill.py | 60 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 worlds/alttp/test/options/test_dungeon_fill.py diff --git a/worlds/alttp/__init__.py b/worlds/alttp/__init__.py index 3176f7a7fcce..3cdbb1cb458a 100644 --- a/worlds/alttp/__init__.py +++ b/worlds/alttp/__init__.py @@ -356,6 +356,8 @@ def generate_early(self): self.dungeon_local_item_names |= self.item_name_groups[option.item_name_group] if option == "original_dungeon": self.dungeon_specific_item_names |= self.item_name_groups[option.item_name_group] + else: + self.options.local_items.value |= self.dungeon_local_item_names self.difficulty_requirements = difficulties[multiworld.item_pool[player].current_key] diff --git a/worlds/alttp/test/options/test_dungeon_fill.py b/worlds/alttp/test/options/test_dungeon_fill.py new file mode 100644 index 000000000000..17501b65d87c --- /dev/null +++ b/worlds/alttp/test/options/test_dungeon_fill.py @@ -0,0 +1,60 @@ +from unittest import TestCase + +from BaseClasses import MultiWorld +from test.general import gen_steps, setup_multiworld +from worlds.AutoWorld import call_all +from worlds.generic.Rules import locality_rules +from ... import ALTTPWorld +from ...Options import DungeonItem + + +class DungeonFillTestBase(TestCase): + multiworld: MultiWorld + world_1: ALTTPWorld + world_2: ALTTPWorld + options = ( + "big_key_shuffle", + "small_key_shuffle", + "key_drop_shuffle", + "compass_shuffle", + "map_shuffle", + ) + + def setUp(self): + self.multiworld = setup_multiworld([ALTTPWorld, ALTTPWorld], ()) + self.world_1 = self.multiworld.worlds[1] + self.world_2 = self.multiworld.worlds[2] + + def generate_with_options(self, option_value: int): + for option in self.options: + getattr(self.world_1.options, option).value = getattr(self.world_2.options, option).value = option_value + + for step in gen_steps: + call_all(self.multiworld, step) + # this is where locality rules are set in normal generation which we need to verify this test + if step == "set_rules": + locality_rules(self.multiworld) + + def test_original_dungeons(self): + self.generate_with_options(DungeonItem.option_original_dungeon) + for location in self.multiworld.get_filled_locations(): + with (self.subTest(location=location)): + if location.parent_region.dungeon is None: + self.assertIs(location.item.dungeon, None) + else: + self.assertEqual(location.player, location.item.player, + f"{location.item} does not belong to {location}'s player") + if location.item.dungeon is None: + continue + self.assertIs(location.item.dungeon, location.parent_region.dungeon, + f"{location.item} was not placed in its original dungeon.") + + def test_own_dungeons(self): + self.generate_with_options(DungeonItem.option_own_dungeons) + for location in self.multiworld.get_filled_locations(): + with self.subTest(location=location): + if location.parent_region.dungeon is None: + self.assertIs(location.item.dungeon, None) + else: + self.assertEqual(location.player, location.item.player, + f"{location.item} does not belong to {location}'s player") From e99f027b424eb37949ece2c768d75ddf3b96ae38 Mon Sep 17 00:00:00 2001 From: Justus Lind Date: Sun, 25 Aug 2024 02:19:42 +1000 Subject: [PATCH 35/60] Muse Dash: Update to 4.7.0 - Let's Rhythm Jam! (#3837) * Update to Muse Dash 4.7.0 Muse Dash - Let's Rhythm Jam! * Add the replaced song to the removed list. * Oops add the other secret song to this list. * Add trailing comma Co-authored-by: Doug Hoskisson --------- Co-authored-by: Doug Hoskisson --- worlds/musedash/MuseDashCollection.py | 2 ++ worlds/musedash/MuseDashData.txt | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/worlds/musedash/MuseDashCollection.py b/worlds/musedash/MuseDashCollection.py index 576a106df7cc..9e8c9214a1dd 100644 --- a/worlds/musedash/MuseDashCollection.py +++ b/worlds/musedash/MuseDashCollection.py @@ -46,6 +46,8 @@ class MuseDashCollections: "CHAOS Glitch", "FM 17314 SUGAR RADIO", "Yume Ou Mono Yo Secret", + "Echo over you... Secret", + "Tsukuyomi Ni Naru Replaced", ] album_items: Dict[str, AlbumData] = {} diff --git a/worlds/musedash/MuseDashData.txt b/worlds/musedash/MuseDashData.txt index 6f48d6af9fdd..1f1a2a011cff 100644 --- a/worlds/musedash/MuseDashData.txt +++ b/worlds/musedash/MuseDashData.txt @@ -553,7 +553,7 @@ NOVA|73-4|Happy Otaku Pack Vol.19|True|6|8|10| Heaven's Gradius|73-5|Happy Otaku Pack Vol.19|True|6|8|10| Ray Tuning|74-0|CHUNITHM COURSE MUSE|True|6|8|10| World Vanquisher|74-1|CHUNITHM COURSE MUSE|True|6|8|10|11 -Tsukuyomi Ni Naru|74-2|CHUNITHM COURSE MUSE|False|5|7|9| +Tsukuyomi Ni Naru Replaced|74-2|CHUNITHM COURSE MUSE|True|5|7|9| The wheel to the right|74-3|CHUNITHM COURSE MUSE|True|5|7|9|11 Climax|74-4|CHUNITHM COURSE MUSE|True|4|8|11|11 Spider's Thread|74-5|CHUNITHM COURSE MUSE|True|5|8|10|12 @@ -567,3 +567,16 @@ SUPERHERO|75-0|Novice Rider Pack|False|2|4|7| Highway_Summer|75-1|Novice Rider Pack|True|2|4|6| Mx. Black Box|75-2|Novice Rider Pack|True|5|7|9| Sweet Encounter|75-3|Novice Rider Pack|True|2|4|7| +Echo over you... Secret|0-55|Default Music|False|6|8|10| +Echo over you...|0-56|Default Music|False|1|4|0| +Tsukuyomi Ni Naru|74-6|CHUNITHM COURSE MUSE|True|5|8|10| +disco light|76-0|MUSE RADIO FM105|True|5|7|9| +room light feat.chancylemon|76-1|MUSE RADIO FM105|True|3|5|7| +Invisible|76-2|MUSE RADIO FM105|True|3|5|8| +Christmas Season-LLABB|76-3|MUSE RADIO FM105|True|1|4|7| +Hyouryu|77-0|Let's Rhythm Jam!|False|6|8|10| +The Whole Rest|77-1|Let's Rhythm Jam!|False|5|8|10|11 +Hydra|77-2|Let's Rhythm Jam!|False|4|7|11| +Pastel Lines|77-3|Let's Rhythm Jam!|False|3|6|9| +LINK x LIN#S|77-4|Let's Rhythm Jam!|False|3|6|9| +Arcade ViruZ|77-5|Let's Rhythm Jam!|False|6|8|10| From 0fb69dce33be7876c4491b4682f88af5c78fb19b Mon Sep 17 00:00:00 2001 From: Bryce Wilson Date: Sat, 24 Aug 2024 19:08:27 -0700 Subject: [PATCH 36/60] Pokemon Emerald: Fix map update sending to all trackers (#3846) --- worlds/pokemon_emerald/client.py | 1 - 1 file changed, 1 deletion(-) diff --git a/worlds/pokemon_emerald/client.py b/worlds/pokemon_emerald/client.py index eeae3a5248a5..7f16015a3f12 100644 --- a/worlds/pokemon_emerald/client.py +++ b/worlds/pokemon_emerald/client.py @@ -425,7 +425,6 @@ async def handle_tracker_info(self, ctx: "BizHawkClientContext", guards: Dict[st await ctx.send_msgs([{ "cmd": "Bounce", "slots": [ctx.slot], - "tags": ["Tracker"], "data": { "type": "MapUpdate", "mapId": current_map, From 906b23088ce19fa0d57c91ceb0eade769bb2cc43 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:31:49 +0200 Subject: [PATCH 37/60] The Witness: Rules Optimisation (#3617) * Attempt at optimizing rules * docstrings * Python 3.8 * Lasers optimisation * Simplify conversion code and make it even faster * mypy * ruff * Neat * Add redirect to the other two modes * Update WitnessLogic.txt * Update WitnessLogicExpert.txt * Update WitnessLogicVanilla.txt * Use NamedTuple * Ruff * mypy thing * Mypy stuff * Move Redirect Event to Desert Region so it has a better name --- worlds/witness/__init__.py | 7 +- worlds/witness/data/WitnessLogic.txt | 3 +- worlds/witness/data/WitnessLogicExpert.txt | 3 +- worlds/witness/data/WitnessLogicVanilla.txt | 3 +- worlds/witness/hints.py | 3 +- worlds/witness/player_items.py | 2 +- worlds/witness/player_logic.py | 23 ++-- worlds/witness/regions.py | 8 +- worlds/witness/rules.py | 138 +++++++++++++------- worlds/witness/test/__init__.py | 7 +- worlds/witness/test/test_panel_hunt.py | 27 ++-- 11 files changed, 139 insertions(+), 85 deletions(-) diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py index ee5eba915032..6229e5ffc948 100644 --- a/worlds/witness/__init__.py +++ b/worlds/witness/__init__.py @@ -204,8 +204,11 @@ def create_regions(self) -> None: ] if early_items: random_early_item = self.random.choice(early_items) - if self.options.puzzle_randomization == "sigma_expert" or self.options.victory_condition == "panel_hunt": - # In Expert, only tag the item as early, rather than forcing it onto the gate. + if ( + self.options.puzzle_randomization == "sigma_expert" + or self.options.victory_condition == "panel_hunt" + ): + # In Expert and Panel Hunt, only tag the item as early, rather than forcing it onto the gate. self.multiworld.local_early_items[self.player][random_early_item] = 1 else: # Force the item onto the tutorial gate check and remove it from our random pool. diff --git a/worlds/witness/data/WitnessLogic.txt b/worlds/witness/data/WitnessLogic.txt index b7814626ada0..fabd1428810b 100644 --- a/worlds/witness/data/WitnessLogic.txt +++ b/worlds/witness/data/WitnessLogic.txt @@ -176,6 +176,7 @@ Door - 0x03444 (Vault Door) - 0x0CC7B Door - 0x09FEE (Light Room Entry) - 0x0C339 158701 - 0x03608 (Laser Panel) - 0x012D7 & 0x0A15F - True Laser - 0x012FB (Laser) - 0x03608 +159804 - 0xFFD03 (Laser Activated + Redirected) - 0x09F98 & 0x012FB - True 159020 - 0x3351D (Sand Snake EP) - True - True 159030 - 0x0053C (Facade Right EP) - True - True 159031 - 0x00771 (Facade Left EP) - True - True @@ -980,7 +981,7 @@ Mountainside Obelisk (Mountainside) - Entry - True: 159739 - 0x00367 (Obelisk) - True - True Mountainside (Mountainside) - Main Island - True - Mountaintop - True - Mountainside Vault - 0x00085: -159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True +159550 - 0x28B91 (Thundercloud EP) - 0xFFD03 - True 158612 - 0x17C42 (Discard) - True - Triangles 158665 - 0x002A6 (Vault Panel) - True - Symmetry & Colored Dots & Black/White Squares & Dots Door - 0x00085 (Vault Door) - 0x002A6 diff --git a/worlds/witness/data/WitnessLogicExpert.txt b/worlds/witness/data/WitnessLogicExpert.txt index 1d1d010fde88..200138dee1f7 100644 --- a/worlds/witness/data/WitnessLogicExpert.txt +++ b/worlds/witness/data/WitnessLogicExpert.txt @@ -176,6 +176,7 @@ Door - 0x03444 (Vault Door) - 0x0CC7B Door - 0x09FEE (Light Room Entry) - 0x0C339 158701 - 0x03608 (Laser Panel) - 0x012D7 & 0x0A15F - True Laser - 0x012FB (Laser) - 0x03608 +159804 - 0xFFD03 (Laser Activated + Redirected) - 0x09F98 & 0x012FB - True 159020 - 0x3351D (Sand Snake EP) - True - True 159030 - 0x0053C (Facade Right EP) - True - True 159031 - 0x00771 (Facade Left EP) - True - True @@ -980,7 +981,7 @@ Mountainside Obelisk (Mountainside) - Entry - True: 159739 - 0x00367 (Obelisk) - True - True Mountainside (Mountainside) - Main Island - True - Mountaintop - True - Mountainside Vault - 0x00085: -159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True +159550 - 0x28B91 (Thundercloud EP) - 0xFFD03 - True 158612 - 0x17C42 (Discard) - True - Arrows 158665 - 0x002A6 (Vault Panel) - True - Symmetry & Colored Squares & Triangles & Stars & Stars + Same Colored Symbol Door - 0x00085 (Vault Door) - 0x002A6 diff --git a/worlds/witness/data/WitnessLogicVanilla.txt b/worlds/witness/data/WitnessLogicVanilla.txt index 851031ab72f0..67a42ba7e4d4 100644 --- a/worlds/witness/data/WitnessLogicVanilla.txt +++ b/worlds/witness/data/WitnessLogicVanilla.txt @@ -176,6 +176,7 @@ Door - 0x03444 (Vault Door) - 0x0CC7B Door - 0x09FEE (Light Room Entry) - 0x0C339 158701 - 0x03608 (Laser Panel) - 0x012D7 & 0x0A15F - True Laser - 0x012FB (Laser) - 0x03608 +159804 - 0xFFD03 (Laser Activated + Redirected) - 0x09F98 & 0x012FB - True 159020 - 0x3351D (Sand Snake EP) - True - True 159030 - 0x0053C (Facade Right EP) - True - True 159031 - 0x00771 (Facade Left EP) - True - True @@ -980,7 +981,7 @@ Mountainside Obelisk (Mountainside) - Entry - True: 159739 - 0x00367 (Obelisk) - True - True Mountainside (Mountainside) - Main Island - True - Mountaintop - True - Mountainside Vault - 0x00085: -159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True +159550 - 0x28B91 (Thundercloud EP) - 0xFFD03 - True 158612 - 0x17C42 (Discard) - True - Triangles 158665 - 0x002A6 (Vault Panel) - True - Symmetry & Colored Dots & Black/White Squares Door - 0x00085 (Vault Door) - 0x002A6 diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py index cd1d38f6e759..09c3f0b10192 100644 --- a/worlds/witness/hints.py +++ b/worlds/witness/hints.py @@ -712,8 +712,7 @@ def get_compact_hint_args(hint: WitnessWordedHint, local_player_number: int) -> if hint.vague_location_hint and location.player == local_player_number: assert hint.area is not None # A local vague location hint should have an area argument return location.address, "containing_area:" + hint.area - else: - return location.address, location.player # Scouting does not matter for other players (currently) + return location.address, location.player # Scouting does not matter for other players (currently) # Is junk / undefined hint return -1, local_player_number diff --git a/worlds/witness/player_items.py b/worlds/witness/player_items.py index 3e09fe2ddbce..4142ea5e042a 100644 --- a/worlds/witness/player_items.py +++ b/worlds/witness/player_items.py @@ -42,7 +42,7 @@ def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic, player_locations: WitnessPlayerLocations) -> None: """Adds event items after logic changes due to options""" - self._world: "WitnessWorld" = world + self._world: WitnessWorld = world self._multiworld: MultiWorld = world.multiworld self._player_id: int = world.player self._logic: WitnessPlayerLogic = player_logic diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py index b0e330c90c1c..027d1834d99e 100644 --- a/worlds/witness/player_logic.py +++ b/worlds/witness/player_logic.py @@ -116,18 +116,19 @@ def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_in self.HUNT_ENTITIES: Set[str] = set() self.ALWAYS_EVENT_NAMES_BY_HEX = { - "0x00509": "+1 Laser (Symmetry Laser)", - "0x012FB": "+1 Laser (Desert Laser)", + "0x00509": "+1 Laser", + "0x012FB": "+1 Laser (Unredirected)", "0x09F98": "Desert Laser Redirection", - "0x01539": "+1 Laser (Quarry Laser)", - "0x181B3": "+1 Laser (Shadows Laser)", - "0x014BB": "+1 Laser (Keep Laser)", - "0x17C65": "+1 Laser (Monastery Laser)", - "0x032F9": "+1 Laser (Town Laser)", - "0x00274": "+1 Laser (Jungle Laser)", - "0x0C2B2": "+1 Laser (Bunker Laser)", - "0x00BF6": "+1 Laser (Swamp Laser)", - "0x028A4": "+1 Laser (Treehouse Laser)", + "0xFFD03": "+1 Laser (Redirected)", + "0x01539": "+1 Laser", + "0x181B3": "+1 Laser", + "0x014BB": "+1 Laser", + "0x17C65": "+1 Laser", + "0x032F9": "+1 Laser", + "0x00274": "+1 Laser", + "0x0C2B2": "+1 Laser", + "0x00BF6": "+1 Laser", + "0x028A4": "+1 Laser", "0x17C34": "Mountain Entry", "0xFFF00": "Bottom Floor Discard Turns On", } diff --git a/worlds/witness/regions.py b/worlds/witness/regions.py index 6d1f8093af85..7ff8c440ad86 100644 --- a/worlds/witness/regions.py +++ b/worlds/witness/regions.py @@ -3,7 +3,7 @@ and connects them with the proper requirements """ from collections import defaultdict -from typing import TYPE_CHECKING, Dict, List, Set, Tuple +from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple from BaseClasses import Entrance, Region @@ -38,7 +38,7 @@ def __init__(self, player_locations: WitnessPlayerLocations, world: "WitnessWorl self.created_region_names: Set[str] = set() @staticmethod - def make_lambda(item_requirement: WitnessRule, world: "WitnessWorld") -> CollectionRule: + def make_lambda(item_requirement: WitnessRule, world: "WitnessWorld") -> Optional[CollectionRule]: from .rules import _meets_item_requirements """ @@ -79,7 +79,9 @@ def connect_if_possible(self, world: "WitnessWorld", source: str, target: str, r source_region ) - connection.access_rule = self.make_lambda(final_requirement, world) + rule = self.make_lambda(final_requirement, world) + if rule is not None: + connection.access_rule = rule source_region.exits.append(connection) connection.connect(target_region) diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py index eecea8f30bf0..2f3210a21467 100644 --- a/worlds/witness/rules.py +++ b/worlds/witness/rules.py @@ -2,7 +2,8 @@ Defines the rules by which locations can be accessed, depending on the items received """ -from typing import TYPE_CHECKING +from collections import Counter +from typing import TYPE_CHECKING, Dict, List, NamedTuple, Optional, Union from BaseClasses import CollectionState @@ -15,50 +16,22 @@ if TYPE_CHECKING: from . import WitnessWorld -laser_hexes = [ - "0x028A4", - "0x00274", - "0x032F9", - "0x01539", - "0x181B3", - "0x0C2B2", - "0x00509", - "0x00BF6", - "0x014BB", - "0x012FB", - "0x17C65", -] - - -def _can_do_panel_hunt(world: "WitnessWorld") -> CollectionRule: - required = world.panel_hunt_required_count - player = world.player - return lambda state: state.has("+1 Panel Hunt", player, required) - - -def _has_laser(laser_hex: str, world: "WitnessWorld", redirect_required: bool) -> CollectionRule: - player = world.player - laser_name = static_witness_logic.ENTITIES_BY_HEX[laser_hex]["checkName"] - # Workaround for intentional naming inconsistency - if laser_name == "Symmetry Island Laser": - laser_name = "Symmetry Laser" +class SimpleItemRepresentation(NamedTuple): + item_name: str + item_count: int - if laser_hex == "0x012FB" and redirect_required: - return lambda state: state.has_all([f"+1 Laser ({laser_name})", "Desert Laser Redirection"], player) - return lambda state: state.has(f"+1 Laser ({laser_name})", player) +def _can_do_panel_hunt(world: "WitnessWorld") -> SimpleItemRepresentation: + required = world.panel_hunt_required_count + return SimpleItemRepresentation("+1 Panel Hunt", required) def _has_lasers(amount: int, world: "WitnessWorld", redirect_required: bool) -> CollectionRule: - laser_lambdas = [] - - for laser_hex in laser_hexes: - has_laser_lambda = _has_laser(laser_hex, world, redirect_required) - - laser_lambdas.append(has_laser_lambda) + if redirect_required: + return lambda state: state.has_from_list(["+1 Laser", "+1 Laser (Redirected)"], world.player, amount) - return lambda state: sum(laser_lambda(state) for laser_lambda in laser_lambdas) >= amount + return lambda state: state.has_from_list(["+1 Laser", "+1 Laser (Unredirected)"], world.player, amount) def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool: @@ -196,7 +169,13 @@ def _can_do_theater_to_tunnels(state: CollectionState, world: "WitnessWorld") -> ) -def _has_item(item: str, world: "WitnessWorld", player: int, player_logic: WitnessPlayerLogic) -> CollectionRule: +def _has_item(item: str, world: "WitnessWorld", + player_logic: WitnessPlayerLogic) -> Union[CollectionRule, SimpleItemRepresentation]: + """ + Convert a single element of a WitnessRule into a CollectionRule, unless it is referring to an item, + in which case we return it as an item-count pair ("SimpleItemRepresentation"). This allows some optimisation later. + """ + assert item not in static_witness_logic.ENTITIES_BY_HEX, "Requirements can no longer contain entity hexes directly." if item in player_logic.REFERENCE_LOGIC.ALL_REGIONS_BY_NAME: @@ -223,27 +202,90 @@ def _has_item(item: str, world: "WitnessWorld", player: int, player_logic: Witne return lambda state: _can_do_theater_to_tunnels(state, world) prog_item = static_witness_logic.get_parent_progressive_item(item) - return lambda state: state.has(prog_item, player, player_logic.MULTI_AMOUNTS[item]) + needed_amount = player_logic.MULTI_AMOUNTS[item] + + simple_rule: SimpleItemRepresentation = SimpleItemRepresentation(prog_item, needed_amount) + return simple_rule + + +def optimize_requirement_option(requirement_option: List[Union[CollectionRule, SimpleItemRepresentation]])\ + -> List[Union[CollectionRule, SimpleItemRepresentation]]: + """ + This optimises out a requirement like [("Progressive Dots": 1), ("Progressive Dots": 2)] to only the "2" version. + """ + direct_items = [rule for rule in requirement_option if isinstance(rule, tuple)] + if not direct_items: + return requirement_option -def _meets_item_requirements(requirements: WitnessRule, world: "WitnessWorld") -> CollectionRule: + max_per_item: Dict[str, int] = Counter() + for item_rule in direct_items: + max_per_item[item_rule[0]] = max(max_per_item[item_rule[0]], item_rule[1]) + + return [ + rule for rule in requirement_option + if not (isinstance(rule, tuple) and rule[1] < max_per_item[rule[0]]) + ] + + +def convert_requirement_option(requirement: List[Union[CollectionRule, SimpleItemRepresentation]], + player: int) -> List[CollectionRule]: + """ + Converts a list of CollectionRules and SimpleItemRepresentations to just a list of CollectionRules. + If the list is ONLY SimpleItemRepresentations, we can just return a CollectionRule based on state.has_all_counts() + """ + converted_sublist = [] + + for rule in requirement: + if not isinstance(rule, tuple): + converted_sublist.append(rule) + continue + + collection_rules = [rule for rule in requirement if not isinstance(rule, SimpleItemRepresentation)] + item_rules = [rule for rule in requirement if isinstance(rule, SimpleItemRepresentation)] + + if len(item_rules) == 0: + item_rules_converted = [] + elif len(item_rules) == 1: + item = item_rules[0][0] + count = item_rules[0][1] + item_rules_converted = [lambda state: state.has(item, player, count)] + else: + item_counts = {item_rule.item_name: item_rule.item_count for item_rule in item_rules} + item_rules_converted = [lambda state: state.has_all_counts(item_counts, player)] + + return collection_rules + item_rules_converted + + +def _meets_item_requirements(requirements: WitnessRule, world: "WitnessWorld") -> Optional[CollectionRule]: """ - Checks whether item and panel requirements are met for - a panel + Converts a WitnessRule into a CollectionRule. """ + player = world.player + + if requirements == frozenset({frozenset()}): + return None - lambda_conversion = [ - [_has_item(item, world, world.player, world.player_logic) for item in subset] + rule_conversion = [ + [_has_item(item, world, world.player_logic) for item in subset] for subset in requirements ] + optimized_rule_conversion = [optimize_requirement_option(sublist) for sublist in rule_conversion] + + fully_converted_rules = [convert_requirement_option(sublist, player) for sublist in optimized_rule_conversion] + + if len(fully_converted_rules) == 1: + if len(fully_converted_rules[0]) == 1: + return fully_converted_rules[0][0] + return lambda state: all(condition(state) for condition in fully_converted_rules[0]) return lambda state: any( all(condition(state) for condition in sub_requirement) - for sub_requirement in lambda_conversion + for sub_requirement in fully_converted_rules ) -def make_lambda(entity_hex: str, world: "WitnessWorld") -> CollectionRule: +def make_lambda(entity_hex: str, world: "WitnessWorld") -> Optional[CollectionRule]: """ Lambdas are created in a for loop so values need to be captured """ @@ -268,6 +310,8 @@ def set_rules(world: "WitnessWorld") -> None: entity_hex = associated_entity["entity_hex"] rule = make_lambda(entity_hex, world) + if rule is None: + continue location = world.get_location(location) diff --git a/worlds/witness/test/__init__.py b/worlds/witness/test/__init__.py index d1b90ca47d9e..4453609ddcdb 100644 --- a/worlds/witness/test/__init__.py +++ b/worlds/witness/test/__init__.py @@ -1,10 +1,11 @@ -from test.bases import WorldTestBase -from test.general import gen_steps, setup_multiworld -from test.multiworld.test_multiworlds import MultiworldTestBase from typing import Any, ClassVar, Dict, Iterable, List, Mapping, Union, cast from BaseClasses import CollectionState, Entrance, Item, Location, Region +from test.bases import WorldTestBase +from test.general import gen_steps, setup_multiworld +from test.multiworld.test_multiworlds import MultiworldTestBase + from .. import WitnessWorld diff --git a/worlds/witness/test/test_panel_hunt.py b/worlds/witness/test/test_panel_hunt.py index af6855dc696e..2f8434802b75 100644 --- a/worlds/witness/test/test_panel_hunt.py +++ b/worlds/witness/test/test_panel_hunt.py @@ -1,5 +1,6 @@ -from BaseClasses import CollectionState, Item -from worlds.witness.test import WitnessTestBase, WitnessMultiworldTestBase +from BaseClasses import CollectionState + +from worlds.witness.test import WitnessMultiworldTestBase, WitnessTestBase class TestMaxPanelHuntMinChecks(WitnessTestBase): @@ -13,7 +14,7 @@ class TestMaxPanelHuntMinChecks(WitnessTestBase): "shuffle_vault_boxes": False, } - def test_correct_panels_were_picked(self): + def test_correct_panels_were_picked(self) -> None: with self.subTest("Check that 100 Hunt Panels were actually picked."): self.assertEqual(len(self.multiworld.find_item_locations("+1 Panel Hunt", self.player)), 100) @@ -63,45 +64,45 @@ class TestPanelHuntPostgame(WitnessMultiworldTestBase): "shuffle_discarded_panels": True, } - def test_panel_hunt_postgame(self): + def test_panel_hunt_postgame(self) -> None: for player_minus_one, options in enumerate(self.options_per_world): player = player_minus_one + 1 postgame_option = options["panel_hunt_postgame"] - with self.subTest(f"Test that \"{postgame_option}\" results in 40 Hunt Panels."): + with self.subTest(f'Test that "{postgame_option}" results in 40 Hunt Panels.'): self.assertEqual(len(self.multiworld.find_item_locations("+1 Panel Hunt", player)), 40) # Test that the box gets extra checks from panel_hunt_postgame - with self.subTest("Test that \"everything_is_eligible\" has no Mountaintop Box Hunt Panels."): + with self.subTest('Test that "everything_is_eligible" has no Mountaintop Box Hunt Panels.'): self.assert_location_does_not_exist("Mountaintop Box Short (Panel Hunt)", 1, strict_check=False) self.assert_location_does_not_exist("Mountaintop Box Long (Panel Hunt)", 1, strict_check=False) - with self.subTest("Test that \"disable_mountain_lasers_locations\" has a Hunt Panel for Short, but not Long."): + with self.subTest('Test that "disable_mountain_lasers_locations" has a Hunt Panel for Short, but not Long.'): self.assert_location_exists("Mountaintop Box Short (Panel Hunt)", 2, strict_check=False) self.assert_location_does_not_exist("Mountaintop Box Long (Panel Hunt)", 2, strict_check=False) - with self.subTest("Test that \"disable_challenge_lasers_locations\" has a Hunt Panel for Long, but not Short."): + with self.subTest('Test that "disable_challenge_lasers_locations" has a Hunt Panel for Long, but not Short.'): self.assert_location_does_not_exist("Mountaintop Box Short (Panel Hunt)", 3, strict_check=False) self.assert_location_exists("Mountaintop Box Long (Panel Hunt)", 3, strict_check=False) - with self.subTest("Test that \"disable_anything_locked_by_lasers\" has both Mountaintop Box Hunt Panels."): + with self.subTest('Test that "disable_anything_locked_by_lasers" has both Mountaintop Box Hunt Panels.'): self.assert_location_exists("Mountaintop Box Short (Panel Hunt)", 4, strict_check=False) self.assert_location_exists("Mountaintop Box Long (Panel Hunt)", 4, strict_check=False) # Check panel_hunt_postgame locations get disabled - with self.subTest("Test that \"everything_is_eligible\" does not disable any locked-by-lasers panels."): + with self.subTest('Test that "everything_is_eligible" does not disable any locked-by-lasers panels.'): self.assert_location_exists("Mountain Floor 1 Right Row 5", 1) self.assert_location_exists("Mountain Bottom Floor Discard", 1) - with self.subTest("Test that \"disable_mountain_lasers_locations\" disables only Shortbox-Locked panels."): + with self.subTest('Test that "disable_mountain_lasers_locations" disables only Shortbox-Locked panels.'): self.assert_location_does_not_exist("Mountain Floor 1 Right Row 5", 2) self.assert_location_exists("Mountain Bottom Floor Discard", 2) - with self.subTest("Test that \"disable_challenge_lasers_locations\" disables only Longbox-Locked panels."): + with self.subTest('Test that "disable_challenge_lasers_locations" disables only Longbox-Locked panels.'): self.assert_location_exists("Mountain Floor 1 Right Row 5", 3) self.assert_location_does_not_exist("Mountain Bottom Floor Discard", 3) - with self.subTest("Test that \"everything_is_eligible\" disables only Shortbox-Locked panels."): + with self.subTest('Test that "everything_is_eligible" disables only Shortbox-Locked panels.'): self.assert_location_does_not_exist("Mountain Floor 1 Right Row 5", 4) self.assert_location_does_not_exist("Mountain Bottom Floor Discard", 4) From 9a4e84efdc766825dff7fe8a58e545e100f4772f Mon Sep 17 00:00:00 2001 From: Mysteryem Date: Thu, 29 Aug 2024 07:11:02 +0100 Subject: [PATCH 38/60] AHIT: Fix moderate logic rules using add_rule instead of set_rule (#3850) The moderate logic for the Mafia Town Clock Tower Chest and Top of Ruined Tower with nothing, and for clearing Rock the Boat without Ice Hat were mistakenly using `add_rule` instead of `set_rule`, which was adding the condition of `and True` which had no effect. This patch corrects these moderate logic rules to use `set_rule` instead. --- worlds/ahit/Rules.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/worlds/ahit/Rules.py b/worlds/ahit/Rules.py index b716b793a797..5524802a8868 100644 --- a/worlds/ahit/Rules.py +++ b/worlds/ahit/Rules.py @@ -381,8 +381,8 @@ def set_moderate_rules(world: "HatInTimeWorld"): lambda state: can_use_hat(state, world, HatType.ICE), "or") # Moderate: Clock Tower Chest + Ruined Tower with nothing - add_rule(world.multiworld.get_location("Mafia Town - Clock Tower Chest", world.player), lambda state: True) - add_rule(world.multiworld.get_location("Mafia Town - Top of Ruined Tower", world.player), lambda state: True) + set_rule(world.multiworld.get_location("Mafia Town - Clock Tower Chest", world.player), lambda state: True) + set_rule(world.multiworld.get_location("Mafia Town - Top of Ruined Tower", world.player), lambda state: True) # Moderate: enter and clear The Subcon Well without Hookshot and without hitting the bell for loc in world.multiworld.get_region("The Subcon Well", world.player).locations: @@ -432,8 +432,8 @@ def set_moderate_rules(world: "HatInTimeWorld"): if world.is_dlc1(): # Moderate: clear Rock the Boat without Ice Hat - add_rule(world.multiworld.get_location("Rock the Boat - Post Captain Rescue", world.player), lambda state: True) - add_rule(world.multiworld.get_location("Act Completion (Rock the Boat)", world.player), lambda state: True) + set_rule(world.multiworld.get_location("Rock the Boat - Post Captain Rescue", world.player), lambda state: True) + set_rule(world.multiworld.get_location("Act Completion (Rock the Boat)", world.player), lambda state: True) # Moderate: clear Deep Sea without Ice Hat set_rule(world.multiworld.get_location("Act Completion (Time Rift - Deep Sea)", world.player), From 701a7faa714c5ea40e531b7025aa56af124de2ab Mon Sep 17 00:00:00 2001 From: Mysteryem Date: Thu, 29 Aug 2024 07:11:42 +0100 Subject: [PATCH 39/60] AHIT: Fix Time Rift - Alpine Skyline entrance logic (#3851) The `Time Rift - Alpine Skyline` region was incorrectly accessible from Alpine Free Roam without Hookshot Badge or Umbrella. One of the two regions that connects to the `Time Rift - Alpine Skyline` region is `Alpine Free Roam`. The problem here is that `Alpine Free Roam` corresponds to the intro section of Alpine Free Roam, but the Time Rift is actually found in-game in what equates to the `Alpine Skyline Area` region. The entrance connecting `Alpine Free Roam` to `Alpine Skyline Area` (`AFR -> Alpine Skyline Area`) requires the Hookshot Badge (and Umbrella if umbrella logic is enabled), but because the entrance to `Time Rift - Alpine Skyline` is placed in `Alpine Free Roam` instead, it was missing the hookshot/umbrella requirements. The missing Hookshot Badge and Umbrella requirements have been added to `Rules.set_rift_rules()` and `Rules.set_default_rift_rules()`. The entrances to the `Time Rift - Curly Tail Trail` and `Time Rift - The Twilight Bell` regions are also in the `Alpine Free Roam` region, but the logic for both of those entrances require event items that are only accessible from the `Alpine Skyline Area` region. --- worlds/ahit/Rules.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/worlds/ahit/Rules.py b/worlds/ahit/Rules.py index 5524802a8868..183248a0e6d7 100644 --- a/worlds/ahit/Rules.py +++ b/worlds/ahit/Rules.py @@ -855,6 +855,9 @@ def set_rift_rules(world: "HatInTimeWorld", regions: Dict[str, Region]): for entrance in regions["Time Rift - Alpine Skyline"].entrances: add_rule(entrance, lambda state: has_relic_combo(state, world, "Crayon")) + if entrance.parent_region.name == "Alpine Free Roam": + add_rule(entrance, + lambda state: can_use_hookshot(state, world) and can_hit(state, world, umbrella_only=True)) if world.is_dlc1(): for entrance in regions["Time Rift - Balcony"].entrances: @@ -933,6 +936,9 @@ def set_default_rift_rules(world: "HatInTimeWorld"): for entrance in world.multiworld.get_region("Time Rift - Alpine Skyline", world.player).entrances: add_rule(entrance, lambda state: has_relic_combo(state, world, "Crayon")) + if entrance.parent_region.name == "Alpine Free Roam": + add_rule(entrance, + lambda state: can_use_hookshot(state, world) and can_hit(state, world, umbrella_only=True)) if world.is_dlc1(): for entrance in world.multiworld.get_region("Time Rift - Balcony", world.player).entrances: From 97c313c1c4ed7fc889ce7ab074d0312b0f5829f8 Mon Sep 17 00:00:00 2001 From: Emily <35015090+EmilyV99@users.noreply.github.com> Date: Thu, 29 Aug 2024 02:12:58 -0400 Subject: [PATCH 40/60] APSudoku: Update setup guide, remove extraneous options page link (#3849) * APSudoku: Update setup guide, remove extraneous options page link * Apply suggestions from code review Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * clean up instructions * IP -> address --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --- worlds/apsudoku/__init__.py | 2 +- worlds/apsudoku/docs/setup_en.md | 38 ++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/worlds/apsudoku/__init__.py b/worlds/apsudoku/__init__.py index c6bd02bdc262..04422ddb23c6 100644 --- a/worlds/apsudoku/__init__.py +++ b/worlds/apsudoku/__init__.py @@ -4,7 +4,7 @@ from ..AutoWorld import WebWorld, World class AP_SudokuWebWorld(WebWorld): - options_page = "games/Sudoku/info/en" + options_page = False theme = 'partyTime' setup_en = Tutorial( diff --git a/worlds/apsudoku/docs/setup_en.md b/worlds/apsudoku/docs/setup_en.md index cf2c755bd837..ef5a87e0b058 100644 --- a/worlds/apsudoku/docs/setup_en.md +++ b/worlds/apsudoku/docs/setup_en.md @@ -1,9 +1,7 @@ # APSudoku Setup Guide ## Required Software -- [APSudoku](https://github.com/EmilyV99/APSudoku) -- Windows (most tested on Win10) -- Other platforms might be able to build from source themselves; and may be included in the future. +- [APSudoku](https://github.com/APSudoku/APSudoku) ## General Concept @@ -13,25 +11,33 @@ Does not need to be added at the start of a seed, as it does not create any slot ## Installation Procedures -Go to the latest release from the [APSudoku Releases page](https://github.com/EmilyV99/APSudoku/releases). Download and extract the `APSudoku.zip` file. +Go to the latest release from the [APSudoku Releases page](https://github.com/APSudoku/APSudoku/releases/latest). Download and extract the appropriate file for your platform. ## Joining a MultiWorld Game -1. Run APSudoku.exe -2. Under the 'Archipelago' tab at the top-right: - - Enter the server url & port number +1. Run the APSudoku executable. +2. Under `Settings` → `Connection` at the top-right: + - Enter the server address and port number - Enter the name of the slot you wish to connect to - Enter the room password (optional) - Select DeathLink related settings (optional) - - Press connect -3. Go back to the 'Sudoku' tab - - Click the various '?' buttons for information on how to play / control -4. Choose puzzle difficulty -5. Try to solve the Sudoku. Click 'Check' when done. - + - Press `Connect` +4. Under the `Sudoku` tab + - Choose puzzle difficulty + - Click `Start` to generate a puzzle +5. Try to solve the Sudoku. Click `Check` when done + - A correct solution rewards you with 1 hint for a location in the world you are connected to + - An incorrect solution has no penalty, unless DeathLink is enabled (see below) + +Info: +- You can set various settings under `Settings` → `Sudoku`, and can change the colors used under `Settings` → `Theme`. +- While connected, you can view the `Console` and `Hints` tabs for standard TextClient-like features +- You can also use the `Tracking` tab to view either a basic tracker or a valid [GodotAP tracker pack](https://github.com/EmilyV99/GodotAP/blob/main/tracker_packs/GET_PACKS.md) +- While connected, the number of "unhinted" locations for your slot is shown in the upper-left of the the `Sudoku` tab. (If this reads 0, no further hints can be earned for this slot, as every locations is already hinted) +- Click the various `?` buttons for information on controls/how to play ## DeathLink Support -If 'DeathLink' is enabled when you click 'Connect': -- Lose a life if you check an incorrect puzzle (not an _incomplete_ puzzle- if any cells are empty, you get off with a warning), or quit a puzzle without solving it (including disconnecting). -- Life count customizable (default 0). Dying with 0 lives left kills linked players AND resets your puzzle. +If `DeathLink` is enabled when you click `Connect`: +- Lose a life if you check an incorrect puzzle (not an _incomplete_ puzzle- if any cells are empty, you get off with a warning), or if you quit a puzzle without solving it (including disconnecting). +- Your life count is customizable (default 0). Dying with 0 lives left kills linked players AND resets your puzzle. - On receiving a DeathLink from another player, your puzzle resets. From ab5b986716dcb2c0f032048ed289eef9ea8aee72 Mon Sep 17 00:00:00 2001 From: Bryce Wilson Date: Wed, 28 Aug 2024 23:14:08 -0700 Subject: [PATCH 41/60] Pokemon Emerald: Move magma grunt (#3836) --- worlds/pokemon_emerald/rom.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/worlds/pokemon_emerald/rom.py b/worlds/pokemon_emerald/rom.py index 75d7d575846d..2c0b5021d099 100644 --- a/worlds/pokemon_emerald/rom.py +++ b/worlds/pokemon_emerald/rom.py @@ -114,6 +114,14 @@ def get_source_data(cls) -> bytes: def write_tokens(world: "PokemonEmeraldWorld", patch: PokemonEmeraldProcedurePatch) -> None: + # TODO: Remove when the base patch is updated to include this change + # Moves an NPC to avoid overlapping people during trainersanity + patch.write_token( + APTokenTypes.WRITE, + 0x53A298 + (0x18 * 7) + 4, # Space Center 1F event address + 8th event + 4-byte offset for x coord + struct.pack(" Date: Thu, 29 Aug 2024 02:15:49 -0400 Subject: [PATCH 42/60] LADX: Filter braces out of player names for hint text (#3831) * Filter braces out of player names for hint text * Filter out another spot --- worlds/ladx/LADXR/generator.py | 6 +++++- worlds/ladx/LADXR/locations/shop.py | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py index e6f608a92180..69e856f3541b 100644 --- a/worlds/ladx/LADXR/generator.py +++ b/worlds/ladx/LADXR/generator.py @@ -280,6 +280,8 @@ def gen_hint(): name = "Your" else: name = f"{world.multiworld.player_name[location.item.player]}'s" + # filter out { and } since they cause issues with string.format later on + name = name.replace("{", "").replace("}", "") if isinstance(location, LinksAwakeningLocation): location_name = location.ladxr_item.metadata.name @@ -288,7 +290,9 @@ def gen_hint(): hint = f"{name} {location.item} is at {location_name}" if location.player != world.player: - hint += f" in {world.multiworld.player_name[location.player]}'s world" + # filter out { and } since they cause issues with string.format later on + player_name = world.multiworld.player_name[location.player].replace("{", "").replace("}", "") + hint += f" in {player_name}'s world" # Cap hint size at 85 # Realistically we could go bigger but let's be safe instead diff --git a/worlds/ladx/LADXR/locations/shop.py b/worlds/ladx/LADXR/locations/shop.py index b68726665f5a..bee053716a04 100644 --- a/worlds/ladx/LADXR/locations/shop.py +++ b/worlds/ladx/LADXR/locations/shop.py @@ -18,7 +18,8 @@ def patch(self, rom, option, *, multiworld=None): mw_text = "" if multiworld: mw_text = f" for player {rom.player_names[multiworld - 1].encode('ascii', 'replace').decode()}" - + # filter out { and } since they cause issues with string.format later on + mw_text = mw_text.replace("{", "").replace("}", "") if self.custom_item_name: name = self.custom_item_name From d52827ebd2d86f05677d8d61c6dbd9ddd0cb0670 Mon Sep 17 00:00:00 2001 From: agilbert1412 Date: Thu, 29 Aug 2024 09:41:57 +0300 Subject: [PATCH 43/60] Stardew Valley: Fix Crimsonfish region (#3687) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * - Add Unit test for all the fish that require a specific region to be reachable * - Move the crimsonfish to the tide pools region * - Improved the unit test to be more thorough, add extended family fish to the test * - Moved the son of crimsonfish to the correct region as well * FFMQ: Fix reset protection (#3710) * Revert reset protection * Fix reset protection --------- Co-authored-by: alchav * - Take shipsanity moss out of shipsanity crops (#3709) * sc2: Removing unused dependency in requirements.txt (#3697) * sc2: Removing unused dependency in requirements.txt * sc2: Add missing newline in requirements.txt Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * WebHost: Fix NamedRange values clamping to the range (#3613) If a NamedRange has a `special_range_names` entry outside the `range_start` and `range_end`, the HTML5 range input will clamp the submitted value to the closest value in the range. These means that, for example, Pokemon RB's "HM Compatibility" option's "Vanilla (-1)" option would instead get posted as "0" rather than "-1". This change updates NamedRange to behave like TextChoice, where the select element has a `name` attribute matching the option, and there is an additional element to be able to provide an option other than the select element's choices. This uses a different suffix of `-range` rather than `-custom` that TextChoice uses. The reason is we need some way to decide whether to use the custom value or the select value, and that method needs to work without JavaScript. For TextChoice this is easy, if the custom field is empty use the select element. For NamedRange this is more difficult as the browser will always submit *something*. My choice was to only use the value from the range if the select box is set to "custom". Since this only happens with JS as "custom' is hidden, I made the range hidden under no-JS. If it's preferred, I could make the select box hidden instead. Let me know. This PR also makes the `js-required` class set `display: none` with `!important` as otherwise the class wouldn't work on any rule that had `display: flex` with more specificity than a single class. * Timespinner: migrate to new options api and correct random (#2485) * Implemented new options system into Timespinner * Fixed typo * Fixed typo * Fixed slotdata maybe * Fixes * more fixes * Fixed failing unit tests * Implemented options backwards comnpatibility * Fixed option fallbacks * Implemented review results * Fixed logic bug * Fixed python 3.8/3.9 compatibility * Replaced one more multiworld option usage * Update worlds/timespinner/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Updated logging of options replacement to include player name and also write it to spoiler Fixed generation bug Implemented review results --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Core: migrate item links out of main (#2914) * Core: move item linking out of main * add a test that item link option correctly validates * remove unused fluff --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> * Core: Rework accessibility (#1481) * rename locations accessibility to "full" and make old locations accessibility debug only * fix a bug in oot * reorder lttp tests to not override its overrides * changed the wrong word in the dict * :forehead: * update the manual lttp yaml * use __debug__ * update pokemon and messenger * fix conflicts from 993 * fix stardew presets * add that locations may be inaccessible to description * use reST format and make the items description one line so that it renders correctly on webhost * forgot i renamed that * add aliases for back compat * some cleanup * fix imports * fix test failure * only check "items" players when the item is progression * Revert "only check "items" players when the item is progression" This reverts commit ecbf986145e6194aa99a39c481d8ecd0736d5a4c. * remove some unnecessary diffs * CV64: Add ItemsAccessibility * put items description at the bottom of the docstring since that's it's visual order * : * rename accessibility reference in pokemon rb dexsanity * make the rendered tooltips look nicer * Shivers: New features and removes two missed options using the old options API (#3287) * Adds an option to have pot pieces placed local/non-local/anywhere Shivers nearly always finishes last in multiworld games due to the fact you need all 20 pot pieces to win and the pot pieces open very few location checks. This option allows the pieces to be placed locally. This should allow Shivers to be finished earlier. * New option: Choose how many ixupi captures are needed for goal completion New option: Choose how many ixupi captures are needed for goal completion * Fixes rule logic for location 'puzzle solved three floor elevator' Fixes rule logic for location 'puzzle solved three floor elevator'. Missing a parenthesis caused only the key requirement to be checked for the blue maze region. * Merge branch 'main' of https://github.com/GodlFire/Shivers * Revert "Merge branch 'main' of https://github.com/GodlFire/Shivers" This reverts commit bb08c3f0c2ef148fd24d7c7820cdfe936f7196e2. * Fixes issue with office elevator rule logic. * Bug fix, missing logic requirement for location 'Final Riddle: Guillotine Dropped' Bug fix, missing logic requirement for location 'Final Riddle: Guillotine Dropped' * Moves plaque location to front for better tracker referencing. * Tiki should be Shaman. * Hanging should be Gallows. * Merrick spelling. * Clarity change. * Changes new option to use new option API Changes new option to use new option API * Added sub regions for Ixupi -Added sub regions for Ixupi and moved ixupi capture checks into the sub region. -Added missing wax capture possible spot in Shaman room * Adds option for ixupi captures to be priority locations Adds option for ixupi captures to be priority locations * Consistency Consistency * Changes ixupi captures priority to default on toggle Changes ixupi captures priority to default on toggle * Docs update -Updated link to randomizer -Update some text to reflect the latest functionality -Replaced 'setting' with 'option' * New features/bug fixes -Adds an option to have completed pots in the item pool -Moved subterranean world information plaque to maze staircase * Cleanup Cleanup * Fixed name for moved location When moving a location and renaming it I forgot to fix the name in a second spot. * Squashed commit of the following: commit 630a3bdfb9414d8c57154f29253fce0cf67b6436 Merge: 8477d3c8 5e579200 Author: GodlFire <46984098+GodlFire@users.noreply.github.com> Date: Mon Apr 1 19:08:48 2024 -0600 Merge pull request #10 from ArchipelagoMW/main Merge main into branch commit 5e5792009cd3089ae61c5fdd208de1b79d183cb4 Author: Alchav <59858495+Alchav@users.noreply.github.com> Date: Mon Apr 1 12:08:21 2024 -0500 LttP: delete playerSettings.yaml (#3062) commit 9aeeeb077a9e894cd2ace51b58d537bcf7607d5b Author: CaitSith2 Date: Mon Apr 1 06:07:56 2024 -0700 ALttP: Re-mark light/dark world regions after applying plando connections (#2964) commit 35458380e6e08eab85203942b6415fd964907c84 Author: Bryce Wilson Date: Mon Apr 1 07:07:11 2024 -0600 Pokemon Emerald: Fix wonder trade race condition (#2983) commit 4ac1866689d01dc6693866ee8b1236ad6fea114b Author: Alchav <59858495+Alchav@users.noreply.github.com> Date: Mon Apr 1 08:06:31 2024 -0500 ALTTP: Skull Woods Inverted fix (#2980) commit 4aa03da66e1a8c99fc31c163c1a23fb0bd772c15 Author: Fabian Dill Date: Mon Apr 1 15:06:02 2024 +0200 Factorio: fix attempting to create savegame with not filename safe characters (#2842) commit 24a03bc8b6b406c0925eedf415dcef47e17fdbaa Author: Silvris <58583688+Silvris@users.noreply.github.com> Date: Mon Apr 1 08:02:26 2024 -0500 KDL3: fix shuffled animals not actually being random (#3060) commit f813a7005fadb1c56bb93fee6147b63d9df2b720 Author: Aaron Wagener Date: Sun Mar 31 11:11:10 2024 -0500 The Messenger: update docs formatting and fix outdated info (#3033) * The Messenger: update docs formatting and fix outdated info * address review feedback * 120 chars commit 2a0b7e0def5c00cc2ac273b22581b3cde3b6f6a6 Author: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com> Date: Sun Mar 31 09:55:55 2024 -0600 CV64: A couple of very small docs corrections. (#3057) commit 03d47e460e434b897b313c2ba452d785ecbacebe Author: Ixrec Date: Sun Mar 31 16:55:08 2024 +0100 A Short Hike: Clarify installation instructions (#3058) * Clarify installation instructions * don't mention 'config' folder since it isn't created until the game starts commit e546c0f7ff2456ddb919a1b65a437a1c61b07479 Author: Silvris <58583688+Silvris@users.noreply.github.com> Date: Sun Mar 31 10:50:31 2024 -0500 Yoshi's Island: add patch suffix (#3061) commit 2ec93ba82a969865a8addc98feb076898978c8e3 Author: Bryce Wilson Date: Sun Mar 31 09:48:59 2024 -0600 Pokemon Emerald: Fix inconsistent location name (#3065) commit 4e3d3963941934c77573e6e0b699edf9e26cd647 Author: Aaron Wagener Date: Sun Mar 31 10:47:11 2024 -0500 The Messenger: Fix precollected notes not being removed from the itempool (#3066) * The Messenger: fix precollected notes not being properly removed from pool * The Messenger: bump required client version commit 72c53513f8bdab5506ffa972c1bf6f8573f097d7 Author: Fabian Dill Date: Sun Mar 31 03:57:59 2024 +0200 WebHost: fix /check creating broken yaml files if files don't end with a newline (#3063) commit b7ac6a4cbd54d5f8e6672e4a6c6ea708e7e6d4de Author: Aaron Wagener Date: Fri Mar 29 20:14:53 2024 -0500 The Messenger: Fix various portal shuffle issues (#2976) * put constants in a bit more sensical order * fix accidental incorrect scoping * fix plando rules not being respected * add docstrings for the plando functions * fix the portal output pools being overwritten * use shuffle and pop instead of removing by content so plando can go to the same area twice * move portal pool rebuilding outside mapping creation * remove plando_connection cleansing since it isn't shared with transition shuffle commit 5f0112e78365d19f04e22af92d6ad1f52d264b1f Author: Zach Parks Date: Fri Mar 29 19:13:51 2024 -0500 Tracker: Add starting inventory to trackers and received items table. (#3051) commit bb481256de2a511d3b114f164061d440026be4c4 Author: Aaron Wagener Date: Thu Mar 28 21:48:40 2024 -0500 Core: Make fill failure error more human parseable (#3023) commit 301d9de9758e360ccec5399f3f9d922f1c034e45 Author: Aaron Wagener Date: Thu Mar 28 19:31:59 2024 -0500 Docs: adding games rework (#2892) * Docs: complete adding games.md rework * remove all the now unused images * review changes * address medic's review * address more comments commit 9dc708978bd00890afcd3426f829a5ac53cbe136 Author: Trevor L <80716066+TRPG0@users.noreply.github.com> Date: Thu Mar 28 18:26:58 2024 -0600 Hylics 2: Fix invalid multiworld data, use `self.random` instead of `self.multiworld.random` (#3001) * Hylics 2: Fixes * Rewrite loop commit 4391d1f4c13cdf2295481d8c51f9ef8f58bf8347 Author: Bryce Wilson Date: Thu Mar 28 18:05:39 2024 -0600 Pokemon Emerald: Fix opponents learning non-randomized TMs (#3025) commit 5d9d4ed9f1e44309f1b53f12413ad260f1b6c983 Author: black-sliver <59490463+black-sliver@users.noreply.github.com> Date: Fri Mar 29 01:01:31 2024 +0100 SoE: update to pyevermizer v0.48.0 (#3050) commit c97215e0e755224593fdd00894731b59aa415e19 Author: Scipio Wright Date: Thu Mar 28 17:23:37 2024 -0400 TUNIC: Minor refactor of the vanilla_portals function (#3009) * Remove unused, change an if to an elif * Remove unused import commit eb66886a908ad75bbe71fac9bb81a0177e05e816 Author: Alchav <59858495+Alchav@users.noreply.github.com> Date: Thu Mar 28 16:23:01 2024 -0500 SC2: Don't Filter Excluded Victory Locations (#3018) commit de860623d17d274289e3e4ab13650f2382e2e0b8 Author: Fabian Dill Date: Thu Mar 28 22:21:56 2024 +0100 Core: differentiate between unknown worlds and broken worlds in error message (#2903) commit 74b2bf51613a968eb57a5b138a7ad191324b2dd8 Author: Bryce Wilson Date: Thu Mar 28 15:20:55 2024 -0600 Pokemon Emerald: Exclude norman trainer location during norman goal (#3038) commit 74ac66b03228988d0885cff556f962a04873cc54 Author: BadMagic100 Date: Thu Mar 28 08:49:19 2024 -0700 Hollow Knight: 0.4.5 doc revamp and default options tweaks (#2982) Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> commit 80d7ac416493a540548aad67981202a1483b5e53 Author: Silvris <58583688+Silvris@users.noreply.github.com> Date: Thu Mar 28 09:41:32 2024 -0500 KDL3: RC1 Fixes and Enhancement (#3022) * fix cloudy park 4 rule, zero deathlink message * remove redundant door_shuffle bool when generic ER gets in, this whole function gets rewritten. So just clean it a little now. * properly fix deathlink messages, fix fill error * update docs commit 77311719fa0fa5b67fe92f437c3cfed16bd5136f Author: Ziktofel Date: Thu Mar 28 15:38:34 2024 +0100 SC2: Fix HERC upgrades (#3044) commit cfc1541be9e92f1f59b21f4a81f96fc88f4d9f7e Author: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Thu Mar 28 15:19:32 2024 +0100 Docs: Mention the "last received item index" paradigm in the network protocol docs (#2989) Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> commit 4d954afd9b2311248083fc389ac737995985be86 Author: Scipio Wright Date: Thu Mar 28 10:11:20 2024 -0400 TUNIC: Add link to AP plando guide to connection plando section of game page (#2993) commit 17748a4bf1cfd5cc11c6596a09ffc1f01434340f Author: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> Date: Thu Mar 28 10:00:10 2024 -0400 Launcher, Docs: Update UI and Set-Up Guide to Reference Options (#2950) commit 9182fe563fc18ed4ccaa8370cfed88407140398e Author: Entropynines <163603868+Entropynines@users.noreply.github.com> Date: Thu Mar 28 06:56:35 2024 -0700 README: Remove outdated information about launchers (#2966) Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> commit bcf223081facd030aa706dc7430a72bcf2fdadc9 Author: t3hf1gm3nt <59876300+t3hf1gm3nt@users.noreply.github.com> Date: Thu Mar 28 09:54:56 2024 -0400 TLOZ: Fix markdown issue with game info page (#2985) commit fa93488f3fceac6c2f51851766543cab3ba121e6 Author: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Date: Thu Mar 28 09:46:00 2024 -0400 Docs: Consistent naming for "connection plando" (#2994) commit db15dd4bde442aad99048224bdb0d7dc28c26717 Author: chandler05 <66492208+chandler05@users.noreply.github.com> Date: Thu Mar 28 08:45:19 2024 -0500 A Short Hike: Fix incorrect info in docs (#3016) commit 01cdb0d761a82349afaeb7222b4b59cb1766f4a0 Author: PoryGone <98504756+PoryGone@users.noreply.github.com> Date: Thu Mar 28 09:44:23 2024 -0400 SMW: Update World Doc for v2.0 Features (#3034) Co-authored-by: Scipio Wright commit d0ac2b744eac438570e6a2333e76fa212be66534 Author: panicbit Date: Thu Mar 28 10:11:26 2024 +0100 LADX: fix local and non-local instrument placement (#2987) * LADX: fix local and non-local instrument placement * change confusing variable name commit 14f5f0127eb753eaf0431a54bebc82f5e74a1cb9 Author: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> Date: Thu Mar 28 04:42:35 2024 -0400 Stardew Valley: Fix potential soft lock with vanilla tools and entrance randomizer + Performance improvement for vanilla tool/skills (#3002) * fix vanilla tool fishing rod requiring metal bars fix vanilla skill requiring previous level (it's always the same rule or more restrictive) * add test to ensure fishing rod need fish shop * fishing rod should be indexed from 0 like a mentally sane person would do. * fishing rod 0 isn't real, but it definitely can hurt you. * reeeeeeeee commit cf133dde7275e171d388fb466b9ed719ab7ed7c8 Author: Bryce Wilson Date: Thu Mar 28 02:32:27 2024 -0600 Pokemon Emerald: Fix typo (#3020) commit ca1812181106a3645e7f7af417590024b377b25e Author: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> Date: Thu Mar 28 04:27:49 2024 -0400 Stardew Valley: Fix generation fail with SVE and entrance rando when Wizard Tower is in place of Sprite Spring (#2970) commit 1d4512590e0b78355e5c10174a9c6749e1098a72 Author: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Wed Mar 27 21:09:09 2024 +0100 requirements.txt: _ instead of - to make PyCharm happy (#3043) commit f7b415dab00338443b68eba51f42614fc40b9152 Author: agilbert1412 Date: Tue Mar 26 19:40:58 2024 +0300 Stardew valley: Game version documentation (#2990) Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> commit 702f006c848c05b847e85f7dbedeef68b70cdcc6 Author: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com> Date: Tue Mar 26 07:31:36 2024 -0600 CV64: Change all mentions of "settings" to "options" and fix a broken link (#3015) commit 98ce8f8844fd0c62214a5774609382cf6a6bc829 Author: Yussur Mustafa Oraji Date: Tue Mar 26 14:29:25 2024 +0100 sm64ex: New Options API and WebHost fix (#2979) commit ea47b90367b4a220c346d8057f3aeb4207d226a1 Author: Scipio Wright Date: Tue Mar 26 09:25:41 2024 -0400 TUNIC: You can grapple down here without the ladder, neat (#3019) commit bf3856866c5ea385d0ac58014c71addfdc92637e Author: agilbert1412 Date: Sun Mar 24 23:53:49 2024 +0300 Stardew Valley: presets with some of the new available values for existing settings to make them more accurate (#3014) commit c0368ae0d48b4b2807c5238aeb7b14937282fc3e Author: Phaneros <31861583+MatthewMarinets@users.noreply.github.com> Date: Sun Mar 24 13:53:20 2024 -0700 SC2: Fixed missing upgrade from custom tracker (#3013) commit 36c83073ad8c2ae1912d390ee3976ba0e2eb3f4a Author: Salzkorn Date: Sun Mar 24 21:52:41 2024 +0100 SC2 Tracker: Fix grouped items pointing at wrong item IDs (#2992) commit 2b24539ea5b387a3b62063c8177c373e2e3f8389 Author: Ziktofel Date: Sun Mar 24 21:52:16 2024 +0100 SC2 Tracker: Use level tinting to let the player know which level he has of Replenishable Magazine (#2986) commit 7e904a1c78c91fb502706fe030a1f1765f734de4 Author: Ziktofel Date: Sun Mar 24 21:51:46 2024 +0100 SC2: Fix Kerrigan presence resolving when deciding which races should be used (#2978) commit bdd498db2321417374d572bff8beede083fef2b2 Author: Alchav <59858495+Alchav@users.noreply.github.com> Date: Fri Mar 22 15:36:27 2024 -0500 ALTTP: Fix #2290's crashes (#2973) commit 355223b8f0af1ee729ffa8b53eb717aa5bf283a4 Author: PinkSwitch <52474902+PinkSwitch@users.noreply.github.com> Date: Fri Mar 22 15:35:00 2024 -0500 Yoshi's Island: Implement New Game (#2141) Co-authored-by: Silvris <58583688+Silvris@users.noreply.github.com> Co-authored-by: Alchav <59858495+Alchav@users.noreply.github.com> Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> commit aaa3472d5d8d8a7a710bd38386d9eb34046a5578 Author: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Fri Mar 22 21:30:51 2024 +0100 The Witness: Fix seed bleed issue (#3008) commit 96d93c1ae313bb031e983c0d40d8be199b302df1 Author: chandler05 <66492208+chandler05@users.noreply.github.com> Date: Fri Mar 22 15:30:23 2024 -0500 A Short Hike: Add option to customize filler coin count (#3004) Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> commit ca549df20a0a07c30ee2e1bbc2498492b919604d Author: Silvris <58583688+Silvris@users.noreply.github.com> Date: Fri Mar 22 15:29:24 2024 -0500 CommonClient: fix hint tab overlapping (#2957) Co-authored-by: Remy Jette commit 44988d430dc7d91eaeac7aad681dc024bc19ccce Author: Star Rauchenberger Date: Fri Mar 22 15:28:41 2024 -0500 Lingo: Add trap weights option (#2837) commit 11b32f17abebc08a6140506a375179f8a46bcfe6 Author: Danaël V <104455676+ReverM@users.noreply.github.com> Date: Fri Mar 22 12:46:14 2024 -0400 Docs: replacing "setting" to "option" in world docs (#2622) * Update contributing.md * Update contributing.md * Update contributing.md * Update contributing.md * Update contributing.md * Update contributing.md Added non-AP World specific information * Update contributing.md Fixed broken link * Some minor touchups * Update Contributing.md Draft for version with picture * Update contributing.md Small word change * Minor updates for conciseness, mostly * Changed all instances of settings to options in info and setup guides I combed through all world docs and swapped "setting" to "option" when this was refering to yaml options. I also changed a leftover "setting" in option.py * Update contributing.md * Update contributing.md * Update setup_en.md Woops I forgot one * Update Options.py Reverted changes regarding options.py * Update worlds/noita/docs/en_Noita.md Co-authored-by: Scipio Wright * Update worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md revert change waiting for that page to be updated * Update worlds/witness/docs/setup_en.md * Update worlds/witness/docs/en_The Witness.md * Update worlds/soe/docs/multiworld_en.md Fixed Typo Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * Update worlds/witness/docs/en_The Witness.md * Update worlds/adventure/docs/en_Adventure.md * Update worlds/witness/docs/setup_en.md * Updated Stardew valley to hopefully get rid of the merge conflicts * Didn't work :dismay: * Delete worlds/sc2wol/docs/setup_en.md I think this will fix the merge issue * Now it should work * Woops --------- Co-authored-by: Scipio Wright Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> commit 218cd45844f9d733618af9088941156cd79b80bc Author: Silvris <58583688+Silvris@users.noreply.github.com> Date: Fri Mar 22 03:02:38 2024 -0500 APProcedurePatch: fix RLE/COPY incorrect sizing (#3006) * change class variables to instance variables * Update worlds/Files.py Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * Update worlds/Files.py Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * move required_extensions to tuple * fix missing tuple ellipsis * fix classvar mixup * rename tokens to _tokens. use hasattr * type hint cleanup * Update Files.py * check using isinstance instead * Update Files.py --------- Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> commit 4196bde597cdbb6186ff614294fd54ff043a0c99 Author: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Date: Thu Mar 21 16:38:36 2024 -0400 Docs: Fixing special_range_names example (#3005) commit 40f843f54d5970302caeb2a21b76a4845cf5c0ed Author: Star Rauchenberger Date: Thu Mar 21 11:00:53 2024 -0500 Lingo: Minor game data fixes (#3003) commit da333fbb0c88feedd4821a7bade3f56028a02111 Author: GodlFire <46984098+GodlFire@users.noreply.github.com> Date: Thu Mar 21 09:52:16 2024 -0600 Shivers: Adds missing logic rule for skull dial door location (#2997) commit 43084da23c719133fcae672e20c9b046e6ef8067 Author: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Thu Mar 21 16:51:29 2024 +0100 The Witness: Fix newlines in Witness option tooltips (#2971) commit 14816743fca366b52422ccb19add59d4960f17a3 Author: Scipio Wright Date: Thu Mar 21 11:50:07 2024 -0400 TUNIC: Shuffle Ladders option (#2919) commit 30a0aa2c85a7015e2072b5781ed1078965f62f4b Author: Star Rauchenberger Date: Thu Mar 21 10:46:53 2024 -0500 Lingo: Add item/location groups (#2789) commit f4b7c28a33bb163768871616023a8cf3879840b4 Author: Silvris <58583688+Silvris@users.noreply.github.com> Date: Wed Mar 20 17:45:32 2024 -0500 APProcedurePatch: hotfix changing class variables to instance variables (#2996) * change class variables to instance variables * Update worlds/Files.py Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * Update worlds/Files.py Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * move required_extensions to tuple * fix missing tuple ellipsis * fix classvar mixup * rename tokens to _tokens. use hasattr * type hint cleanup * Update Files.py * check using isinstance instead --------- Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> commit 12864f7b24028fa56135e599f0fe1642c9d2d377 Author: chandler05 <66492208+chandler05@users.noreply.github.com> Date: Wed Mar 20 22:44:09 2024 +0100 A Short Hike: Implement New Game (#2577) commit db02e9d2aabc0f4c1302ac761b3f5547ef00c7c5 Author: LiquidCat64 <74896918+LiquidCat64@users.noreply.github.com> Date: Wed Mar 20 15:03:25 2024 -0600 Castlevania 64: Implement New Game (#2472) commit 32315776ac0ac1a714eb9d58688c479e2038c658 Author: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> Date: Wed Mar 20 16:57:45 2024 -0400 Stardew Valley: Fix extended family legendary fishes being locations with fishsanity set to exclude legendary (#2967) commit e9620bea777ff1008a09c24a70bf523c94f22c29 Author: Magnemania <89949176+Magnemania@users.noreply.github.com> Date: Wed Mar 20 16:56:00 2024 -0400 SM64: Goal Logic and Hint Bugfixes (#2886) commit 183ca35bbaf6c805fdb53396d21d0cba34f9cc5e Author: qwint Date: Wed Mar 20 08:39:37 2024 -0500 CommonClient: Port Casting Bug (#2975) commit fcaaa197a19a3be03965c504ca78dd2c21ce1f84 Author: TheLX5 Date: Wed Mar 20 05:56:19 2024 -0700 SMW: Fixes for Bowser being defeatable on Egg Hunt and CI2 DC room access (#2981) commit 8f7b63a787a0ef05625ae2fad1768251aced0c87 Author: TheLX5 Date: Wed Mar 20 05:56:04 2024 -0700 SMW: Blocksanity logic fixes (#2988) commit 6f64bb98693556ac2635791381cc9651c365b324 Author: Scipio Wright Date: Wed Mar 20 08:46:31 2024 -0400 Noita: Remove newline from option description so it doesn't look bad on webhost (#2969) commit d0a9d0e2d1df641668f4f806b45f9577e69229f6 Author: Bryce Wilson Date: Wed Mar 20 06:43:13 2024 -0600 Pokemon Emerald: Bump required client version (#2963) commit 94650a02de62956eee8e7e41f61e8a41506b5842 Author: Silvris <58583688+Silvris@users.noreply.github.com> Date: Tue Mar 19 17:08:29 2024 -0500 Core: implement APProcedurePatch and APTokenMixin (#2536) * initial work on procedure patch * more flexibility load default procedure for version 5 patches add args for procedure add default extension for tokens and bsdiff allow specifying additional required extensions for generation * pushing current changes to go fix tloz bug * move tokens into a separate inheritable class * forgot the commit to remove token from ProcedurePatch * further cleaning from bad commit * start on docstrings * further work on docstrings and typing * improve docstrings * fix incorrect docstring * cleanup * clean defaults and docstring * define interface that has only the bare minimum required for `Patch.create_rom_file` * change to dictionary.get * remove unnecessary if statement * update to explicitly check for procedure, restore compatible version and manual override * Update Files.py * remove struct uses * ensure returning bytes, add token type checking * Apply suggestions from code review Co-authored-by: Doug Hoskisson * pep8 --------- Co-authored-by: beauxq Co-authored-by: Doug Hoskisson * Changes pot_completed_list to a instance variable instead of global. Changes pot_completed_list to a instance variable instead of global. The global variable was unintentional and was causing missmatch in pre_fill which would cause generation error. * Removing deprecated options getter * Adds back fix from main branch Adds back fix from main branch * Removing messenger changes that somehow got on my branch? Removing messenger changes that somehow got on my branch? * Removing messenger changes that are somehow on the Shivers branch Removing messenger changes that are somehow on the Shivers branch * Still trying to remove Messenger changes on Shivers branch Still trying to remove Messenger changes on Shivers branch * Review comments addressed. Early lobby access set as default. Review comments addressed. Early lobby access set as default. * Review comments addressed Review comments addressed * Review comments addressed. Option for priority locations removed. Option to have ixupi captures a priority has been removed and can be added again if Priority Fill is changed. See Issues #3467. * Minor Change Minor Change * Fixed ID 10 T Error Fixed ID 10 T Error * Front door option added to slot data Front door option added to slot data * Add missing .value on slot data Add missing .value on slot data * Small change to slot data Small change to slot data * Small change to slot data Why didn't this change get pushed github... * Forgot list Forgot list --------- Co-authored-by: Kory Dondzila Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Bomb Rush Cyberfunk: Fix Coil quest being in glitched logic too early (#3720) * Update Rules.py * Update Rules.py * Options: Always verify keys for VerifyKeys options (#3280) * Options: Always verify keys for VerifyKeys options * fix PlandoTexts * use OptionError and give a slightly better error message for which option it is * add the player name to the error * don't create an unnecessary list --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> * Docs: Add FFMQ French Setup Guide + Minor fixes to English Guide (#3590) * Add docs * Fix character * Configuration Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * ajuster Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * inclure Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * doublon Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * remplissage Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * autre Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * pouvoir Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * mappemonde Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * apostrophes Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * virgule Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * fournir Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * apostrophes 2 Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * snes9x Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * apostrophes 3 Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * options Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * lien Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * de laquelle Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * Étape de génération Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * apostrophes 4 Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * également Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * guillemets Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * guillemets 2 Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * adresse Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * Connect Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * seed Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> * Changer fichier yaml pour de configuration * Fix capitalization Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Fix capitalization 2 Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Fix typo+Add link to fr/en info page --------- Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Spire: Convert options, clean up random calls, and add DeathLink (#3704) * Convert StS options * probably a bad idea * Update worlds/spire/Options.py Co-authored-by: Scipio Wright --------- Co-authored-by: Kono Tyran Co-authored-by: Scipio Wright * Core: fix missing import for `MultiWorld.link_items()` (#3731) * Pokemon R/B: Removing Floats from NamedRange #3717 * Docs: Missed Full Accessibility mention/conversion #3734 * ChecksFinder: Refactor/Cleaning (#3725) * Update ChecksFinder * minor cleanup * Check for compatible name * Enable APWorld * Update setup_en.md * Update en_ChecksFinder.md * The client is getting updated instead * Qwint suggestions, ' -> ", streamline fill_slot_data * Oops, too many refactors --------- Co-authored-by: SunCat * OSRS: Implement New Game (#1976) * MMBN3: Press program now has proper color index when received remotely * Initial commit of OSRS untangled from MMBN3 branch * Fixes some broken region connections * Removes some locations * Rearranges locations to fill in slots left by removed locations * Adds starting area rando * Moves Oak and Willow trees to resource regions * Fixes various PEP8 violations * Refactor of regions * Fixes variable capture issue with region rules * Partial completion of brutal grind logic * Finishes can_reach_skill function * Adds skill requirements to location rules, fixes regions rules * Adds documentation for OSRS * Removes match statement * Updates Data Version to test mode to prevent item name caching * Fixes starting spawn logic for east varrock * Fixes river lum crossing logic to not assume you can phase across water * Prevents equipping items when you haven't unlocked them * Changes canoe logic to not require huge levels * Skeletoning out some data I'll need for variable task system * Adds csvs and parser for logic * Adds Items parsing * Fixes the spawning logic to not default to Chunksanity when you didn't pick it * Begins adding generation rules for data-driven logic * Moves region handling and location creating to different methods * Adds logic limits to Options * Begun the location generation has * Randomly generates tasks for each skill until populated * Mopping up improper names, adding custom logic, and fixes location rolling * Drastically cleans up the location rolling loop * Modifies generation to properly use local variables and pass unit tests * Game is now generating, but rules don't seem to work * Lambda capture, my old nemesis. We meet again * Fixes issue with Corsair Cove item requirement causing logic loop * Okay one more fix, another variable capture * On second thought lets not have skull sceptre tasks. 'Tis a silly place * Removes QP from item pool (they're events not items) * Removes Stronghold floor tasks, no varbit to track them * Loads CSV with pkutil so it can be used in apworld * Fixes logic of skill tasks and adds QP requirements to long grinds * Fixes pathing in pkgutil call * Better handling for empty task categories, no longer throws errors * Fixes order for progressive tasks, removes un-checkable spider task * Fixes logic issues related to stew and the Blurite caves * Fixes issues generating causing tests to sporadically fail * Adds missing task that caused off-by-one error * Updates to new Options API * Updates generation to function properly with the Universal Tracker (Thanks Faris) * Replaces runtime CSV parsing with pre-made python files generated from CSVs * Switches to self.random and uses random.choice instead of doing it manually * Fixes to typing, variable names, iterators, and continue conditions * Replaces Name classes with Enums * Fixes parse error on region special rules * Skill requirements check now returns an accessrule instead of being one that checks options * Updates documentation and setup guide * Adjusts maximum numbers for combat and general tasks * Fixes region names so dictionary lookup works for chunksanity * Update worlds/osrs/docs/en_Old School Runescape.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Update worlds/osrs/docs/en_Old School Runescape.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Updates readme.md and codeowners doc * Removes erroneous East Varrock -> Al Kharid connection * Changes to canoe logic to account for woodcutting level options * Fixes embarassing typo on 'Edgeville' * Moves Logic CSVs to separate repository, addresses suggested changes on PR * Fixes logic error in east/west lumbridge regions. Fixes incorrect List typing in main * Removes task types with weight 0 from the list of rollable tasks * Missed another place that the task type had to be removed if 0 weight * Prevents adding an empty task weight if levels are too restrictive for tasks to be added * Removes giant blank space in error message * Adds player name to error for not having enough available tasks --------- Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * TUNIC: Fix missing traversal req #3740 * TUNIC: Sort entrances in the spoiler log (#3733) * Sort entrances in spoiler log * Rearrange portal list to closer match the vanilla game order, for better spoiler and because I already did this mod-side * Add break (thanks vi) * KH2: Update the docs to support steam in the setup guide (#3711) * doc updates * add steam link * Update worlds/kh2/docs/setup_en.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update setup_en.md * Forgot to include these * Consistent styling * :) * version 3.3.0 --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * RoR2: Remove recursion from explore mode access rules (#3681) The access rules for " Chest n", " Shrine n" etc. locations recursively called state.can_reach() for the n-1 location name, with the n=1 location being the only location to have the actual access rule set. This patch removes the recursion, instead setting the actual access rule directly on each location, increasing the performance of checking accessibility of n>1 locations. Risk of Rain 2 was already quite fast to generate despite the recursion in the access rules, but with this patch, generating a multiworld with 200 copies of the template RoR2 yaml (and progression balancing disabled through a meta.yaml) goes from about 18s to about 6s for me. From generating the same seed before and after this patch, the same result is produced. * Aquaria: Logic bug fixes (#3679) * Fixing logic bugs * Require energy attack in the cathedral and energy form in the body * King Jelly can be beaten easily with only the Dual Form * I think that I have a problem with my left and right... * There is a monster that is blocking the path, soo need attack to pass * The Li cage is not accessible without the Sunken city boss * Removing useless space. Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Two more minors logic modification * Adapting tests to af9b6cd * Reformat the Region file --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * HK: add grub hunt goal (#3203) * makes grub hunt goal option that calculates the total available grubs (including item link replacements) and requires all of them to be gathered for goal completion * update slot data name for grub count * add option to set number needed for grub hub * updates to grub hunt goal based on review * copy/paste fix * account for 'any' goal and fix overriding non-grub goals * making sure godhome is in logic for any and removing redundancy on completion condition * fix typing * i hate typing * move to stage_pre_fill * modify "any" goal so all goals are in logic under minimal settings * rewrite grub counting to create lookups for grubs and groups that can be reused * use generator instead of list comprehension * fix whitespace merging wrong * minor code cleanup * DS3: Version 3.0.0 (#3128) * Update worlds/dark_souls_3/Locations.py Co-authored-by: Scipio Wright * Fix Covetous Silver Serpent Ring location * Update location groups This should cover pretty much all of the seriously hidden items. It also splits out miniboss drops, mimic drops, and hostile NPC drops. * Remove the "Guarded by Keys" group On reflection, I don't think this is actually that useful. It'll also get a lot muddier once we can randomize shops and ashes become pseudo-"keys". * Restore Knight Slayer's Ring classification * Support infusions/upgrades in the new DS3 mod system * Support random starting loadouts * Make an item's NPC status orthogonal to its category * Track location groups with flags * Track Archipelago/Offline mismatches on the server Also fix a few incorrect item names. * Add additional locations that are now randomizable * Don't put soul and multiple items in shops * Add an option to enable whether NG+ items/locations are included * Clean up useful item categorization There are so many weapons in the game now, it doesn't make sense to treat them all as useful * Add more variety to filler items * Iron out a few bugs and incompatibilities * Fix more silly bugs * Get tests passing * Update options to cover new item types Also recategorize some items. * Verify the default values of `Option`s. Since `Option.verify()` can handle normalization of option names, this allows options to define defaults which rely on that normalization. For example, it allows a world to exclude certain locations by default. This also makes it easier to catch errors if a world author accidentally sets an invalid default. * Make a few more improvements and fixes * Randomize Path of the Dragon * Mark items that unlock checks as useful These items all unlock missable checks, but they're still good to ahve in the game for variety's sake. * Guarantee more NPC quests are completable * Fix a syntax error * Fix rule definition * Support enemy randomization * Support online Yhorm randomization * Remove a completed TODO * Fix tests * Fix force_unique * Add an option to smooth out upgrade item progression * Add helpers for setting location/entrance rules * Support smoother soul item progression * Fill extra smoothing items into conditional locations as well as other worlds * Add health item smoothing * Handle infusions at item generation time * Handle item upgrades at genreation time * Fix Grave Warden's Ashes * Don't overwrite old rules * Randomize items based on spheres instead of DS3 locations * Add a smoothing option for weapon upgrades * Add rules for crow trades * Small fixes * Fix a few more bugs * Fix more bugs * Try to prevent Path of the Dragon from going somewhere it doesn't work * Add the ability to provide enemy presets * Various fixes and features * Bug fixes * Better Coiled Sword placement * Structure DarkSouls3Location more like DarkSouls3Item * Add events to make DS3's spheres more even * Restructure locations to work like items do now * Add rules for more missable locations * Don't add two Storm Rulers * Place Hawk Ring in Farron Keep * Mark the Grass Crest Shield as useful * Mark new progression items * Fix a bug * Support newer better Path of the Dragon code * Don't lock the player out of Coiled Sword * Don't create events for missable locations * Don't throw strings * Don't smooth event items * Properly categorize Butcher Knife * Be more careful about placing Yhorm in low-randomization scenarios * Don't try to smooth DLC items with DLC disabled * Fix another Yhorm bug * Fix upgrade/infusion logic * Remove the PoolType option This distinction is no longer meaningful now that every location in the game of each type is randomized * Categorize HWL: Red Eye Orb as an NPC location * Don't place Storm Ruler on CA: Coiled Sword * Define flatten() locally to make this APWorld capable * Fix some more Leonhard weirdness * Fix unique item randomization * Don't double Twin Dragon Greatshield * Remove debugging print * Don't add double Storm Ruler Also remove now-redundant item sorting by category in create_items. * Don't add double Storm Ruler Also remove now-redundant item sorting by category in create_items. * Add a missing dlc_enabled check * Use nicer options syntax * Bump data_version * Mention where Yhorm is in which world * Better handle excluded events * Add a newline to Yhorm location * Better way of handling excluded unradomized progression locations * Fix a squidge of nondeterminism * Only smooth items from this world * Don't smooth progression weapons * Remove a location that doesn't actually exist in-game * Classify Power Within as useful * Clarify location names * Fix location requirements * Clean up randomization options * Properly name Coiled Sword location * Add an option for configuring how missable items are handled * Fix some bugs from location name updates * Fix location guide link * Fix a couple locations that were busted offline * Update detailed location descriptions * Fix some bugs when generating for a multiworld * Inject Large Leather Shield * Fix a few location issues * Don't allow progression_skip_balancing for unnecessary locs * Update some location info * Don't uniquify the wrong items * Fix some more location issues * More location fixes * Use hyphens instead of parens for location descriptions * Update and fix more locations * Fix Soul of Cinder boss name * Fix some logic issues * Add item groups and document item/location groups * Fix the display name for "Impatient Mimics" * Properly handle Transposing Kiln and Pyromancer's Flame * Testing * Some fixes to NPC quests, late basin, and transposing kiln * Improve a couple location names * Split out and improve missable NPC item logic * Don't allow crow trades to have foreign items * Fix a variable capture bug * Make sure early items are accessible early even with early Castle * Mark ID giant slave drops as missable * Make sure late basin means that early items aren't behind it * Make is_location_available explicitly private * Add an _add_item_rule utility that checks availability * Clear excluded items if excluded_locations == "unnecessary" * Don't allow upgrades/infusions in crow trades * Fix the documentation for deprecated options * Create events for all excluded locations This allows `can_reach` logic to work even if the locations are randomized. * Fix up Patches' and Siegward's logic based on some manual testing * Factor out more sub-methods for setting location rules * Oops, left these in * Fixing name * Left that in too * Changing to NamedRange to support special_range_names * Alphabetizing * Don't call _is_location_available on foreign locations * Add missing Leonhard items * Changing late basin to have a post-small-doll option * Update basin option, add logic for some of Leonhard Hawkwood and Orbeck * Simplifying an option, fixing a copy-paste error * Removing trailing whitespace * Changing lost items to go into start inventory * Revert Basin changes * Oops * Update Options.py * Reverting small doll changes * Farron Keep boss requirement logic * Add Scroll for late_dlc * Fixing excluded unnecessary locations * Adding Priestess Ring as being after UG boss * Removing missable from Corvian Titanite Slab * Adding KFF Yhorm boss locks * Screams about Creighton * Elite Knight Set isn't permanently missable * Adding Kiln requirement to KFF * fixing valid_keys and item groups * Fixing an option-checker * Throwing unplaceable Storm Ruler into start inventory * Update locations * Refactor item injection * Update setup doc * Small fixes * Fix another location name * Fix injection calculation * Inject guaranteed items along with progression items * Mark boss souls as required for access to regions This allows us to set quest requirements for boss souls and have them automatically propagated to regions, means we need less machinery for Yhorm bosses, and allows us to get rid of a few region-transition events. * Make sure Sirris's quest can be completed before Pontiff * Removing unused list * Changing dict to list * Removing unused test * Update __init__.py * self.multiworld.random -> self.random (#9) * Fix some miscellaneous location issues * Rewrite the DS3 intro page/FAQ * Removing modifying the itempool after fill (#7) Co-authored-by: Natalie Weizenbaum * Small fixes to the setup guide (#10) Small fixes, adding an example for connecting * Expanded Late Basin of Vows and Late DLC (#6) * Add proper requirements for CD: Black Eye Orb * Fix Aldrich's name * Document the differences with the 2.x.x branch * Don't crash if there are more items than locations in smoothing * Apply suggestions from code review Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Code review * Fix _replace_with_filler * Don't use the shared flatten function in SM * Track local items separately rather than iterating the multiworld * Various formatting/docs changes suggested by PyCharm (#12) * Drop deprecated options * Rename "offline randomizer" to "static randomizer" which is clearer * Move `enable_*_locations` under removed options. * Avoid excluded locations for locally-filled items * Adding Removed options to error (#14) * Changes for WebHost options display and the options overhaul * unpack iterators in item list (#13) * Allow worlds to add options to prebuilt groups Previously, this crashed because `typing.NamedTuple` fields such as `group.name` aren't assignable. Now it will only fail for group names that are actually incorrectly cased, and will fail with a better error message. * Style changes, rename exclude behavior options, remove guaranteed items option * Spacing/Formatting (#18) * Various Fixes (#19) * Universally Track Yhorm (#20) * Account for excluded and missable * These are behaviors now * This is singular, apparently * Oops * Fleshing out the priority process * Missable Titanite Lizards and excluded locations (#22) * Small style/efficiency changes * Final passthrough fixes (#24) * Use rich option formatting * Make the behavior option values actual behaviors (#25) * Use != * Remove unused flatten utility * Some changes from review (#28) * Fixing determinism and making smooth faster (#29) * Style change * PyCharm and Mypy fixes (#26) Co-authored-by: Scipio Wright * Change yhorm default (#30) * Add indirect condition (#27) * Update worlds/dark_souls_3/docs/locations_en.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Ship all item IDs to the client This avoids issues where items might get skipped if, for instance, they're only in the starting inventory. * Make sure to send AP IDs for infused/upgraded weapons * Make `RandomEnemyPresetOption` compatible with ArchipelagoMW/Archipelago#3280 (#31) * Fix cast * More typing and small fixes (#32) --------- Co-authored-by: Scipio Wright Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Co-authored-by: Exempt-Medic Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> Co-authored-by: Doug Hoskisson Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> * Core: Check parent_region.can_reach first in Location.can_reach (#3724) * Core: Check parent_region.can_reach first in Location.can_reach The comment about self.access_rule computing faster on average appears to no longer be correct with the current caching system for region accessibility, resulting in self.parent_region.can_reach computing faster on average. Generation of template yamls for each game that does not require a rom to generate, generated with `python -O .\Generate.py --seed 1` (all durations averaged over at 4 or 5 generations): Full generation with `spoiler: 1` and no progression balancing: 89.9s -> 72.6s Only output from above case: 2.6s -> 2.2s Full generation with `spoiler: 3` and no progression balancing: 769.9s -> 627.1s Only playthrough calculation + paths from above case: 680.5s -> 555.3s Full generation with `spoiler: 1` with default progression balancing: 123.5s -> 98.3s Only progression balancing from above case: 11.3s -> 9.6s * Update BaseClasses.py * Update BaseClasses.py * Update BaseClasses.py --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> * Core: Speed up CollectionState.copy() using built-in copy methods (#3678) All the types being copied are built-in types with their own `copy()` methods, so using the `copy` module was a bit overkill and also slower. This patch replaces the use of the `copy` module in `CollectionState.copy()` with using the built-in `.copy()` methods. The copying of `reachable_regions` and `blocked_connections` was also iterating the keys of each dictionary and then looking up the value in the dictionary for that key. It is faster, and I think more readable, to iterate the dictionary's `.items()` instead. For me, when generating a multiworld including the template yaml of every world with `python -O .\Generate.py --skip_output`, this patch saves about 2.1s. The overall generation duration for these yamls varies quite a lot, but averages around 160s for me, so on average this patch reduced overall generation duration (excluding output duration) by around 1.3%. Timing comparisons were made by calling time.perf_counter() at the start and end of `CollectionState.copy()`'s body, and summing the differences between the starts and ends of the method body into a global variable that was printed at the end of generation. Additional timing comparisons were made, using the `timeit` module, of the individual function calls or dictionary comprehensions used to perform the copying. The main performance cost was `copy.deepcopy()`, which gets slow as the number of keys multiplied by the number of values within the sets/Counters gets large, e.g., to deepcopy a `dict[int, Counter[str]]` with 100 keys and where each Counter contains 100 keys was 30x slower than most other tested copying methods. Increasing the number of dict keys or Counter keys only makes it slower. * HK: fix iterating all worlds instead of only HK worlds in stage_pre_fill (#3750) Would cause generation to fail when generating with HK and another game. Mistake in 6803c373e5ff. * DOOM, DOOM II: Update steam URLs (#3746) * TLOZ: world: multiworld (#3752) * SoE: fix determinism (#3745) Fixes randomly placed ingredients not being deterministic (depending on settings) and in turn also fixes logic not being deterministic if they get replaced by fragments. * Core: fix invalid __package__ of zipped worlds (#3686) * fix invalid package fix * add comment describing fix * Clique: Update to new options API (#3759) * Timespinner: Fix eels check logic #3777 * TUNIC: Add note to Universal Tracker stuff #3772 * Core: change start inventory from pool to warn when nothing to remove (#3158) * makes start inventory from pool warn and fixes the itempool to match when it can not find a matching item to remove * calc the difference correctly * save new filler and non-removed items differently so we don't remove existing items at random * Undertale: Fix slot_data and options.as_dict() (#3774) * Undertale: Fixing slot_data * Booleans were difficult * Core: Error on empty options.as_dict (#3773) * Error on empty options.as_dict * ValueError instead * Apply suggestions from code review Co-authored-by: Aaron Wagener --------- Co-authored-by: Aaron Wagener Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> * Core: Remove broken unused code from Options.py (#3781) "Unused" is a baseless assertion, but this code path has been crashing on the first statement for 6 months and noone's complained * Core: Two Small Fixes (#3782) * Core: recontextualize `CollectionState.collect` (#3723) * Core: renamed `CollectionState.collect` arg from `event` to `prevent_sweep` and remove forced collection * Update TestDungeon.py --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> * Core: dump all item placements for generation failures. (#3237) * Core: dump all item placements for generation failures * pass the multiworld from remaining fill * change how the args get handled to fix formatting --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> * Tests: fix the all games multiworld test (#3788) * TUNIC: Swap from multiworld.get to world.get for applicable things (#3789) * Swap from multiworld.get to world.get for applicable things * Why was this even here in the first place? * I have no idea (#3791) * TUNIC: Add off and on aliases for the Entrance Rando option #3794 * Stardew Valley: Add Quality Bobber in the logic rules for fish quality gold and above #3792 * Core: Require excluded locations to be reachable with full/locations accessibility (#3802) * Make excludeds reachable * Update all_state tests * Lingo: Fixed Initiated-side Eight Door not opening (#3793) * TUNIC: Give the fox a gun (in logic) (very small PR) (#3790) * Add bomb wall logic * Remove option call from can_shop * Gun for the envoy blocking Quarry * has_sword -> can_shop on cube cave entrance region * TLOZ: Fix non-deterministic item pool generation (#3779) * TLOZ: Fix non-deterministic item pool generation The way the item pool was constructed involved iterating unions of sets. Sets are unordered, so the order of iteration of these combined sets would be non-deterministic, resulting in the items in the item pool being generated in a different order with the same seed. Rather than creating unions of sets at all, the original code has been replaced with using Counter objects. As a dict subclass, Counter maintains insertion order, and its update() method makes it simple to combine the separate item dictionaries into a single dictionary with the total count of each item across each of the separate item dictionaries. Fixes #3664 - After investigating more deeply, the only differences I could find between generations of the same seed was the order of items created by TLOZ, so this patch appears to fix the non-deterministic generation issue. I did manage to reproduce the non-deterministic behaviour with just TLOZ in the end, but it was very rare. I'm not entirely sure why generating with SMZ3 specifically would cause the non-deterministic behaviour in TLOZ to be frequently present, whereas generating with other games or multiple TLOZ yamls would not. * Change import order --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> * Docs: Update 'tag' documentation (#3632) * Add tag docs for HintGame * Apply suggestions from code review Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * Make Tracker/TextOnly consistent with previous commit * Apply suggestion Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * fix spacing * Apply suggestion Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * apply suggestion correcting footnotes Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * [OSRS] Fixes Incorrect filler item names causing failures on tests. (#3768) * Updates filler item names to match the actual item names * Adds more descriptive error message in case this error comes back * Properly raises exception instead of just text * Replaces exception with assert * Fix !remaining for cross-world items (#3732) * Fix !remaining for other worlds * Typing fixes for the previous change * Update LocationStore test to match what get_remaining now returns * Core: early_local != local_early #3780 * Pokemon Emerald: Ensure dig tutor is always usable (#3660) * Pokemon Emerald: Ensure dig tutor is always usable * Pokemon Emerald: Clarify comment Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Core: type for `CommonContext.ui` (#3796) * Core: type for `CommonContext.ui` * use `Optional` * VVVVVV: Make unnecessary Trinkets filler (#3806) * Make unnecessary trinkets filler * Proper syntax Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Kingdom Hearts: Implement New Game (#3201) * Added Final Ansem Goal * Update __init__.py * Update Rules.py * New EotW logic * Update __init__.py * Update __init__.py * Update Items.py * Update Rules.py * Rename Location to be more meaningful, logic fixes * Removed Aerith locations * Change to allow randomized keyblade stats * Fixed incorrect option description. Fixed victory locations for alternative win condition settings * Commit * Lots of changes * Fixes * Fixes * Update Rules.py * Update Rules.py * Update Rules.py * Update Rules.py * Fixes * Update Rules.py * Update Rules.py * Update Options.py * Old Book is not required * Added Jungle Slider * Add Cid Check * Add Wonderland Book Check * Add OC Green Trinity * Add Inferno Band Event * Add Kurt Zisa Zantetsuken and Unknown EXP Necklace checks * Update Locations.py * Fix Final Ansem Goal * Update __init__.py * Update __init__.py * Add options to exclude super bosses and 100 acre wood * Fix puppies trp, remove cid check * Fix 100 Acre Wood Option * Material to Empty Bottle * Fixed rules, location names, etc * Fix super bosses * Add item + location groups, level sanity * Fix location and item group names * Add Bad Starting Weapons Option * Logic Error for 100 Acre Wood * Update Rules.py * Update __init__.py * Fixes related to randomized keyblade stats and super bosses * Credits and Fixes * Logic fixes, location name group changes * Update Options.py * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Scipio Wright * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Scipio Wright * Update .gitignore * Update CODEOWNERS * Update docs/CODEOWNERS Co-authored-by: Scipio Wright * Fixed Atlantica item group name * Update CODEOWNERS * Update Client.py * Update Items.py * Update __init__.py Co-authored-by: Scipio Wright * Update Rules.py Co-authored-by: Scipio Wright * Update Rules.py Co-authored-by: Scipio Wright * Update Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Fixed report group name * Fixes for PR * Update Options.py * Push changes for making the Final Rest Door appear, few option fixes * Update Rules.py * Website formatting, 0 min for reports, option description typo * Create KH1Client.py * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Scipio Wright * Update Options.py * Update Options.py * Update Rules.py * Update Rules.py * Update Rules.py * Add Donald and Goofy Death Link * Add fight logic for optional bosses * Update __init__.py * Update Options.py * Update worlds/kh1/Options.py Co-authored-by: Scipio Wright * Update Client.py * Update kh1_en.md * Update __init__.py * Cleaning up for PR * Update Client.py * Added event locations for vanilla items * Add proper location groups and auto hint synth shop items when entering * so many changes * Update Rules.py * fixed oathkeeper and crabclaw logic * Update Rules.py * Update Rules.py * Update Rules.py * Update Rules.py * Update en_Kingdom Hearts.md * Update en_Kingdom Hearts.md * fixing text * Update kh1_en.md * Addition of new key items * Update Regions.py * Push for start item from pool test * Update worlds/kh1/Options.py Co-authored-by: Scipio Wright * Document update * Update Rules.py * Added starting world range and final rest goal option * Update kh1_en.md * Update en_Kingdom Hearts.md * Update __init__.py * Update __init__.py * Clean up options descriptions * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/Options.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright * Update worlds/kh1/Client.py Co-authored-by: Scipio Wright * Fix grammar in document * Update __init__.py * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Removed return type * Update __init__.py * Update __init__.py * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright * Update __init__.py * Fix missing i replacement, rework set rules to use "self" instead of a million arguments * Update KH1Client.py Co-authored-by: Doug Hoskisson * Reformat rules, fix bug with exp mult, add to readme * Clean up regions, fix client * Fix item send prompt * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/test/test_goal.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Items.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Locations.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Regions.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Locations.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Locations.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Items.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Regions.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Regions.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/__init__.py Co-authored-by: Doug Hoskisson * Fix so many suggestions * removed junk in missable locations option * Update __init__.py * Change credits order * Update en_Kingdom Hearts.md * Standardize punctuation * Update en_Kingdom Hearts.md * Update en_Kingdom Hearts.md * Update Regions.py * Removed "disclude" options in generation fillers * Update Rules.py * Update __init__.py * Fix cemetery typo * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Add option groups and option presets * Update worlds/kh1/__init__.py That's a good idea! Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Presets.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * fixed HB rule and formatting on a line in Items.py * Fix logic bug with Geppetto's House postcard * Update Rules.py * Update Options.py * Update __init__.py * Update __init__.py * Huge under-the-hood update for PR * More updates for PR * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update __init__.py --------- Co-authored-by: Scipio Wright Co-authored-by: Doug Hoskisson Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Core: Fix incorrect default state checked in MultiWorld.can_beat_game (#3813) `MultiWorld.can_beat_game()` with no arguments would initially check if `self.state` is beatable, but then would create an empty state, `state = CollectionState(self)`, to sweep spheres from to determine if the game is beatable. The issue was that `self.state` and the new empty state could be different. Currently, it seems that everywhere in Archipelago's codebase that calls `MultiWorld.can_beat_game()` with no arguments or `starting_state=None` has a `self.state` that only contains precollected items, so the new empty state happens to result in an equivalent state, but this should not be relied upon to always be the case. This patch changes `can_beat_game()` to initially check if the new empty state is beatable instead of `self.state`. This appears to be a bug introduced way back in 27b6dd8bd761 Fixes #3742 * The Witness: Fix Tunnels Theater Flower EP Access Logic + Add Unit Test for it (and Expert PP2) (#3807) * Tunnels Theater Flowers fix + Flowers&PP2 Unit Tests * copypaste * Can just do it like this * This is even better probably * Also do some cleanup :3 * God damnit * Docs: `NetworkItem.player` (#3811) * Docs: `NetworkItem.player` In many contexts, it's difficult to tell whether this is the sending player or the receiving player. * correct player info * Update NetUtils.py Co-authored-by: Aaron Wagener --------- Co-authored-by: Aaron Wagener * Minecraft: Update to new options system. (#3765) * Move to new options system. switch to using self.random reformat rules file. * further reformats * fix tests to use new options system. * fix slot data to not use self.multiworld * I hate python * new starting_items docstring to prepare for 1.20.5+ item components. fix invalid json being output to starting_items * more typing fixes. * stupid quotes around type declarations * removed unused variable in ItemPool.py change null check in Structures.py * update rules "self" variable to a "world: MinecraftWorld" variable * get key, and not value for required bosses. * The Witness: Panel Hunt Mode (#3265) * Add panel hunt options * Make sure all panels are either solvable or disabled in panel hunt * Pick huntable panels * Discards in disable non randomized * Set up panel hunt requirement * Panel hunt functional * Make it so an event can have multiple names * Panel hunt with events * Add hunt entities to slot data * ruff * add to hint data, no client sneding yet * encode panel hunt amount in compact hint data * Remove print statement * my b * consistent * meh * additions for lcient * Nah * Victory panels ineligible for panel hunt * Panel Hunt Postgame option * cleanup * Add data generation file * pull out set * always disable gate ep in panel hunt * Disallow certain challenge panels from being panel hunt panels * Make panelhuntpostgame its own function, so it can be called even if normal postgame is enabled * disallow PP resets from panel hunt * Disable challenge timer and elevetor start respectively in disable hunt postgame * Fix panelhunt postgame * lol * When you test that the bug is fixed but not that the non-bug is not unfixed * Prevent Obelisks from being panel hunt panels * Make picking panels for panel hunt a bit more sophisticated, if less random * Better function maybe ig * Ok maybe that was a bit too much * Give advanced players some control over panel hunt * lint * correct the logic for amount to pick * decided the jingle thing was dumb, I'll figure sth out client side. Same area discouragement is now a configurable factor, and the logic has been significantly rewritten * comment * Make the option visible * Safety * Change assert slightly * We do a little logging * number tweak & we do a lil logging * we do a little more logging * Ruff * Panel Hunt Option Group * Idk how that got here * Update worlds/witness/options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/witness/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * remove merge error * Update worlds/witness/player_logic.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * True * Don't have underwater sliding bridge when you have above water sliding bridge * These are not actually connected lol * get rid of unnecessary variable * Refactor compact hint function again * lint * Pull out Entity Hunt Picking into its own class, split it into many functions. Kept a lot of the comments tho * forgot to actually add the new file * some more refactoring & docstrings * consistent naming * flip elif change * Comment about naming * Make static eligible panels a constant I can refer back to * slight formatting change * pull out options-based eligibility into its own function * better text and stuff * lint * this is not necessary * capitalisation * Fix same area discouragement 0 * Simplify data file generation * Simplify data file generation * prevent div 0 * Add Vault Boxes -> Vault Panels to replacements * Update options.py * Update worlds/witness/entity_hunt.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update entity_hunt.py * Fix some events not working * assert * remove now unused function * lint * Lasers Activate, Lasers don't Solve * lint * oops * mypy * lint * Add simple panel hunt unit test * Add Panel Hunt Tests * Add more Panel Hunt Tests * Disallow Box Short for normal panel hunt --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * The Witness: Add "vague" hints making use of other games' region names and location groups (#2921) * Vague hints work! But, the client will probably reveal some of the info through scouts atm * Fall back on Everywhere if necessary * Some of these failsafes are not necessary now * Limit region size to 100 as well * Actually... like this. * Nutmeg * Lol * -1 for own player but don't scout * Still make always/priority ITEM hints * fix * uwu notices your bug * The hints should, like, actually work, you know? * Make it a Toggle * Update worlds/witness/hints.py Co-authored-by: Bryce Wilson * Update worlds/witness/hints.py Co-authored-by: Bryce Wilson * Make some suggested changes * Make that ungodly equation a bit clearer in terms of formatting * make that not sorted * Add a warning about the feature in the option tooltip * Make using region names experimental * reword option tooltip * Note about singleplayer * Slight rewording again * Reorder the order of priority a bit * this condition is unnecessary now * comment * No wait the order has to be like this * Okay now I think it's correct * Another comment * Align option tooltip with new behavior * slight rewording again * reword reword reword reword * - * ethics * Update worlds/witness/options.py Co-authored-by: Bryce Wilson * Rename and slight behavior change for local hints * I think I overengineered this system before. Make it more consistent and clear now * oops I used checks by accident * oops * OMEGA OOPS * Accidentally commited a print statemetn * Vi don't commit nonsense challenge difficulty impossible * This isn't always true but it's good enough * Update options.py * Update worlds/witness/options.py Co-authored-by: Scipio Wright * Scipio :3 * switch to is_event instead of checking against location.address * oop * Update test_roll_other_options.py * Fix that unit test problem lol * Oh is this not fixed in the apworld? --------- Co-authored-by: Bryce Wilson Co-authored-by: Scipio Wright * Mega Man 2: Implement New Game (#3256) * initial (broken) commit * small work on init * Update Items.py * beginning work, some rom patches * commit progress from bh branch * deathlink, fix soft-reset kill, e-tank loss * begin work on targeting new bhclient * write font * definitely didn't forget to add the other two hashes no * update to modern options, begin colors * fix 6th letter bug * palette shuffle + logic rewrite * fix a bunch of pointers * fix color changes, deathlink, and add wily 5 req * adjust weapon weakness generation * Update Rules.py * attempt wily 5 softlock fix * add explicit test for rbm weaknesses * fix difficulty and hard reset * fix connect deathlink and off by one item color * fix atomic fire again * de-jank deathlink * rewrite wily5 rule * fix rare solo-gen fill issue, hopefully * Update Client.py * fix wily 5 requirements * undo fill hook * fix picopico-kun rules * for real this time * update minimum damage requirement * begin move to procedure patch * finish move to APPP, allow rando boobeam, color updates * fix color bug, UT support? * what do you mean I forgot the procedure * fix UT? * plando weakness and fixes * sfx when item received, more time stopper edge cases * Update test_weakness.py * fix rules and color bug * fix color bug, support reduced flashing * major world overhaul * Update Locations.py * fix first found bugs * mypy cleanup * headerless roms * Update Rom.py * further cleanup * work on energylink * el fixes * update to energylink 2.0 packet * energylink balancing * potentially break other clients, more balancing * Update Items.py * remove startup change from basepatch we write that in patch, since we also need to clean the area before applying * el balancing and feedback * hopefully less test failures? * implement world version check * add weapon/health option * Update Rom.py * x/x2 * specials * Update Color.py * Update Options.py * finally apply location groups * bump minor version number instead * fix duplicate stage sends * validate wily 5, tests * see if renaming fixes * add shuffled weakness * remove passwords * refresh rbm select, fix wily 5 validation * forgot we can't check 0 * oops I broke the basepatch (remove failing test later) * fix solo gen fill error? * fix webhost patch recognition * fix imports, basepatch * move to flexibility metric for boss validation * special case boobeam trap * block strobe on stage select init * more energylink balancing * bump world version * wily HP inaccurate in validation * fix validation edge case * save last completed wily to data storage * mypy and pep8 cleanup * fix file browse validation * fix test failure, add enemy weakness * remove test seed * update enemy damage * inno setup * Update en_Mega Man 2.md * setup guide * Update en_Mega Man 2.md * finish plando weakness section * starting rbm edge case * remove * imports * properly wrap later weakness additions in regen playthrough * fix import * forgot readme * remove time stopper special casing since we moved to proper wily 5 validation, this special casing is no longer important * properly type added locations * Update CODEOWNERS * add animation reduction * deprioritize Time Stopper in rush checks * special case wily phase 1 * fix key error * forgot the test * music and general cleanup * the great rename * fix import * thanks pycharm * reorder palette shuffle * account for alien on shuffled weakness * apply suggestions * fix seedbleed * fix invalid buster passthrough * fix weakness landing beneath required amount * fix failsafe * finish music * fix Time Stopper on Flash/Alien * asar pls * Apply suggestions from code review Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * world helpers * init cleanup * apostrophes * clearer wording * mypy and cleanup * options doc cleanup * Update rom.py * rules cleanup * Update __init__.py * Update __init__.py * move to defaultdict * cleanup world helpers * Update __init__.py * remove unnecessary line from fill hook * forgot the other one * apply code review * remove collect * Update rules.py * forgot another --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Blasphemous: Total overhaul (#3355) * Blasphemous: WIP overhaul * Entrance rule mistake * stuff * Getting closer * Real?? Maybe?? * Don't fail me now 🙏 * Add starting location tests * More tests (it still doesn't work actually 😔) * REAL * Add unreachable regions to test_reachability.py * PR ready - Remove unused functions from init - Use group exclusive functions in rules - Style changes * Bump required client version * Clean up unused imports * Change slot data * Review fixes - Prevent strength calculations from including excess items - Add new lines to ends of files - Fix missed deprecated option and random usage in init * Update option docstrings, add groups * Add preprocessor files * Update option docstrings again actually * Update player strength calculation * Rename group methods * Fix missing logic for RESCUED_CHERUB_06 * Register indirect conditions * Register indirect conditions (part 2) * Update extracted logic, change slot data key * Add region to excluded list * A capital letter * Use camelCase keys in preprocessor * Write some of new setup guide * Remove indents before list points * Change locationinfo to list of dictonaries * Finish docs, update extractor config and data * Mark region_data.py as generated * Suggested changes * More suggested changes * Suggested changes again - Use OptionError - Create list of disabled locations before looping - Check if options are equal to str instead of int - Clean up start location override - Reword some of setup guide - Organize location list - Remove unnecessary escaped quotes from option docstrings - Add world type to test base * C# moment * Requested changes * Update .gitattributes --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> * MM2: fix Wily 5 Time Stopper rule (#3824) * fix time stopper rule * that was the entirely wrong rule actually * YachtDice: implement new game (#3482) * Add the yacht dice (from other git) world to the yacht dice fork * Update .gitignore * Removed zillion because it doesn't work * Update .gitignore * added zillion again... * Now you can have 0 extra fragments * Added alt categories, also options * Added item categories * Extra categories are now working! :dog: * changed options and added exceptions * Testing if I change the generate.py * Revert "Testing if I change the generate.py" This reverts commit 7c2b3df6170dcf8d8f36a1de9fcbc9dccdec81f8. * ignore gitignore * Delete .gitignore * Update .gitignore * Update .gitignore * Update logic, added multiplicative categories * Changed difficulties * Update offline mode so that it works again * Adjusted difficulty * New version of the apworld, with 1000 as final score, always Will still need to check difficulty and weights of adding items. Website is not ready yet, so this version is not usable yet :) * Changed yaml and small bug fixes Fix when goal and max are same Options: changed chance to weight * no changes, just whitespaces * changed how logic works Now you put an array of mults and the cpu gets a couple of tries * Changed logic, tweaked a bit too * Preparation for 2.0 * logic tweak * Logic for alt categories properly now * Update setup_en.md * Update en_YachtDice.md * Improve performance of add_distributions * Formatting style * restore gitignore to APMW * Tweaked generation parameters and methods * Version 2.0.3 manual input option max score in logic always 2.0.3 faster gen * Comments and editing * Renamed setup guide * Improved create_items code * init of locations: remove self.event line * Moved setting early items to generate_early * Add my name to CODEOWNERS * Added Yacht Dice to the readme in list of games * Improve performance of Yacht Dice * newline * Improve typing * This is actually just slower lol * Update worlds/yachtdice/Items.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update Options.py * Styling * finished text whichstory option * removed roll and rollfragments; not used * import; worlds not world :) * Option groups! * ruff styling, fix * ruff format styling! * styling and capitalization of options * small comment * Cleaned up the "state_is_a_list" a little bit * RUFF :dog: * Changed filling the itempool for efficiency Now, we start with 17 extra items in the item pool, it's quite likely you need at least 17 items (~80%?). And then afterwards, we delete items if we overshoot the target of 1000, and add items if we haven't reached an achievable score of 1000 yet. Also, no need to recompute the entire logic when adding points. * :dog: * Removed plando "fix" * Changed indent of score multiplier * faster location function * Comments to docstrings * fixed making location closest to goal_score be goal_score * options format * iterate keys and values of a dict together * small optimization ListState * faster collection of categories * return arguments instead of making a list (will :dog: later) * Instead of turning it into a tuple, you can just make a tuple literal * remove .keys() * change .random and used enumerate * some readability improvements * Remove location "0", we don't use that one * Remove lookup_id_to_name entirely I for sure don't use it, and as far as I know it's not one of the mandatory functions for AP, these are item_name_to_id and location_name_to_id. * .append instead of += for single items, percentile function changed Also an extra comment for location ids. * remove ) too many * Removed sorted from category list * Hash categories (which makes it slower :( ) Maybe I messed up or misunderstood... I'll revert this right away since it is 2x slower, probably because of sorted instead of sort? * Revert "Hash categories (which makes it slower :( )" This reverts commit 34f2c1aed8c8813b2d9c58896650b82a810d3578. * temporary push: 40% faster generation test Small changes in logic make the generation 40% faster. I'll have to think about how big the changes are. I suspect they are rather limited. If this is the way to go, I'll remove the temp file and redo the YachtWeights file, I'll remove the functions there and just put the new weights here. * Add Points item category * Reverse changes of bad idea :) * ruff :dog: * Use numpy and pmf function to speed up gen Numpy has a built-in way to sum probability mass functions (pmf). This shaves of 60% of the generation time :D * Revert "Use numpy and pmf function to speed up gen" This reverts commit 9290191cb323ae92321d6c2cfcfe8c27370f439b. * Step inbetween to change the weights * Changed the weights to make it faster 135 -> 81 seconds on 100 random yamls * Adjusted max_dist, split dice_simulation function * Removed nonlocal and pass arguments instead * Change "weight-lists" to Dict[str, float] * Removed the return from ini_locations. Also added explanations to cat_weights * Choice options; dont'use .value (will ruff later) * Only put important options in slotdata * :dog: * Add Dict import * Split the cache per player, limit size to 400. * :dog: * added , because of style * Update apworld version to 2.0.6 2.0.5 is the apworld I released on github to be tested I never separately released 2.0.4. * Multiple smaller code improvements - changed names in YachtWeights so we don't need to translate them in Rules anymore - we now remember which categories are present in the game, and also put this in slotdata. This we do because only one of two categories is present in a game. If for some reason both are present (plando/getitem/startinventory), we now know which category to ignore - * :dog: ruff * Mostly minimize_extra_items improvements - Change logic, generation is now even faster (0.6s per default yaml). - Made the option 'minimize_extra_items' do a lot more, hopefully this makes the impact of Yacht Dice a little bit less, if you want that. Here's what is also does now: - you start with 2 dice and 2 rolls - there will be less locations/items at the start of you game * ruff :dog: * Removed printing options * Reworded some option descriptions --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Yacht Dice: setup: change release-link to latest (#3827) On the installation page, link to the latest release, instead of the page with all releases * ALTTP: Minor Tweaks to the Adjuster UI (#2533) * Tweak ALTTP Adjuster padding/size to accommodate resizing - Set minsize so the actions buttons on bottom are always visible. - Added a minor amount of padding around the top level objects. - Increased the size of the entry fields for roms to match general button size. - Updated layout calls so vertical spacing doesn't increase between fields when maximizing the window - Added a little bit of spacing on the rom label so it more closely lines up with the other rom selection field * Tweak ALTTP Adjuster padding/size to accommodate resizing - Set minsize so the actions buttons on bottom are always visible. - Added a minor amount of padding around the top level objects. - Increased the size of the entry fields for roms to match general button size. - Updated layout calls so vertical spacing doesn't increase between fields when maximizing the window - Added a little bit of spacing on the rom label so it more closely lines up with the other rom selection field * LTTP: Fix a bug in Triforce Pieces Mode: Extra (#3784) When triforce_pieces_mode is set to "extra", the number of Triforce pieces in the pool should be equal to the number required plus the number extra. The number available was being used in this calculation, instead of the number required. * The Witness: Ban Excluded Panels from Panel Hunt (#3818) * excluded panels should not be picked by panel hunt * ban excluded panels from panel hunt * Get rid of an unused variable * Purge the world: multiworld evil from osrs (#3751) * Core, some worlds: Rename sweep_for_events to sweep_for_advancements (#3571) * Rename sweep_for_events to sweep_for_advancements * more event->advancement renames * oops accidentally deleted the deprecation thing in the force push * Update TestDungeon.py * Update BaseClasses.py * Update BaseClasses.py * oops * utils.deprecate * treble, you had no idea how right you were * Update test_panel_hunt.py * Update BaseClasses.py Co-authored-by: Fabian Dill --------- Co-authored-by: Fabian Dill * Core: some typing and cleaning in `BaseClasses.py` (#3391) * Core: some typing and cleaning in `BaseClasses.py` * more backwards `__repr__` * double-quote string * remove some end-of-line whitespace * Celeste 64: Typo #3840 oops * Kingdom Hearts: Make Ceiling Division Human-Readable #3839 * The Witness: Shuffle Dog (#3425) * Town Pet the Dog * Add shuffle dog to options presets * I cri evritim * I guess it's as good a time as any * :( * fix the soft conflict * add all the shuffle dog options to some of the unit tests bc why not * Laser Panels are just 'General' now, I'm pretty sure * Could I really call it allsanity? * The Witness: Switch to world.player_name (#3693) * lint * player_name * oops lmao * shorten * Launcher: Update message that displays when installing a custom apworld for a game in main (#3607) * kvui: assert kivy is not imported before kvui (#3823) * Pokemon Emerald: Send current map to trackers (#3726) --------- Co-authored-by: Alchav <59858495+Alchav@users.noreply.github.com> Co-authored-by: alchav Co-authored-by: Phaneros <31861583+MatthewMarinets@users.noreply.github.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Co-authored-by: Remy Jette Co-authored-by: Jarno Co-authored-by: Aaron Wagener Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Co-authored-by: GodlFire <46984098+GodlFire@users.noreply.github.com> Co-authored-by: Kory Dondzila Co-authored-by: Trevor L <80716066+TRPG0@users.noreply.github.com> Co-authored-by: wildham <64616385+wildham0@users.noreply.github.com> Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com> Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> Co-authored-by: Kono Tyran Co-authored-by: Scipio Wright Co-authored-by: SunCat Co-authored-by: digiholic Co-authored-by: JaredWeakStrike <96694163+JaredWeakStrike@users.noreply.github.com> Co-authored-by: Mysteryem Co-authored-by: Louis M Co-authored-by: qwint Co-authored-by: Natalie Weizenbaum Co-authored-by: Exempt-Medic Co-authored-by: Doug Hoskisson Co-authored-by: Kaito Sinclaire Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> Co-authored-by: Silvris <58583688+Silvris@users.noreply.github.com> Co-authored-by: Star Rauchenberger Co-authored-by: Emily <35015090+EmilyV99@users.noreply.github.com> Co-authored-by: Bryce Wilson Co-authored-by: Scrungip <95324612+Scrungip@users.noreply.github.com> Co-authored-by: gaithern <36639398+gaithern@users.noreply.github.com> Co-authored-by: KonoTyran Co-authored-by: Spineraks Co-authored-by: B1t Co-authored-by: Kappatechy Co-authored-by: Fabian Dill Co-authored-by: PoryGone <98504756+PoryGone@users.noreply.github.com> --- worlds/stardew_valley/data/fish_data.py | 5 +- .../stardew_valley/test/TestDynamicGoals.py | 1 + worlds/stardew_valley/test/__init__.py | 8 ++- .../stardew_valley/test/rules/TestFishing.py | 61 +++++++++++++++++++ 4 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 worlds/stardew_valley/test/rules/TestFishing.py diff --git a/worlds/stardew_valley/data/fish_data.py b/worlds/stardew_valley/data/fish_data.py index 26b1a0d58a81..dfa8891077ee 100644 --- a/worlds/stardew_valley/data/fish_data.py +++ b/worlds/stardew_valley/data/fish_data.py @@ -26,6 +26,7 @@ def __repr__(self): fresh_water = (Region.farm, Region.forest, Region.town, Region.mountain) ocean = (Region.beach,) +tide_pools = (Region.tide_pools,) town_river = (Region.town,) mountain_lake = (Region.mountain,) forest_pond = (Region.forest,) @@ -118,13 +119,13 @@ def create_fish(name: str, locations: Tuple[str, ...], seasons: Union[str, Tuple spook_fish = create_fish(Fish.spook_fish, night_market, season.winter, 60) angler = create_fish(Fish.angler, town_river, season.fall, 85, True, False) -crimsonfish = create_fish(Fish.crimsonfish, ocean, season.summer, 95, True, False) +crimsonfish = create_fish(Fish.crimsonfish, tide_pools, season.summer, 95, True, False) glacierfish = create_fish(Fish.glacierfish, forest_river, season.winter, 100, True, False) legend = create_fish(Fish.legend, mountain_lake, season.spring, 110, True, False) mutant_carp = create_fish(Fish.mutant_carp, sewers, season.all_seasons, 80, True, False) ms_angler = create_fish(Fish.ms_angler, town_river, season.fall, 85, True, True) -son_of_crimsonfish = create_fish(Fish.son_of_crimsonfish, ocean, season.summer, 95, True, True) +son_of_crimsonfish = create_fish(Fish.son_of_crimsonfish, tide_pools, season.summer, 95, True, True) glacierfish_jr = create_fish(Fish.glacierfish_jr, forest_river, season.winter, 100, True, True) legend_ii = create_fish(Fish.legend_ii, mountain_lake, season.spring, 110, True, True) radioactive_carp = create_fish(Fish.radioactive_carp, sewers, season.all_seasons, 80, True, True) diff --git a/worlds/stardew_valley/test/TestDynamicGoals.py b/worlds/stardew_valley/test/TestDynamicGoals.py index bfa58dd34063..b0e6d6c62655 100644 --- a/worlds/stardew_valley/test/TestDynamicGoals.py +++ b/worlds/stardew_valley/test/TestDynamicGoals.py @@ -27,6 +27,7 @@ def collect_fishing_abilities(tester: SVTestBase): tester.multiworld.state.collect(tester.world.create_item("Fall"), prevent_sweep=False) tester.multiworld.state.collect(tester.world.create_item("Winter"), prevent_sweep=False) tester.multiworld.state.collect(tester.world.create_item(Transportation.desert_obelisk), prevent_sweep=False) + tester.multiworld.state.collect(tester.world.create_item("Beach Bridge"), prevent_sweep=False) tester.multiworld.state.collect(tester.world.create_item("Railroad Boulder Removed"), prevent_sweep=False) tester.multiworld.state.collect(tester.world.create_item("Island North Turtle"), prevent_sweep=False) tester.multiworld.state.collect(tester.world.create_item("Island West Turtle"), prevent_sweep=False) diff --git a/worlds/stardew_valley/test/__init__.py b/worlds/stardew_valley/test/__init__.py index c2c2a6a20baf..4dee0ebf6d66 100644 --- a/worlds/stardew_valley/test/__init__.py +++ b/worlds/stardew_valley/test/__init__.py @@ -258,15 +258,19 @@ def run_default_tests(self) -> bool: def collect_lots_of_money(self): self.multiworld.state.collect(self.world.create_item("Shipping Bin"), prevent_sweep=False) - required_prog_items = int(round(self.multiworld.worlds[self.player].total_progression_items * 0.25)) + real_total_prog_items = self.multiworld.worlds[self.player].total_progression_items + required_prog_items = int(round(real_total_prog_items * 0.25)) for i in range(required_prog_items): self.multiworld.state.collect(self.world.create_item("Stardrop"), prevent_sweep=False) + self.multiworld.worlds[self.player].total_progression_items = real_total_prog_items def collect_all_the_money(self): self.multiworld.state.collect(self.world.create_item("Shipping Bin"), prevent_sweep=False) - required_prog_items = int(round(self.multiworld.worlds[self.player].total_progression_items * 0.95)) + real_total_prog_items = self.multiworld.worlds[self.player].total_progression_items + required_prog_items = int(round(real_total_prog_items * 0.95)) for i in range(required_prog_items): self.multiworld.state.collect(self.world.create_item("Stardrop"), prevent_sweep=False) + self.multiworld.worlds[self.player].total_progression_items = real_total_prog_items def collect_everything(self): non_event_items = [item for item in self.multiworld.get_items() if item.code] diff --git a/worlds/stardew_valley/test/rules/TestFishing.py b/worlds/stardew_valley/test/rules/TestFishing.py new file mode 100644 index 000000000000..04a1528dd8b1 --- /dev/null +++ b/worlds/stardew_valley/test/rules/TestFishing.py @@ -0,0 +1,61 @@ +from ...options import SeasonRandomization, Friendsanity, FriendsanityHeartSize, Fishsanity, ExcludeGingerIsland, SkillProgression, ToolProgression, \ + ElevatorProgression, SpecialOrderLocations +from ...strings.fish_names import Fish +from ...test import SVTestBase + + +class TestNeedRegionToCatchFish(SVTestBase): + options = { + SeasonRandomization.internal_name: SeasonRandomization.option_disabled, + ElevatorProgression.internal_name: ElevatorProgression.option_vanilla, + SkillProgression.internal_name: SkillProgression.option_vanilla, + ToolProgression.internal_name: ToolProgression.option_vanilla, + Fishsanity.internal_name: Fishsanity.option_all, + ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false, + SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi, + } + + def test_catch_fish_requires_region_unlock(self): + fish_and_items = { + Fish.crimsonfish: ["Beach Bridge"], + Fish.void_salmon: ["Railroad Boulder Removed", "Dark Talisman"], + Fish.woodskip: ["Glittering Boulder Removed", "Progressive Weapon"], # For the ores to get the axe upgrades + Fish.mutant_carp: ["Rusty Key"], + Fish.slimejack: ["Railroad Boulder Removed", "Rusty Key"], + Fish.lionfish: ["Boat Repair"], + Fish.blue_discus: ["Island Obelisk", "Island West Turtle"], + Fish.stingray: ["Boat Repair", "Island Resort"], + Fish.ghostfish: ["Progressive Weapon"], + Fish.stonefish: ["Progressive Weapon"], + Fish.ice_pip: ["Progressive Weapon", "Progressive Weapon"], + Fish.lava_eel: ["Progressive Weapon", "Progressive Weapon", "Progressive Weapon"], + Fish.sandfish: ["Bus Repair"], + Fish.scorpion_carp: ["Desert Obelisk"], + # Starting the extended family quest requires having caught all the legendaries before, so they all have the rules of every other legendary + Fish.son_of_crimsonfish: ["Beach Bridge", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"], + Fish.radioactive_carp: ["Beach Bridge", "Rusty Key", "Boat Repair", "Island West Turtle", "Qi Walnut Room"], + Fish.glacierfish_jr: ["Beach Bridge", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"], + Fish.legend_ii: ["Beach Bridge", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"], + Fish.ms_angler: ["Beach Bridge", "Island Obelisk", "Island West Turtle", "Qi Walnut Room", "Rusty Key"], + } + self.original_state = self.multiworld.state.copy() + for fish in fish_and_items: + with self.subTest(f"Region rules for {fish}"): + self.collect_all_the_money() + item_names = fish_and_items[fish] + location = self.multiworld.get_location(f"Fishsanity: {fish}", self.player) + self.assert_reach_location_false(location, self.multiworld.state) + items = [] + for item_name in item_names: + items.append(self.collect(item_name)) + with self.subTest(f"{fish} can be reached with {item_names}"): + self.assert_reach_location_true(location, self.multiworld.state) + for item_required in items: + self.multiworld.state = self.original_state.copy() + with self.subTest(f"{fish} requires {item_required.name}"): + for item_to_collect in items: + if item_to_collect.name != item_required.name: + self.collect(item_to_collect) + self.assert_reach_location_false(location, self.multiworld.state) + + self.multiworld.state = self.original_state.copy() From 0f64bd08e19e8d07b100ecdda63943edd48de385 Mon Sep 17 00:00:00 2001 From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Date: Thu, 29 Aug 2024 02:43:13 -0400 Subject: [PATCH 44/60] ChecksFinder: itempool naming/typing (#3797) * Rename itempool * Update comment --- worlds/checksfinder/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/worlds/checksfinder/__init__.py b/worlds/checksfinder/__init__.py index e064a1c41947..9ba57b059185 100644 --- a/worlds/checksfinder/__init__.py +++ b/worlds/checksfinder/__init__.py @@ -44,15 +44,15 @@ def create_regions(self): self.multiworld.regions += [menu, board] def create_items(self): - # Generate item pool - itempool = [] + # Generate list of items + items_to_create = [] # Add the map width and height stuff - itempool += ["Map Width"] * 5 # 10 - 5 - itempool += ["Map Height"] * 5 # 10 - 5 + items_to_create += ["Map Width"] * 5 # 10 - 5 + items_to_create += ["Map Height"] * 5 # 10 - 5 # Add the map bombs - itempool += ["Map Bombs"] * 15 # 20 - 5 - # Convert itempool into real items - itempool = [self.create_item(item) for item in itempool] + items_to_create += ["Map Bombs"] * 15 # 20 - 5 + # Convert list into real items + itempool = [self.create_item(item) for item in items_to_create] self.multiworld.itempool += itempool From 08dc7e522efbf03aff6732f890bc44406509ad1b Mon Sep 17 00:00:00 2001 From: Scipio Wright Date: Thu, 29 Aug 2024 03:42:46 -0400 Subject: [PATCH 45/60] TUNIC: Add note about plando items to ER hint-creation failure error message (#3825) * Add note about plando items to entrance rando option description * Update error text to specifically call out plando items * Remove option description change --- worlds/tunic/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py index 47c66591f912..bbffd9c1440e 100644 --- a/worlds/tunic/__init__.py +++ b/worlds/tunic/__init__.py @@ -339,7 +339,8 @@ def extend_hint_information(self, hint_data: Dict[int, Dict[int, str]]) -> None: except KeyError: # logic bug, proceed with warning since it takes a long time to update AP warning(f"{location.name} is not logically accessible for {self.player_name}. " - "Creating entrance hint Inaccessible. Please report this to the TUNIC rando devs.") + "Creating entrance hint Inaccessible. Please report this to the TUNIC rando devs. " + "If you are using Plando Items (excluding early locations), then this is likely the cause.") hint_text = "Inaccessible" else: while connection != ("Menu", None): From b1be59745133c9154821dc77b4b77684cab293b4 Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Fri, 30 Aug 2024 03:26:49 -0700 Subject: [PATCH 46/60] DS3: Explicitly track item equality by name when sending IDs (#3853) We had been keeping a set of items and defining item equality, but item equality really only makes sense if you consider distinct IDs to be distinct items. But that means the set ends up having multiple copies of the same item, causing a bug where some items had the wrong upgrade level in the game. This also removes the equality definition, which was only used by this one set. --- worlds/dark_souls_3/Items.py | 9 --------- worlds/dark_souls_3/__init__.py | 11 +++++++---- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/worlds/dark_souls_3/Items.py b/worlds/dark_souls_3/Items.py index 19cd79a99414..044e3616f703 100644 --- a/worlds/dark_souls_3/Items.py +++ b/worlds/dark_souls_3/Items.py @@ -238,15 +238,6 @@ def upgrade(self, level: int) -> "DS3ItemData": ds3_code = cast(int, self.ds3_code) + level, filler = False, ) - - def __hash__(self) -> int: - return (self.name, self.ds3_code).__hash__() - - def __eq__(self, other: Any) -> bool: - if isinstance(other, self.__class__): - return self.name == other.name and self.ds3_code == other.ds3_code - else: - return False class DarkSouls3Item(Item): diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py index 159a870c7658..c31a3681df36 100644 --- a/worlds/dark_souls_3/__init__.py +++ b/worlds/dark_souls_3/__init__.py @@ -1504,16 +1504,19 @@ def fill_slot_data(self) -> Dict[str, object]: # We include all the items the game knows about so that users can manually request items # that aren't randomized, and then we _also_ include all the items that are placed in # practice `item_dictionary.values()` doesn't include upgraded or infused weapons. - all_items = { - cast(DarkSouls3Item, location.item).data + items_by_name = { + location.item.name: cast(DarkSouls3Item, location.item).data for location in self.multiworld.get_filled_locations() # item.code None is used for events, which we want to skip if location.item.code is not None and location.item.player == self.player - }.union(item_dictionary.values()) + } + for item in item_dictionary.values(): + if item.name not in items_by_name: + items_by_name[item.name] = item ap_ids_to_ds3_ids: Dict[str, int] = {} item_counts: Dict[str, int] = {} - for item in all_items: + for item in items_by_name.values(): if item.ap_code is None: continue if item.ds3_code: ap_ids_to_ds3_ids[str(item.ap_code)] = item.ds3_code if item.count != 1: item_counts[str(item.ap_code)] = item.count From 920cffda2d79577e96733e5c18bacdefba795835 Mon Sep 17 00:00:00 2001 From: Silvris <58583688+Silvris@users.noreply.github.com> Date: Sat, 31 Aug 2024 06:15:00 -0500 Subject: [PATCH 47/60] KDL3: Version 2.0.0 (#3323) * initial work on procedure patch * more flexibility load default procedure for version 5 patches add args for procedure add default extension for tokens and bsdiff allow specifying additional required extensions for generation * pushing current changes to go fix tloz bug * move tokens into a separate inheritable class * forgot the commit to remove token from ProcedurePatch * further cleaning from bad commit * start on docstrings * further work on docstrings and typing * improve docstrings * fix incorrect docstring * cleanup * clean defaults and docstring * define interface that has only the bare minimum required for `Patch.create_rom_file` * change to dictionary.get * remove unnecessary if statement * update to explicitly check for procedure, restore compatible version and manual override * Update Files.py * remove struct uses * Update Rom.py * convert KDL3 to APPP * change class variables to instance variables * Update worlds/Files.py Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * Update worlds/Files.py Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> * move required_extensions to tuple * fix missing tuple ellipsis * fix classvar mixup * rename tokens to _tokens. use hasattr * type hint cleanup * Update Files.py * initial base for local items, need to finish * coo not clean * handle local items for real, appp cleanup * actually make bosses send their locations * fix cloudy park 4 rule, zero deathlink message * remove redundant door_shuffle bool when generic ER gets in, this whole function gets rewritten. So just clean it a little now. * properly fix deathlink messages, fix fill error * update docs * add prefill items * fix kine fill error * Update Rom.py * Update Files.py * mypy and softlock fix * Update Gifting.py * mypy phase 1 * fix rare async client bug * Update __init__.py * typing cleanup * fix stone softlock because of the way Kine's Stone works, you can't clear the stone blocks before clearing the burning blocks, so we have to bring Burning from outside * Update Rom.py * Add option groups * Rename to lowercase * finish rename * whoops broke the world * fix animal duplication bug * overhaul filler generation * add Miku flavor * Update gifting.py * fix issues related to max_hs increase * Update test_locations.py * fix boss shuffle not working if level shuffle is disabled * fix bleeding default levels * Update options.py * thought this would print seed * yay bad merges * forgot options too * yeah lets just break generation while at it * this is probably a problem * cap required heart stars * Revert "cap required heart stars" This reverts commit 759efd3e2b14ec2855082de041ac989cb9c5d500. * fix duplication removal placement, deprecated test option * forgot that we need to account for what we place * move location ids * rewrite trap handling * further stage renumber fixes * forgot one more * basic UT support * fix local heart star checks * fix pattern --------- Co-authored-by: beauxq Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> --- worlds/kdl3/Locations.py | 940 ------------------ worlds/kdl3/Rom.py | 577 ----------- worlds/kdl3/Room.py | 95 -- worlds/kdl3/__init__.py | 187 ++-- worlds/kdl3/{Aesthetics.py => aesthetics.py} | 35 +- worlds/kdl3/{Client.py => client.py} | 70 +- .../kdl3/{ClientAddrs.py => client_addrs.py} | 0 .../kdl3/{Compression.py => compression.py} | 0 worlds/kdl3/data/kdl3_basepatch.bsdiff4 | Bin 2411 -> 2646 bytes worlds/kdl3/{Gifting.py => gifting.py} | 19 +- worlds/kdl3/{Items.py => items.py} | 8 +- worlds/kdl3/locations.py | 940 ++++++++++++++++++ worlds/kdl3/{Names => names}/__init__.py | 0 .../animal_friend_spawns.py} | 11 + .../enemy_abilities.py} | 2 +- .../location_name.py} | 0 worlds/kdl3/{Options.py => options.py} | 66 +- worlds/kdl3/{Presets.py => presets.py} | 1 + worlds/kdl3/{Regions.py => regions.py} | 147 +-- worlds/kdl3/rom.py | 602 +++++++++++ worlds/kdl3/room.py | 133 +++ worlds/kdl3/{Rules.py => rules.py} | 145 +-- worlds/kdl3/{data => src}/APPauseIcons.dat | Bin worlds/kdl3/src/kdl3_basepatch.asm | 180 +++- worlds/kdl3/test/__init__.py | 2 + worlds/kdl3/test/test_goal.py | 14 +- worlds/kdl3/test/test_locations.py | 50 +- worlds/kdl3/test/test_shuffles.py | 284 ++++-- 28 files changed, 2436 insertions(+), 2072 deletions(-) delete mode 100644 worlds/kdl3/Locations.py delete mode 100644 worlds/kdl3/Rom.py delete mode 100644 worlds/kdl3/Room.py rename worlds/kdl3/{Aesthetics.py => aesthetics.py} (91%) rename worlds/kdl3/{Client.py => client.py} (90%) rename worlds/kdl3/{ClientAddrs.py => client_addrs.py} (100%) rename worlds/kdl3/{Compression.py => compression.py} (100%) rename worlds/kdl3/{Gifting.py => gifting.py} (90%) rename worlds/kdl3/{Items.py => items.py} (95%) create mode 100644 worlds/kdl3/locations.py rename worlds/kdl3/{Names => names}/__init__.py (100%) rename worlds/kdl3/{Names/AnimalFriendSpawns.py => names/animal_friend_spawns.py} (95%) rename worlds/kdl3/{Names/EnemyAbilities.py => names/enemy_abilities.py} (99%) rename worlds/kdl3/{Names/LocationName.py => names/location_name.py} (100%) rename worlds/kdl3/{Options.py => options.py} (82%) rename worlds/kdl3/{Presets.py => presets.py} (98%) rename worlds/kdl3/{Regions.py => regions.py} (66%) create mode 100644 worlds/kdl3/rom.py create mode 100644 worlds/kdl3/room.py rename worlds/kdl3/{Rules.py => rules.py} (70%) rename worlds/kdl3/{data => src}/APPauseIcons.dat (100%) diff --git a/worlds/kdl3/Locations.py b/worlds/kdl3/Locations.py deleted file mode 100644 index 4d039a13497c..000000000000 --- a/worlds/kdl3/Locations.py +++ /dev/null @@ -1,940 +0,0 @@ -import typing -from BaseClasses import Location, Region -from .Names import LocationName - -if typing.TYPE_CHECKING: - from .Room import KDL3Room - - -class KDL3Location(Location): - game: str = "Kirby's Dream Land 3" - room: typing.Optional["KDL3Room"] = None - - def __init__(self, player: int, name: str, address: typing.Optional[int], parent: typing.Union[Region, None]): - super().__init__(player, name, address, parent) - if not address: - self.show_in_spoiler = False - - -stage_locations = { - 0x770001: LocationName.grass_land_1, - 0x770002: LocationName.grass_land_2, - 0x770003: LocationName.grass_land_3, - 0x770004: LocationName.grass_land_4, - 0x770005: LocationName.grass_land_5, - 0x770006: LocationName.grass_land_6, - 0x770007: LocationName.ripple_field_1, - 0x770008: LocationName.ripple_field_2, - 0x770009: LocationName.ripple_field_3, - 0x77000A: LocationName.ripple_field_4, - 0x77000B: LocationName.ripple_field_5, - 0x77000C: LocationName.ripple_field_6, - 0x77000D: LocationName.sand_canyon_1, - 0x77000E: LocationName.sand_canyon_2, - 0x77000F: LocationName.sand_canyon_3, - 0x770010: LocationName.sand_canyon_4, - 0x770011: LocationName.sand_canyon_5, - 0x770012: LocationName.sand_canyon_6, - 0x770013: LocationName.cloudy_park_1, - 0x770014: LocationName.cloudy_park_2, - 0x770015: LocationName.cloudy_park_3, - 0x770016: LocationName.cloudy_park_4, - 0x770017: LocationName.cloudy_park_5, - 0x770018: LocationName.cloudy_park_6, - 0x770019: LocationName.iceberg_1, - 0x77001A: LocationName.iceberg_2, - 0x77001B: LocationName.iceberg_3, - 0x77001C: LocationName.iceberg_4, - 0x77001D: LocationName.iceberg_5, - 0x77001E: LocationName.iceberg_6, -} - -heart_star_locations = { - 0x770101: LocationName.grass_land_tulip, - 0x770102: LocationName.grass_land_muchi, - 0x770103: LocationName.grass_land_pitcherman, - 0x770104: LocationName.grass_land_chao, - 0x770105: LocationName.grass_land_mine, - 0x770106: LocationName.grass_land_pierre, - 0x770107: LocationName.ripple_field_kamuribana, - 0x770108: LocationName.ripple_field_bakasa, - 0x770109: LocationName.ripple_field_elieel, - 0x77010A: LocationName.ripple_field_toad, - 0x77010B: LocationName.ripple_field_mama_pitch, - 0x77010C: LocationName.ripple_field_hb002, - 0x77010D: LocationName.sand_canyon_mushrooms, - 0x77010E: LocationName.sand_canyon_auntie, - 0x77010F: LocationName.sand_canyon_caramello, - 0x770110: LocationName.sand_canyon_hikari, - 0x770111: LocationName.sand_canyon_nyupun, - 0x770112: LocationName.sand_canyon_rob, - 0x770113: LocationName.cloudy_park_hibanamodoki, - 0x770114: LocationName.cloudy_park_piyokeko, - 0x770115: LocationName.cloudy_park_mrball, - 0x770116: LocationName.cloudy_park_mikarin, - 0x770117: LocationName.cloudy_park_pick, - 0x770118: LocationName.cloudy_park_hb007, - 0x770119: LocationName.iceberg_kogoesou, - 0x77011A: LocationName.iceberg_samus, - 0x77011B: LocationName.iceberg_kawasaki, - 0x77011C: LocationName.iceberg_name, - 0x77011D: LocationName.iceberg_shiro, - 0x77011E: LocationName.iceberg_angel, -} - -boss_locations = { - 0x770200: LocationName.grass_land_whispy, - 0x770201: LocationName.ripple_field_acro, - 0x770202: LocationName.sand_canyon_poncon, - 0x770203: LocationName.cloudy_park_ado, - 0x770204: LocationName.iceberg_dedede, -} - -consumable_locations = { - 0x770300: LocationName.grass_land_1_u1, - 0x770301: LocationName.grass_land_1_m1, - 0x770302: LocationName.grass_land_2_u1, - 0x770303: LocationName.grass_land_3_u1, - 0x770304: LocationName.grass_land_3_m1, - 0x770305: LocationName.grass_land_4_m1, - 0x770306: LocationName.grass_land_4_u1, - 0x770307: LocationName.grass_land_4_m2, - 0x770308: LocationName.grass_land_4_m3, - 0x770309: LocationName.grass_land_6_u1, - 0x77030A: LocationName.grass_land_6_u2, - 0x77030B: LocationName.ripple_field_2_u1, - 0x77030C: LocationName.ripple_field_2_m1, - 0x77030D: LocationName.ripple_field_3_m1, - 0x77030E: LocationName.ripple_field_3_u1, - 0x77030F: LocationName.ripple_field_4_m2, - 0x770310: LocationName.ripple_field_4_u1, - 0x770311: LocationName.ripple_field_4_m1, - 0x770312: LocationName.ripple_field_5_u1, - 0x770313: LocationName.ripple_field_5_m2, - 0x770314: LocationName.ripple_field_5_m1, - 0x770315: LocationName.sand_canyon_1_u1, - 0x770316: LocationName.sand_canyon_2_u1, - 0x770317: LocationName.sand_canyon_2_m1, - 0x770318: LocationName.sand_canyon_4_m1, - 0x770319: LocationName.sand_canyon_4_u1, - 0x77031A: LocationName.sand_canyon_4_m2, - 0x77031B: LocationName.sand_canyon_5_u1, - 0x77031C: LocationName.sand_canyon_5_u3, - 0x77031D: LocationName.sand_canyon_5_m1, - 0x77031E: LocationName.sand_canyon_5_u4, - 0x77031F: LocationName.sand_canyon_5_u2, - 0x770320: LocationName.cloudy_park_1_m1, - 0x770321: LocationName.cloudy_park_1_u1, - 0x770322: LocationName.cloudy_park_4_u1, - 0x770323: LocationName.cloudy_park_4_m1, - 0x770324: LocationName.cloudy_park_5_m1, - 0x770325: LocationName.cloudy_park_6_u1, - 0x770326: LocationName.iceberg_3_m1, - 0x770327: LocationName.iceberg_5_u1, - 0x770328: LocationName.iceberg_5_u2, - 0x770329: LocationName.iceberg_5_u3, - 0x77032A: LocationName.iceberg_6_m1, - 0x77032B: LocationName.iceberg_6_u1, -} - -level_consumables = { - 1: [0, 1], - 2: [2], - 3: [3, 4], - 4: [5, 6, 7, 8], - 6: [9, 10], - 8: [11, 12], - 9: [13, 14], - 10: [15, 16, 17], - 11: [18, 19, 20], - 13: [21], - 14: [22, 23], - 16: [24, 25, 26], - 17: [27, 28, 29, 30, 31], - 19: [32, 33], - 22: [34, 35], - 23: [36], - 24: [37], - 27: [38], - 29: [39, 40, 41], - 30: [42, 43], -} - -star_locations = { - 0x770401: LocationName.grass_land_1_s1, - 0x770402: LocationName.grass_land_1_s2, - 0x770403: LocationName.grass_land_1_s3, - 0x770404: LocationName.grass_land_1_s4, - 0x770405: LocationName.grass_land_1_s5, - 0x770406: LocationName.grass_land_1_s6, - 0x770407: LocationName.grass_land_1_s7, - 0x770408: LocationName.grass_land_1_s8, - 0x770409: LocationName.grass_land_1_s9, - 0x77040a: LocationName.grass_land_1_s10, - 0x77040b: LocationName.grass_land_1_s11, - 0x77040c: LocationName.grass_land_1_s12, - 0x77040d: LocationName.grass_land_1_s13, - 0x77040e: LocationName.grass_land_1_s14, - 0x77040f: LocationName.grass_land_1_s15, - 0x770410: LocationName.grass_land_1_s16, - 0x770411: LocationName.grass_land_1_s17, - 0x770412: LocationName.grass_land_1_s18, - 0x770413: LocationName.grass_land_1_s19, - 0x770414: LocationName.grass_land_1_s20, - 0x770415: LocationName.grass_land_1_s21, - 0x770416: LocationName.grass_land_1_s22, - 0x770417: LocationName.grass_land_1_s23, - 0x770418: LocationName.grass_land_2_s1, - 0x770419: LocationName.grass_land_2_s2, - 0x77041a: LocationName.grass_land_2_s3, - 0x77041b: LocationName.grass_land_2_s4, - 0x77041c: LocationName.grass_land_2_s5, - 0x77041d: LocationName.grass_land_2_s6, - 0x77041e: LocationName.grass_land_2_s7, - 0x77041f: LocationName.grass_land_2_s8, - 0x770420: LocationName.grass_land_2_s9, - 0x770421: LocationName.grass_land_2_s10, - 0x770422: LocationName.grass_land_2_s11, - 0x770423: LocationName.grass_land_2_s12, - 0x770424: LocationName.grass_land_2_s13, - 0x770425: LocationName.grass_land_2_s14, - 0x770426: LocationName.grass_land_2_s15, - 0x770427: LocationName.grass_land_2_s16, - 0x770428: LocationName.grass_land_2_s17, - 0x770429: LocationName.grass_land_2_s18, - 0x77042a: LocationName.grass_land_2_s19, - 0x77042b: LocationName.grass_land_2_s20, - 0x77042c: LocationName.grass_land_2_s21, - 0x77042d: LocationName.grass_land_3_s1, - 0x77042e: LocationName.grass_land_3_s2, - 0x77042f: LocationName.grass_land_3_s3, - 0x770430: LocationName.grass_land_3_s4, - 0x770431: LocationName.grass_land_3_s5, - 0x770432: LocationName.grass_land_3_s6, - 0x770433: LocationName.grass_land_3_s7, - 0x770434: LocationName.grass_land_3_s8, - 0x770435: LocationName.grass_land_3_s9, - 0x770436: LocationName.grass_land_3_s10, - 0x770437: LocationName.grass_land_3_s11, - 0x770438: LocationName.grass_land_3_s12, - 0x770439: LocationName.grass_land_3_s13, - 0x77043a: LocationName.grass_land_3_s14, - 0x77043b: LocationName.grass_land_3_s15, - 0x77043c: LocationName.grass_land_3_s16, - 0x77043d: LocationName.grass_land_3_s17, - 0x77043e: LocationName.grass_land_3_s18, - 0x77043f: LocationName.grass_land_3_s19, - 0x770440: LocationName.grass_land_3_s20, - 0x770441: LocationName.grass_land_3_s21, - 0x770442: LocationName.grass_land_3_s22, - 0x770443: LocationName.grass_land_3_s23, - 0x770444: LocationName.grass_land_3_s24, - 0x770445: LocationName.grass_land_3_s25, - 0x770446: LocationName.grass_land_3_s26, - 0x770447: LocationName.grass_land_3_s27, - 0x770448: LocationName.grass_land_3_s28, - 0x770449: LocationName.grass_land_3_s29, - 0x77044a: LocationName.grass_land_3_s30, - 0x77044b: LocationName.grass_land_3_s31, - 0x77044c: LocationName.grass_land_4_s1, - 0x77044d: LocationName.grass_land_4_s2, - 0x77044e: LocationName.grass_land_4_s3, - 0x77044f: LocationName.grass_land_4_s4, - 0x770450: LocationName.grass_land_4_s5, - 0x770451: LocationName.grass_land_4_s6, - 0x770452: LocationName.grass_land_4_s7, - 0x770453: LocationName.grass_land_4_s8, - 0x770454: LocationName.grass_land_4_s9, - 0x770455: LocationName.grass_land_4_s10, - 0x770456: LocationName.grass_land_4_s11, - 0x770457: LocationName.grass_land_4_s12, - 0x770458: LocationName.grass_land_4_s13, - 0x770459: LocationName.grass_land_4_s14, - 0x77045a: LocationName.grass_land_4_s15, - 0x77045b: LocationName.grass_land_4_s16, - 0x77045c: LocationName.grass_land_4_s17, - 0x77045d: LocationName.grass_land_4_s18, - 0x77045e: LocationName.grass_land_4_s19, - 0x77045f: LocationName.grass_land_4_s20, - 0x770460: LocationName.grass_land_4_s21, - 0x770461: LocationName.grass_land_4_s22, - 0x770462: LocationName.grass_land_4_s23, - 0x770463: LocationName.grass_land_4_s24, - 0x770464: LocationName.grass_land_4_s25, - 0x770465: LocationName.grass_land_4_s26, - 0x770466: LocationName.grass_land_4_s27, - 0x770467: LocationName.grass_land_4_s28, - 0x770468: LocationName.grass_land_4_s29, - 0x770469: LocationName.grass_land_4_s30, - 0x77046a: LocationName.grass_land_4_s31, - 0x77046b: LocationName.grass_land_4_s32, - 0x77046c: LocationName.grass_land_4_s33, - 0x77046d: LocationName.grass_land_4_s34, - 0x77046e: LocationName.grass_land_4_s35, - 0x77046f: LocationName.grass_land_4_s36, - 0x770470: LocationName.grass_land_4_s37, - 0x770471: LocationName.grass_land_5_s1, - 0x770472: LocationName.grass_land_5_s2, - 0x770473: LocationName.grass_land_5_s3, - 0x770474: LocationName.grass_land_5_s4, - 0x770475: LocationName.grass_land_5_s5, - 0x770476: LocationName.grass_land_5_s6, - 0x770477: LocationName.grass_land_5_s7, - 0x770478: LocationName.grass_land_5_s8, - 0x770479: LocationName.grass_land_5_s9, - 0x77047a: LocationName.grass_land_5_s10, - 0x77047b: LocationName.grass_land_5_s11, - 0x77047c: LocationName.grass_land_5_s12, - 0x77047d: LocationName.grass_land_5_s13, - 0x77047e: LocationName.grass_land_5_s14, - 0x77047f: LocationName.grass_land_5_s15, - 0x770480: LocationName.grass_land_5_s16, - 0x770481: LocationName.grass_land_5_s17, - 0x770482: LocationName.grass_land_5_s18, - 0x770483: LocationName.grass_land_5_s19, - 0x770484: LocationName.grass_land_5_s20, - 0x770485: LocationName.grass_land_5_s21, - 0x770486: LocationName.grass_land_5_s22, - 0x770487: LocationName.grass_land_5_s23, - 0x770488: LocationName.grass_land_5_s24, - 0x770489: LocationName.grass_land_5_s25, - 0x77048a: LocationName.grass_land_5_s26, - 0x77048b: LocationName.grass_land_5_s27, - 0x77048c: LocationName.grass_land_5_s28, - 0x77048d: LocationName.grass_land_5_s29, - 0x77048e: LocationName.grass_land_6_s1, - 0x77048f: LocationName.grass_land_6_s2, - 0x770490: LocationName.grass_land_6_s3, - 0x770491: LocationName.grass_land_6_s4, - 0x770492: LocationName.grass_land_6_s5, - 0x770493: LocationName.grass_land_6_s6, - 0x770494: LocationName.grass_land_6_s7, - 0x770495: LocationName.grass_land_6_s8, - 0x770496: LocationName.grass_land_6_s9, - 0x770497: LocationName.grass_land_6_s10, - 0x770498: LocationName.grass_land_6_s11, - 0x770499: LocationName.grass_land_6_s12, - 0x77049a: LocationName.grass_land_6_s13, - 0x77049b: LocationName.grass_land_6_s14, - 0x77049c: LocationName.grass_land_6_s15, - 0x77049d: LocationName.grass_land_6_s16, - 0x77049e: LocationName.grass_land_6_s17, - 0x77049f: LocationName.grass_land_6_s18, - 0x7704a0: LocationName.grass_land_6_s19, - 0x7704a1: LocationName.grass_land_6_s20, - 0x7704a2: LocationName.grass_land_6_s21, - 0x7704a3: LocationName.grass_land_6_s22, - 0x7704a4: LocationName.grass_land_6_s23, - 0x7704a5: LocationName.grass_land_6_s24, - 0x7704a6: LocationName.grass_land_6_s25, - 0x7704a7: LocationName.grass_land_6_s26, - 0x7704a8: LocationName.grass_land_6_s27, - 0x7704a9: LocationName.grass_land_6_s28, - 0x7704aa: LocationName.grass_land_6_s29, - 0x7704ab: LocationName.ripple_field_1_s1, - 0x7704ac: LocationName.ripple_field_1_s2, - 0x7704ad: LocationName.ripple_field_1_s3, - 0x7704ae: LocationName.ripple_field_1_s4, - 0x7704af: LocationName.ripple_field_1_s5, - 0x7704b0: LocationName.ripple_field_1_s6, - 0x7704b1: LocationName.ripple_field_1_s7, - 0x7704b2: LocationName.ripple_field_1_s8, - 0x7704b3: LocationName.ripple_field_1_s9, - 0x7704b4: LocationName.ripple_field_1_s10, - 0x7704b5: LocationName.ripple_field_1_s11, - 0x7704b6: LocationName.ripple_field_1_s12, - 0x7704b7: LocationName.ripple_field_1_s13, - 0x7704b8: LocationName.ripple_field_1_s14, - 0x7704b9: LocationName.ripple_field_1_s15, - 0x7704ba: LocationName.ripple_field_1_s16, - 0x7704bb: LocationName.ripple_field_1_s17, - 0x7704bc: LocationName.ripple_field_1_s18, - 0x7704bd: LocationName.ripple_field_1_s19, - 0x7704be: LocationName.ripple_field_2_s1, - 0x7704bf: LocationName.ripple_field_2_s2, - 0x7704c0: LocationName.ripple_field_2_s3, - 0x7704c1: LocationName.ripple_field_2_s4, - 0x7704c2: LocationName.ripple_field_2_s5, - 0x7704c3: LocationName.ripple_field_2_s6, - 0x7704c4: LocationName.ripple_field_2_s7, - 0x7704c5: LocationName.ripple_field_2_s8, - 0x7704c6: LocationName.ripple_field_2_s9, - 0x7704c7: LocationName.ripple_field_2_s10, - 0x7704c8: LocationName.ripple_field_2_s11, - 0x7704c9: LocationName.ripple_field_2_s12, - 0x7704ca: LocationName.ripple_field_2_s13, - 0x7704cb: LocationName.ripple_field_2_s14, - 0x7704cc: LocationName.ripple_field_2_s15, - 0x7704cd: LocationName.ripple_field_2_s16, - 0x7704ce: LocationName.ripple_field_2_s17, - 0x7704cf: LocationName.ripple_field_3_s1, - 0x7704d0: LocationName.ripple_field_3_s2, - 0x7704d1: LocationName.ripple_field_3_s3, - 0x7704d2: LocationName.ripple_field_3_s4, - 0x7704d3: LocationName.ripple_field_3_s5, - 0x7704d4: LocationName.ripple_field_3_s6, - 0x7704d5: LocationName.ripple_field_3_s7, - 0x7704d6: LocationName.ripple_field_3_s8, - 0x7704d7: LocationName.ripple_field_3_s9, - 0x7704d8: LocationName.ripple_field_3_s10, - 0x7704d9: LocationName.ripple_field_3_s11, - 0x7704da: LocationName.ripple_field_3_s12, - 0x7704db: LocationName.ripple_field_3_s13, - 0x7704dc: LocationName.ripple_field_3_s14, - 0x7704dd: LocationName.ripple_field_3_s15, - 0x7704de: LocationName.ripple_field_3_s16, - 0x7704df: LocationName.ripple_field_3_s17, - 0x7704e0: LocationName.ripple_field_3_s18, - 0x7704e1: LocationName.ripple_field_3_s19, - 0x7704e2: LocationName.ripple_field_3_s20, - 0x7704e3: LocationName.ripple_field_3_s21, - 0x7704e4: LocationName.ripple_field_4_s1, - 0x7704e5: LocationName.ripple_field_4_s2, - 0x7704e6: LocationName.ripple_field_4_s3, - 0x7704e7: LocationName.ripple_field_4_s4, - 0x7704e8: LocationName.ripple_field_4_s5, - 0x7704e9: LocationName.ripple_field_4_s6, - 0x7704ea: LocationName.ripple_field_4_s7, - 0x7704eb: LocationName.ripple_field_4_s8, - 0x7704ec: LocationName.ripple_field_4_s9, - 0x7704ed: LocationName.ripple_field_4_s10, - 0x7704ee: LocationName.ripple_field_4_s11, - 0x7704ef: LocationName.ripple_field_4_s12, - 0x7704f0: LocationName.ripple_field_4_s13, - 0x7704f1: LocationName.ripple_field_4_s14, - 0x7704f2: LocationName.ripple_field_4_s15, - 0x7704f3: LocationName.ripple_field_4_s16, - 0x7704f4: LocationName.ripple_field_4_s17, - 0x7704f5: LocationName.ripple_field_4_s18, - 0x7704f6: LocationName.ripple_field_4_s19, - 0x7704f7: LocationName.ripple_field_4_s20, - 0x7704f8: LocationName.ripple_field_4_s21, - 0x7704f9: LocationName.ripple_field_4_s22, - 0x7704fa: LocationName.ripple_field_4_s23, - 0x7704fb: LocationName.ripple_field_4_s24, - 0x7704fc: LocationName.ripple_field_4_s25, - 0x7704fd: LocationName.ripple_field_4_s26, - 0x7704fe: LocationName.ripple_field_4_s27, - 0x7704ff: LocationName.ripple_field_4_s28, - 0x770500: LocationName.ripple_field_4_s29, - 0x770501: LocationName.ripple_field_4_s30, - 0x770502: LocationName.ripple_field_4_s31, - 0x770503: LocationName.ripple_field_4_s32, - 0x770504: LocationName.ripple_field_4_s33, - 0x770505: LocationName.ripple_field_4_s34, - 0x770506: LocationName.ripple_field_4_s35, - 0x770507: LocationName.ripple_field_4_s36, - 0x770508: LocationName.ripple_field_4_s37, - 0x770509: LocationName.ripple_field_4_s38, - 0x77050a: LocationName.ripple_field_4_s39, - 0x77050b: LocationName.ripple_field_4_s40, - 0x77050c: LocationName.ripple_field_4_s41, - 0x77050d: LocationName.ripple_field_4_s42, - 0x77050e: LocationName.ripple_field_4_s43, - 0x77050f: LocationName.ripple_field_4_s44, - 0x770510: LocationName.ripple_field_4_s45, - 0x770511: LocationName.ripple_field_4_s46, - 0x770512: LocationName.ripple_field_4_s47, - 0x770513: LocationName.ripple_field_4_s48, - 0x770514: LocationName.ripple_field_4_s49, - 0x770515: LocationName.ripple_field_4_s50, - 0x770516: LocationName.ripple_field_4_s51, - 0x770517: LocationName.ripple_field_5_s1, - 0x770518: LocationName.ripple_field_5_s2, - 0x770519: LocationName.ripple_field_5_s3, - 0x77051a: LocationName.ripple_field_5_s4, - 0x77051b: LocationName.ripple_field_5_s5, - 0x77051c: LocationName.ripple_field_5_s6, - 0x77051d: LocationName.ripple_field_5_s7, - 0x77051e: LocationName.ripple_field_5_s8, - 0x77051f: LocationName.ripple_field_5_s9, - 0x770520: LocationName.ripple_field_5_s10, - 0x770521: LocationName.ripple_field_5_s11, - 0x770522: LocationName.ripple_field_5_s12, - 0x770523: LocationName.ripple_field_5_s13, - 0x770524: LocationName.ripple_field_5_s14, - 0x770525: LocationName.ripple_field_5_s15, - 0x770526: LocationName.ripple_field_5_s16, - 0x770527: LocationName.ripple_field_5_s17, - 0x770528: LocationName.ripple_field_5_s18, - 0x770529: LocationName.ripple_field_5_s19, - 0x77052a: LocationName.ripple_field_5_s20, - 0x77052b: LocationName.ripple_field_5_s21, - 0x77052c: LocationName.ripple_field_5_s22, - 0x77052d: LocationName.ripple_field_5_s23, - 0x77052e: LocationName.ripple_field_5_s24, - 0x77052f: LocationName.ripple_field_5_s25, - 0x770530: LocationName.ripple_field_5_s26, - 0x770531: LocationName.ripple_field_5_s27, - 0x770532: LocationName.ripple_field_5_s28, - 0x770533: LocationName.ripple_field_5_s29, - 0x770534: LocationName.ripple_field_5_s30, - 0x770535: LocationName.ripple_field_5_s31, - 0x770536: LocationName.ripple_field_5_s32, - 0x770537: LocationName.ripple_field_5_s33, - 0x770538: LocationName.ripple_field_5_s34, - 0x770539: LocationName.ripple_field_5_s35, - 0x77053a: LocationName.ripple_field_5_s36, - 0x77053b: LocationName.ripple_field_5_s37, - 0x77053c: LocationName.ripple_field_5_s38, - 0x77053d: LocationName.ripple_field_5_s39, - 0x77053e: LocationName.ripple_field_5_s40, - 0x77053f: LocationName.ripple_field_5_s41, - 0x770540: LocationName.ripple_field_5_s42, - 0x770541: LocationName.ripple_field_5_s43, - 0x770542: LocationName.ripple_field_5_s44, - 0x770543: LocationName.ripple_field_5_s45, - 0x770544: LocationName.ripple_field_5_s46, - 0x770545: LocationName.ripple_field_5_s47, - 0x770546: LocationName.ripple_field_5_s48, - 0x770547: LocationName.ripple_field_5_s49, - 0x770548: LocationName.ripple_field_5_s50, - 0x770549: LocationName.ripple_field_5_s51, - 0x77054a: LocationName.ripple_field_6_s1, - 0x77054b: LocationName.ripple_field_6_s2, - 0x77054c: LocationName.ripple_field_6_s3, - 0x77054d: LocationName.ripple_field_6_s4, - 0x77054e: LocationName.ripple_field_6_s5, - 0x77054f: LocationName.ripple_field_6_s6, - 0x770550: LocationName.ripple_field_6_s7, - 0x770551: LocationName.ripple_field_6_s8, - 0x770552: LocationName.ripple_field_6_s9, - 0x770553: LocationName.ripple_field_6_s10, - 0x770554: LocationName.ripple_field_6_s11, - 0x770555: LocationName.ripple_field_6_s12, - 0x770556: LocationName.ripple_field_6_s13, - 0x770557: LocationName.ripple_field_6_s14, - 0x770558: LocationName.ripple_field_6_s15, - 0x770559: LocationName.ripple_field_6_s16, - 0x77055a: LocationName.ripple_field_6_s17, - 0x77055b: LocationName.ripple_field_6_s18, - 0x77055c: LocationName.ripple_field_6_s19, - 0x77055d: LocationName.ripple_field_6_s20, - 0x77055e: LocationName.ripple_field_6_s21, - 0x77055f: LocationName.ripple_field_6_s22, - 0x770560: LocationName.ripple_field_6_s23, - 0x770561: LocationName.sand_canyon_1_s1, - 0x770562: LocationName.sand_canyon_1_s2, - 0x770563: LocationName.sand_canyon_1_s3, - 0x770564: LocationName.sand_canyon_1_s4, - 0x770565: LocationName.sand_canyon_1_s5, - 0x770566: LocationName.sand_canyon_1_s6, - 0x770567: LocationName.sand_canyon_1_s7, - 0x770568: LocationName.sand_canyon_1_s8, - 0x770569: LocationName.sand_canyon_1_s9, - 0x77056a: LocationName.sand_canyon_1_s10, - 0x77056b: LocationName.sand_canyon_1_s11, - 0x77056c: LocationName.sand_canyon_1_s12, - 0x77056d: LocationName.sand_canyon_1_s13, - 0x77056e: LocationName.sand_canyon_1_s14, - 0x77056f: LocationName.sand_canyon_1_s15, - 0x770570: LocationName.sand_canyon_1_s16, - 0x770571: LocationName.sand_canyon_1_s17, - 0x770572: LocationName.sand_canyon_1_s18, - 0x770573: LocationName.sand_canyon_1_s19, - 0x770574: LocationName.sand_canyon_1_s20, - 0x770575: LocationName.sand_canyon_1_s21, - 0x770576: LocationName.sand_canyon_1_s22, - 0x770577: LocationName.sand_canyon_2_s1, - 0x770578: LocationName.sand_canyon_2_s2, - 0x770579: LocationName.sand_canyon_2_s3, - 0x77057a: LocationName.sand_canyon_2_s4, - 0x77057b: LocationName.sand_canyon_2_s5, - 0x77057c: LocationName.sand_canyon_2_s6, - 0x77057d: LocationName.sand_canyon_2_s7, - 0x77057e: LocationName.sand_canyon_2_s8, - 0x77057f: LocationName.sand_canyon_2_s9, - 0x770580: LocationName.sand_canyon_2_s10, - 0x770581: LocationName.sand_canyon_2_s11, - 0x770582: LocationName.sand_canyon_2_s12, - 0x770583: LocationName.sand_canyon_2_s13, - 0x770584: LocationName.sand_canyon_2_s14, - 0x770585: LocationName.sand_canyon_2_s15, - 0x770586: LocationName.sand_canyon_2_s16, - 0x770587: LocationName.sand_canyon_2_s17, - 0x770588: LocationName.sand_canyon_2_s18, - 0x770589: LocationName.sand_canyon_2_s19, - 0x77058a: LocationName.sand_canyon_2_s20, - 0x77058b: LocationName.sand_canyon_2_s21, - 0x77058c: LocationName.sand_canyon_2_s22, - 0x77058d: LocationName.sand_canyon_2_s23, - 0x77058e: LocationName.sand_canyon_2_s24, - 0x77058f: LocationName.sand_canyon_2_s25, - 0x770590: LocationName.sand_canyon_2_s26, - 0x770591: LocationName.sand_canyon_2_s27, - 0x770592: LocationName.sand_canyon_2_s28, - 0x770593: LocationName.sand_canyon_2_s29, - 0x770594: LocationName.sand_canyon_2_s30, - 0x770595: LocationName.sand_canyon_2_s31, - 0x770596: LocationName.sand_canyon_2_s32, - 0x770597: LocationName.sand_canyon_2_s33, - 0x770598: LocationName.sand_canyon_2_s34, - 0x770599: LocationName.sand_canyon_2_s35, - 0x77059a: LocationName.sand_canyon_2_s36, - 0x77059b: LocationName.sand_canyon_2_s37, - 0x77059c: LocationName.sand_canyon_2_s38, - 0x77059d: LocationName.sand_canyon_2_s39, - 0x77059e: LocationName.sand_canyon_2_s40, - 0x77059f: LocationName.sand_canyon_2_s41, - 0x7705a0: LocationName.sand_canyon_2_s42, - 0x7705a1: LocationName.sand_canyon_2_s43, - 0x7705a2: LocationName.sand_canyon_2_s44, - 0x7705a3: LocationName.sand_canyon_2_s45, - 0x7705a4: LocationName.sand_canyon_2_s46, - 0x7705a5: LocationName.sand_canyon_2_s47, - 0x7705a6: LocationName.sand_canyon_2_s48, - 0x7705a7: LocationName.sand_canyon_3_s1, - 0x7705a8: LocationName.sand_canyon_3_s2, - 0x7705a9: LocationName.sand_canyon_3_s3, - 0x7705aa: LocationName.sand_canyon_3_s4, - 0x7705ab: LocationName.sand_canyon_3_s5, - 0x7705ac: LocationName.sand_canyon_3_s6, - 0x7705ad: LocationName.sand_canyon_3_s7, - 0x7705ae: LocationName.sand_canyon_3_s8, - 0x7705af: LocationName.sand_canyon_3_s9, - 0x7705b0: LocationName.sand_canyon_3_s10, - 0x7705b1: LocationName.sand_canyon_4_s1, - 0x7705b2: LocationName.sand_canyon_4_s2, - 0x7705b3: LocationName.sand_canyon_4_s3, - 0x7705b4: LocationName.sand_canyon_4_s4, - 0x7705b5: LocationName.sand_canyon_4_s5, - 0x7705b6: LocationName.sand_canyon_4_s6, - 0x7705b7: LocationName.sand_canyon_4_s7, - 0x7705b8: LocationName.sand_canyon_4_s8, - 0x7705b9: LocationName.sand_canyon_4_s9, - 0x7705ba: LocationName.sand_canyon_4_s10, - 0x7705bb: LocationName.sand_canyon_4_s11, - 0x7705bc: LocationName.sand_canyon_4_s12, - 0x7705bd: LocationName.sand_canyon_4_s13, - 0x7705be: LocationName.sand_canyon_4_s14, - 0x7705bf: LocationName.sand_canyon_4_s15, - 0x7705c0: LocationName.sand_canyon_4_s16, - 0x7705c1: LocationName.sand_canyon_4_s17, - 0x7705c2: LocationName.sand_canyon_4_s18, - 0x7705c3: LocationName.sand_canyon_4_s19, - 0x7705c4: LocationName.sand_canyon_4_s20, - 0x7705c5: LocationName.sand_canyon_4_s21, - 0x7705c6: LocationName.sand_canyon_4_s22, - 0x7705c7: LocationName.sand_canyon_4_s23, - 0x7705c8: LocationName.sand_canyon_5_s1, - 0x7705c9: LocationName.sand_canyon_5_s2, - 0x7705ca: LocationName.sand_canyon_5_s3, - 0x7705cb: LocationName.sand_canyon_5_s4, - 0x7705cc: LocationName.sand_canyon_5_s5, - 0x7705cd: LocationName.sand_canyon_5_s6, - 0x7705ce: LocationName.sand_canyon_5_s7, - 0x7705cf: LocationName.sand_canyon_5_s8, - 0x7705d0: LocationName.sand_canyon_5_s9, - 0x7705d1: LocationName.sand_canyon_5_s10, - 0x7705d2: LocationName.sand_canyon_5_s11, - 0x7705d3: LocationName.sand_canyon_5_s12, - 0x7705d4: LocationName.sand_canyon_5_s13, - 0x7705d5: LocationName.sand_canyon_5_s14, - 0x7705d6: LocationName.sand_canyon_5_s15, - 0x7705d7: LocationName.sand_canyon_5_s16, - 0x7705d8: LocationName.sand_canyon_5_s17, - 0x7705d9: LocationName.sand_canyon_5_s18, - 0x7705da: LocationName.sand_canyon_5_s19, - 0x7705db: LocationName.sand_canyon_5_s20, - 0x7705dc: LocationName.sand_canyon_5_s21, - 0x7705dd: LocationName.sand_canyon_5_s22, - 0x7705de: LocationName.sand_canyon_5_s23, - 0x7705df: LocationName.sand_canyon_5_s24, - 0x7705e0: LocationName.sand_canyon_5_s25, - 0x7705e1: LocationName.sand_canyon_5_s26, - 0x7705e2: LocationName.sand_canyon_5_s27, - 0x7705e3: LocationName.sand_canyon_5_s28, - 0x7705e4: LocationName.sand_canyon_5_s29, - 0x7705e5: LocationName.sand_canyon_5_s30, - 0x7705e6: LocationName.sand_canyon_5_s31, - 0x7705e7: LocationName.sand_canyon_5_s32, - 0x7705e8: LocationName.sand_canyon_5_s33, - 0x7705e9: LocationName.sand_canyon_5_s34, - 0x7705ea: LocationName.sand_canyon_5_s35, - 0x7705eb: LocationName.sand_canyon_5_s36, - 0x7705ec: LocationName.sand_canyon_5_s37, - 0x7705ed: LocationName.sand_canyon_5_s38, - 0x7705ee: LocationName.sand_canyon_5_s39, - 0x7705ef: LocationName.sand_canyon_5_s40, - 0x7705f0: LocationName.cloudy_park_1_s1, - 0x7705f1: LocationName.cloudy_park_1_s2, - 0x7705f2: LocationName.cloudy_park_1_s3, - 0x7705f3: LocationName.cloudy_park_1_s4, - 0x7705f4: LocationName.cloudy_park_1_s5, - 0x7705f5: LocationName.cloudy_park_1_s6, - 0x7705f6: LocationName.cloudy_park_1_s7, - 0x7705f7: LocationName.cloudy_park_1_s8, - 0x7705f8: LocationName.cloudy_park_1_s9, - 0x7705f9: LocationName.cloudy_park_1_s10, - 0x7705fa: LocationName.cloudy_park_1_s11, - 0x7705fb: LocationName.cloudy_park_1_s12, - 0x7705fc: LocationName.cloudy_park_1_s13, - 0x7705fd: LocationName.cloudy_park_1_s14, - 0x7705fe: LocationName.cloudy_park_1_s15, - 0x7705ff: LocationName.cloudy_park_1_s16, - 0x770600: LocationName.cloudy_park_1_s17, - 0x770601: LocationName.cloudy_park_1_s18, - 0x770602: LocationName.cloudy_park_1_s19, - 0x770603: LocationName.cloudy_park_1_s20, - 0x770604: LocationName.cloudy_park_1_s21, - 0x770605: LocationName.cloudy_park_1_s22, - 0x770606: LocationName.cloudy_park_1_s23, - 0x770607: LocationName.cloudy_park_2_s1, - 0x770608: LocationName.cloudy_park_2_s2, - 0x770609: LocationName.cloudy_park_2_s3, - 0x77060a: LocationName.cloudy_park_2_s4, - 0x77060b: LocationName.cloudy_park_2_s5, - 0x77060c: LocationName.cloudy_park_2_s6, - 0x77060d: LocationName.cloudy_park_2_s7, - 0x77060e: LocationName.cloudy_park_2_s8, - 0x77060f: LocationName.cloudy_park_2_s9, - 0x770610: LocationName.cloudy_park_2_s10, - 0x770611: LocationName.cloudy_park_2_s11, - 0x770612: LocationName.cloudy_park_2_s12, - 0x770613: LocationName.cloudy_park_2_s13, - 0x770614: LocationName.cloudy_park_2_s14, - 0x770615: LocationName.cloudy_park_2_s15, - 0x770616: LocationName.cloudy_park_2_s16, - 0x770617: LocationName.cloudy_park_2_s17, - 0x770618: LocationName.cloudy_park_2_s18, - 0x770619: LocationName.cloudy_park_2_s19, - 0x77061a: LocationName.cloudy_park_2_s20, - 0x77061b: LocationName.cloudy_park_2_s21, - 0x77061c: LocationName.cloudy_park_2_s22, - 0x77061d: LocationName.cloudy_park_2_s23, - 0x77061e: LocationName.cloudy_park_2_s24, - 0x77061f: LocationName.cloudy_park_2_s25, - 0x770620: LocationName.cloudy_park_2_s26, - 0x770621: LocationName.cloudy_park_2_s27, - 0x770622: LocationName.cloudy_park_2_s28, - 0x770623: LocationName.cloudy_park_2_s29, - 0x770624: LocationName.cloudy_park_2_s30, - 0x770625: LocationName.cloudy_park_2_s31, - 0x770626: LocationName.cloudy_park_2_s32, - 0x770627: LocationName.cloudy_park_2_s33, - 0x770628: LocationName.cloudy_park_2_s34, - 0x770629: LocationName.cloudy_park_2_s35, - 0x77062a: LocationName.cloudy_park_2_s36, - 0x77062b: LocationName.cloudy_park_2_s37, - 0x77062c: LocationName.cloudy_park_2_s38, - 0x77062d: LocationName.cloudy_park_2_s39, - 0x77062e: LocationName.cloudy_park_2_s40, - 0x77062f: LocationName.cloudy_park_2_s41, - 0x770630: LocationName.cloudy_park_2_s42, - 0x770631: LocationName.cloudy_park_2_s43, - 0x770632: LocationName.cloudy_park_2_s44, - 0x770633: LocationName.cloudy_park_2_s45, - 0x770634: LocationName.cloudy_park_2_s46, - 0x770635: LocationName.cloudy_park_2_s47, - 0x770636: LocationName.cloudy_park_2_s48, - 0x770637: LocationName.cloudy_park_2_s49, - 0x770638: LocationName.cloudy_park_2_s50, - 0x770639: LocationName.cloudy_park_2_s51, - 0x77063a: LocationName.cloudy_park_2_s52, - 0x77063b: LocationName.cloudy_park_2_s53, - 0x77063c: LocationName.cloudy_park_2_s54, - 0x77063d: LocationName.cloudy_park_3_s1, - 0x77063e: LocationName.cloudy_park_3_s2, - 0x77063f: LocationName.cloudy_park_3_s3, - 0x770640: LocationName.cloudy_park_3_s4, - 0x770641: LocationName.cloudy_park_3_s5, - 0x770642: LocationName.cloudy_park_3_s6, - 0x770643: LocationName.cloudy_park_3_s7, - 0x770644: LocationName.cloudy_park_3_s8, - 0x770645: LocationName.cloudy_park_3_s9, - 0x770646: LocationName.cloudy_park_3_s10, - 0x770647: LocationName.cloudy_park_3_s11, - 0x770648: LocationName.cloudy_park_3_s12, - 0x770649: LocationName.cloudy_park_3_s13, - 0x77064a: LocationName.cloudy_park_3_s14, - 0x77064b: LocationName.cloudy_park_3_s15, - 0x77064c: LocationName.cloudy_park_3_s16, - 0x77064d: LocationName.cloudy_park_3_s17, - 0x77064e: LocationName.cloudy_park_3_s18, - 0x77064f: LocationName.cloudy_park_3_s19, - 0x770650: LocationName.cloudy_park_3_s20, - 0x770651: LocationName.cloudy_park_3_s21, - 0x770652: LocationName.cloudy_park_3_s22, - 0x770653: LocationName.cloudy_park_4_s1, - 0x770654: LocationName.cloudy_park_4_s2, - 0x770655: LocationName.cloudy_park_4_s3, - 0x770656: LocationName.cloudy_park_4_s4, - 0x770657: LocationName.cloudy_park_4_s5, - 0x770658: LocationName.cloudy_park_4_s6, - 0x770659: LocationName.cloudy_park_4_s7, - 0x77065a: LocationName.cloudy_park_4_s8, - 0x77065b: LocationName.cloudy_park_4_s9, - 0x77065c: LocationName.cloudy_park_4_s10, - 0x77065d: LocationName.cloudy_park_4_s11, - 0x77065e: LocationName.cloudy_park_4_s12, - 0x77065f: LocationName.cloudy_park_4_s13, - 0x770660: LocationName.cloudy_park_4_s14, - 0x770661: LocationName.cloudy_park_4_s15, - 0x770662: LocationName.cloudy_park_4_s16, - 0x770663: LocationName.cloudy_park_4_s17, - 0x770664: LocationName.cloudy_park_4_s18, - 0x770665: LocationName.cloudy_park_4_s19, - 0x770666: LocationName.cloudy_park_4_s20, - 0x770667: LocationName.cloudy_park_4_s21, - 0x770668: LocationName.cloudy_park_4_s22, - 0x770669: LocationName.cloudy_park_4_s23, - 0x77066a: LocationName.cloudy_park_4_s24, - 0x77066b: LocationName.cloudy_park_4_s25, - 0x77066c: LocationName.cloudy_park_4_s26, - 0x77066d: LocationName.cloudy_park_4_s27, - 0x77066e: LocationName.cloudy_park_4_s28, - 0x77066f: LocationName.cloudy_park_4_s29, - 0x770670: LocationName.cloudy_park_4_s30, - 0x770671: LocationName.cloudy_park_4_s31, - 0x770672: LocationName.cloudy_park_4_s32, - 0x770673: LocationName.cloudy_park_4_s33, - 0x770674: LocationName.cloudy_park_4_s34, - 0x770675: LocationName.cloudy_park_4_s35, - 0x770676: LocationName.cloudy_park_4_s36, - 0x770677: LocationName.cloudy_park_4_s37, - 0x770678: LocationName.cloudy_park_4_s38, - 0x770679: LocationName.cloudy_park_4_s39, - 0x77067a: LocationName.cloudy_park_4_s40, - 0x77067b: LocationName.cloudy_park_4_s41, - 0x77067c: LocationName.cloudy_park_4_s42, - 0x77067d: LocationName.cloudy_park_4_s43, - 0x77067e: LocationName.cloudy_park_4_s44, - 0x77067f: LocationName.cloudy_park_4_s45, - 0x770680: LocationName.cloudy_park_4_s46, - 0x770681: LocationName.cloudy_park_4_s47, - 0x770682: LocationName.cloudy_park_4_s48, - 0x770683: LocationName.cloudy_park_4_s49, - 0x770684: LocationName.cloudy_park_4_s50, - 0x770685: LocationName.cloudy_park_5_s1, - 0x770686: LocationName.cloudy_park_5_s2, - 0x770687: LocationName.cloudy_park_5_s3, - 0x770688: LocationName.cloudy_park_5_s4, - 0x770689: LocationName.cloudy_park_5_s5, - 0x77068a: LocationName.cloudy_park_5_s6, - 0x77068b: LocationName.cloudy_park_6_s1, - 0x77068c: LocationName.cloudy_park_6_s2, - 0x77068d: LocationName.cloudy_park_6_s3, - 0x77068e: LocationName.cloudy_park_6_s4, - 0x77068f: LocationName.cloudy_park_6_s5, - 0x770690: LocationName.cloudy_park_6_s6, - 0x770691: LocationName.cloudy_park_6_s7, - 0x770692: LocationName.cloudy_park_6_s8, - 0x770693: LocationName.cloudy_park_6_s9, - 0x770694: LocationName.cloudy_park_6_s10, - 0x770695: LocationName.cloudy_park_6_s11, - 0x770696: LocationName.cloudy_park_6_s12, - 0x770697: LocationName.cloudy_park_6_s13, - 0x770698: LocationName.cloudy_park_6_s14, - 0x770699: LocationName.cloudy_park_6_s15, - 0x77069a: LocationName.cloudy_park_6_s16, - 0x77069b: LocationName.cloudy_park_6_s17, - 0x77069c: LocationName.cloudy_park_6_s18, - 0x77069d: LocationName.cloudy_park_6_s19, - 0x77069e: LocationName.cloudy_park_6_s20, - 0x77069f: LocationName.cloudy_park_6_s21, - 0x7706a0: LocationName.cloudy_park_6_s22, - 0x7706a1: LocationName.cloudy_park_6_s23, - 0x7706a2: LocationName.cloudy_park_6_s24, - 0x7706a3: LocationName.cloudy_park_6_s25, - 0x7706a4: LocationName.cloudy_park_6_s26, - 0x7706a5: LocationName.cloudy_park_6_s27, - 0x7706a6: LocationName.cloudy_park_6_s28, - 0x7706a7: LocationName.cloudy_park_6_s29, - 0x7706a8: LocationName.cloudy_park_6_s30, - 0x7706a9: LocationName.cloudy_park_6_s31, - 0x7706aa: LocationName.cloudy_park_6_s32, - 0x7706ab: LocationName.cloudy_park_6_s33, - 0x7706ac: LocationName.iceberg_1_s1, - 0x7706ad: LocationName.iceberg_1_s2, - 0x7706ae: LocationName.iceberg_1_s3, - 0x7706af: LocationName.iceberg_1_s4, - 0x7706b0: LocationName.iceberg_1_s5, - 0x7706b1: LocationName.iceberg_1_s6, - 0x7706b2: LocationName.iceberg_2_s1, - 0x7706b3: LocationName.iceberg_2_s2, - 0x7706b4: LocationName.iceberg_2_s3, - 0x7706b5: LocationName.iceberg_2_s4, - 0x7706b6: LocationName.iceberg_2_s5, - 0x7706b7: LocationName.iceberg_2_s6, - 0x7706b8: LocationName.iceberg_2_s7, - 0x7706b9: LocationName.iceberg_2_s8, - 0x7706ba: LocationName.iceberg_2_s9, - 0x7706bb: LocationName.iceberg_2_s10, - 0x7706bc: LocationName.iceberg_2_s11, - 0x7706bd: LocationName.iceberg_2_s12, - 0x7706be: LocationName.iceberg_2_s13, - 0x7706bf: LocationName.iceberg_2_s14, - 0x7706c0: LocationName.iceberg_2_s15, - 0x7706c1: LocationName.iceberg_2_s16, - 0x7706c2: LocationName.iceberg_2_s17, - 0x7706c3: LocationName.iceberg_2_s18, - 0x7706c4: LocationName.iceberg_2_s19, - 0x7706c5: LocationName.iceberg_3_s1, - 0x7706c6: LocationName.iceberg_3_s2, - 0x7706c7: LocationName.iceberg_3_s3, - 0x7706c8: LocationName.iceberg_3_s4, - 0x7706c9: LocationName.iceberg_3_s5, - 0x7706ca: LocationName.iceberg_3_s6, - 0x7706cb: LocationName.iceberg_3_s7, - 0x7706cc: LocationName.iceberg_3_s8, - 0x7706cd: LocationName.iceberg_3_s9, - 0x7706ce: LocationName.iceberg_3_s10, - 0x7706cf: LocationName.iceberg_3_s11, - 0x7706d0: LocationName.iceberg_3_s12, - 0x7706d1: LocationName.iceberg_3_s13, - 0x7706d2: LocationName.iceberg_3_s14, - 0x7706d3: LocationName.iceberg_3_s15, - 0x7706d4: LocationName.iceberg_3_s16, - 0x7706d5: LocationName.iceberg_3_s17, - 0x7706d6: LocationName.iceberg_3_s18, - 0x7706d7: LocationName.iceberg_3_s19, - 0x7706d8: LocationName.iceberg_3_s20, - 0x7706d9: LocationName.iceberg_3_s21, - 0x7706da: LocationName.iceberg_4_s1, - 0x7706db: LocationName.iceberg_4_s2, - 0x7706dc: LocationName.iceberg_4_s3, - 0x7706dd: LocationName.iceberg_5_s1, - 0x7706de: LocationName.iceberg_5_s2, - 0x7706df: LocationName.iceberg_5_s3, - 0x7706e0: LocationName.iceberg_5_s4, - 0x7706e1: LocationName.iceberg_5_s5, - 0x7706e2: LocationName.iceberg_5_s6, - 0x7706e3: LocationName.iceberg_5_s7, - 0x7706e4: LocationName.iceberg_5_s8, - 0x7706e5: LocationName.iceberg_5_s9, - 0x7706e6: LocationName.iceberg_5_s10, - 0x7706e7: LocationName.iceberg_5_s11, - 0x7706e8: LocationName.iceberg_5_s12, - 0x7706e9: LocationName.iceberg_5_s13, - 0x7706ea: LocationName.iceberg_5_s14, - 0x7706eb: LocationName.iceberg_5_s15, - 0x7706ec: LocationName.iceberg_5_s16, - 0x7706ed: LocationName.iceberg_5_s17, - 0x7706ee: LocationName.iceberg_5_s18, - 0x7706ef: LocationName.iceberg_5_s19, - 0x7706f0: LocationName.iceberg_5_s20, - 0x7706f1: LocationName.iceberg_5_s21, - 0x7706f2: LocationName.iceberg_5_s22, - 0x7706f3: LocationName.iceberg_5_s23, - 0x7706f4: LocationName.iceberg_5_s24, - 0x7706f5: LocationName.iceberg_5_s25, - 0x7706f6: LocationName.iceberg_5_s26, - 0x7706f7: LocationName.iceberg_5_s27, - 0x7706f8: LocationName.iceberg_5_s28, - 0x7706f9: LocationName.iceberg_5_s29, - 0x7706fa: LocationName.iceberg_5_s30, - 0x7706fb: LocationName.iceberg_5_s31, - 0x7706fc: LocationName.iceberg_5_s32, - 0x7706fd: LocationName.iceberg_5_s33, - 0x7706fe: LocationName.iceberg_5_s34, - 0x7706ff: LocationName.iceberg_6_s1, - -} - -location_table = { - **stage_locations, - **heart_star_locations, - **boss_locations, - **consumable_locations, - **star_locations -} diff --git a/worlds/kdl3/Rom.py b/worlds/kdl3/Rom.py deleted file mode 100644 index 5a846ab8be5e..000000000000 --- a/worlds/kdl3/Rom.py +++ /dev/null @@ -1,577 +0,0 @@ -import typing -from pkgutil import get_data - -import Utils -from typing import Optional, TYPE_CHECKING -import hashlib -import os -import struct - -import settings -from worlds.Files import APDeltaPatch -from .Aesthetics import get_palette_bytes, kirby_target_palettes, get_kirby_palette, gooey_target_palettes, \ - get_gooey_palette -from .Compression import hal_decompress -import bsdiff4 - -if TYPE_CHECKING: - from . import KDL3World - -KDL3UHASH = "201e7658f6194458a3869dde36bf8ec2" -KDL3JHASH = "b2f2d004ea640c3db66df958fce122b2" - -level_pointers = { - 0x770001: 0x0084, - 0x770002: 0x009C, - 0x770003: 0x00B8, - 0x770004: 0x00D8, - 0x770005: 0x0104, - 0x770006: 0x0124, - 0x770007: 0x014C, - 0x770008: 0x0170, - 0x770009: 0x0190, - 0x77000A: 0x01B0, - 0x77000B: 0x01E8, - 0x77000C: 0x0218, - 0x77000D: 0x024C, - 0x77000E: 0x0270, - 0x77000F: 0x02A0, - 0x770010: 0x02C4, - 0x770011: 0x02EC, - 0x770012: 0x0314, - 0x770013: 0x03CC, - 0x770014: 0x0404, - 0x770015: 0x042C, - 0x770016: 0x044C, - 0x770017: 0x0478, - 0x770018: 0x049C, - 0x770019: 0x04E4, - 0x77001A: 0x0504, - 0x77001B: 0x0530, - 0x77001C: 0x0554, - 0x77001D: 0x05A8, - 0x77001E: 0x0640, - 0x770200: 0x0148, - 0x770201: 0x0248, - 0x770202: 0x03C8, - 0x770203: 0x04E0, - 0x770204: 0x06A4, - 0x770205: 0x06A8, -} - -bb_bosses = { - 0x770200: 0xED85F1, - 0x770201: 0xF01360, - 0x770202: 0xEDA3DF, - 0x770203: 0xEDC2B9, - 0x770204: 0xED7C3F, - 0x770205: 0xEC29D2, -} - -level_sprites = { - 0x19B2C6: 1827, - 0x1A195C: 1584, - 0x19F6F3: 1679, - 0x19DC8B: 1717, - 0x197900: 1872 -} - -stage_tiles = { - 0: [ - 0, 1, 2, - 16, 17, 18, - 32, 33, 34, - 48, 49, 50 - ], - 1: [ - 3, 4, 5, - 19, 20, 21, - 35, 36, 37, - 51, 52, 53 - ], - 2: [ - 6, 7, 8, - 22, 23, 24, - 38, 39, 40, - 54, 55, 56 - ], - 3: [ - 9, 10, 11, - 25, 26, 27, - 41, 42, 43, - 57, 58, 59, - ], - 4: [ - 12, 13, 64, - 28, 29, 65, - 44, 45, 66, - 60, 61, 67 - ], - 5: [ - 14, 15, 68, - 30, 31, 69, - 46, 47, 70, - 62, 63, 71 - ] -} - -heart_star_address = 0x2D0000 -heart_star_size = 456 -consumable_address = 0x2F91DD -consumable_size = 698 - -stage_palettes = [0x60964, 0x60B64, 0x60D64, 0x60F64, 0x61164] - -music_choices = [ - 2, # Boss 1 - 3, # Boss 2 (Unused) - 4, # Boss 3 (Miniboss) - 7, # Dedede - 9, # Event 2 (used once) - 10, # Field 1 - 11, # Field 2 - 12, # Field 3 - 13, # Field 4 - 14, # Field 5 - 15, # Field 6 - 16, # Field 7 - 17, # Field 8 - 18, # Field 9 - 19, # Field 10 - 20, # Field 11 - 21, # Field 12 (Gourmet Race) - 23, # Dark Matter in the Hyper Zone - 24, # Zero - 25, # Level 1 - 26, # Level 2 - 27, # Level 4 - 28, # Level 3 - 29, # Heart Star Failed - 30, # Level 5 - 31, # Minigame - 38, # Animal Friend 1 - 39, # Animal Friend 2 - 40, # Animal Friend 3 -] -# extra room pointers we don't want to track other than for music -room_pointers = [ - 3079990, # Zero - 2983409, # BB Whispy - 3150688, # BB Acro - 2991071, # BB PonCon - 2998969, # BB Ado - 2980927, # BB Dedede - 2894290 # BB Zero -] - -enemy_remap = { - "Waddle Dee": 0, - "Bronto Burt": 2, - "Rocky": 3, - "Bobo": 5, - "Chilly": 6, - "Poppy Bros Jr.": 7, - "Sparky": 8, - "Polof": 9, - "Broom Hatter": 11, - "Cappy": 12, - "Bouncy": 13, - "Nruff": 15, - "Glunk": 16, - "Togezo": 18, - "Kabu": 19, - "Mony": 20, - "Blipper": 21, - "Squishy": 22, - "Gabon": 24, - "Oro": 25, - "Galbo": 26, - "Sir Kibble": 27, - "Nidoo": 28, - "Kany": 29, - "Sasuke": 30, - "Yaban": 32, - "Boten": 33, - "Coconut": 34, - "Doka": 35, - "Icicle": 36, - "Pteran": 39, - "Loud": 40, - "Como": 41, - "Klinko": 42, - "Babut": 43, - "Wappa": 44, - "Mariel": 45, - "Tick": 48, - "Apolo": 49, - "Popon Ball": 50, - "KeKe": 51, - "Magoo": 53, - "Raft Waddle Dee": 57, - "Madoo": 58, - "Corori": 60, - "Kapar": 67, - "Batamon": 68, - "Peran": 72, - "Bobin": 73, - "Mopoo": 74, - "Gansan": 75, - "Bukiset (Burning)": 76, - "Bukiset (Stone)": 77, - "Bukiset (Ice)": 78, - "Bukiset (Needle)": 79, - "Bukiset (Clean)": 80, - "Bukiset (Parasol)": 81, - "Bukiset (Spark)": 82, - "Bukiset (Cutter)": 83, - "Waddle Dee Drawing": 84, - "Bronto Burt Drawing": 85, - "Bouncy Drawing": 86, - "Kabu (Dekabu)": 87, - "Wapod": 88, - "Propeller": 89, - "Dogon": 90, - "Joe": 91 -} - -miniboss_remap = { - "Captain Stitch": 0, - "Yuki": 1, - "Blocky": 2, - "Jumper Shoot": 3, - "Boboo": 4, - "Haboki": 5 -} - -ability_remap = { - "No Ability": 0, - "Burning Ability": 1, - "Stone Ability": 2, - "Ice Ability": 3, - "Needle Ability": 4, - "Clean Ability": 5, - "Parasol Ability": 6, - "Spark Ability": 7, - "Cutter Ability": 8, -} - - -class RomData: - def __init__(self, file: str, name: typing.Optional[str] = None): - self.file = bytearray() - self.read_from_file(file) - self.name = name - - def read_byte(self, offset: int): - return self.file[offset] - - def read_bytes(self, offset: int, length: int): - return self.file[offset:offset + length] - - def write_byte(self, offset: int, value: int): - self.file[offset] = value - - def write_bytes(self, offset: int, values: typing.Sequence) -> None: - self.file[offset:offset + len(values)] = values - - def write_to_file(self, file: str): - with open(file, 'wb') as outfile: - outfile.write(self.file) - - def read_from_file(self, file: str): - with open(file, 'rb') as stream: - self.file = bytearray(stream.read()) - - def apply_patch(self, patch: bytes): - self.file = bytearray(bsdiff4.patch(bytes(self.file), patch)) - - def write_crc(self): - crc = (sum(self.file[:0x7FDC] + self.file[0x7FE0:]) + 0x01FE) & 0xFFFF - inv = crc ^ 0xFFFF - self.write_bytes(0x7FDC, [inv & 0xFF, (inv >> 8) & 0xFF, crc & 0xFF, (crc >> 8) & 0xFF]) - - -def handle_level_sprites(stages, sprites, palettes): - palette_by_level = list() - for palette in palettes: - palette_by_level.extend(palette[10:16]) - for i in range(5): - for j in range(6): - palettes[i][10 + j] = palette_by_level[stages[i][j] - 1] - palettes[i] = [x for palette in palettes[i] for x in palette] - tiles_by_level = list() - for spritesheet in sprites: - decompressed = hal_decompress(spritesheet) - tiles = [decompressed[i:i + 32] for i in range(0, 2304, 32)] - tiles_by_level.extend([[tiles[x] for x in stage_tiles[stage]] for stage in stage_tiles]) - for world in range(5): - levels = [stages[world][x] - 1 for x in range(6)] - world_tiles: typing.List[typing.Optional[bytes]] = [None for _ in range(72)] - for i in range(6): - for x in range(12): - world_tiles[stage_tiles[i][x]] = tiles_by_level[levels[i]][x] - sprites[world] = list() - for tile in world_tiles: - sprites[world].extend(tile) - # insert our fake compression - sprites[world][0:0] = [0xe3, 0xff] - sprites[world][1026:1026] = [0xe3, 0xff] - sprites[world][2052:2052] = [0xe0, 0xff] - sprites[world].append(0xff) - return sprites, palettes - - -def write_heart_star_sprites(rom: RomData): - compressed = rom.read_bytes(heart_star_address, heart_star_size) - decompressed = hal_decompress(compressed) - patch = get_data(__name__, os.path.join("data", "APHeartStar.bsdiff4")) - patched = bytearray(bsdiff4.patch(decompressed, patch)) - rom.write_bytes(0x1AF7DF, patched) - patched[0:0] = [0xE3, 0xFF] - patched.append(0xFF) - rom.write_bytes(0x1CD000, patched) - rom.write_bytes(0x3F0EBF, [0x00, 0xD0, 0x39]) - - -def write_consumable_sprites(rom: RomData, consumables: bool, stars: bool): - compressed = rom.read_bytes(consumable_address, consumable_size) - decompressed = hal_decompress(compressed) - patched = bytearray(decompressed) - if consumables: - patch = get_data(__name__, os.path.join("data", "APConsumable.bsdiff4")) - patched = bytearray(bsdiff4.patch(bytes(patched), patch)) - if stars: - patch = get_data(__name__, os.path.join("data", "APStars.bsdiff4")) - patched = bytearray(bsdiff4.patch(bytes(patched), patch)) - patched[0:0] = [0xE3, 0xFF] - patched.append(0xFF) - rom.write_bytes(0x1CD500, patched) - rom.write_bytes(0x3F0DAE, [0x00, 0xD5, 0x39]) - - -class KDL3DeltaPatch(APDeltaPatch): - hash = [KDL3UHASH, KDL3JHASH] - game = "Kirby's Dream Land 3" - patch_file_ending = ".apkdl3" - - @classmethod - def get_source_data(cls) -> bytes: - return get_base_rom_bytes() - - def patch(self, target: str): - super().patch(target) - rom = RomData(target) - target_language = rom.read_byte(0x3C020) - rom.write_byte(0x7FD9, target_language) - write_heart_star_sprites(rom) - if rom.read_bytes(0x3D014, 1)[0] > 0: - stages = [struct.unpack("HHHHHHH", rom.read_bytes(0x3D020 + x * 14, 14)) for x in range(5)] - palettes = [rom.read_bytes(full_pal, 512) for full_pal in stage_palettes] - palettes = [[palette[i:i + 32] for i in range(0, 512, 32)] for palette in palettes] - sprites = [rom.read_bytes(offset, level_sprites[offset]) for offset in level_sprites] - sprites, palettes = handle_level_sprites(stages, sprites, palettes) - for addr, palette in zip(stage_palettes, palettes): - rom.write_bytes(addr, palette) - for addr, level_sprite in zip([0x1CA000, 0x1CA920, 0x1CB230, 0x1CBB40, 0x1CC450], sprites): - rom.write_bytes(addr, level_sprite) - rom.write_bytes(0x460A, [0x00, 0xA0, 0x39, 0x20, 0xA9, 0x39, 0x30, 0xB2, 0x39, 0x40, 0xBB, 0x39, - 0x50, 0xC4, 0x39]) - write_consumable_sprites(rom, rom.read_byte(0x3D018) > 0, rom.read_byte(0x3D01A) > 0) - rom_name = rom.read_bytes(0x3C000, 21) - rom.write_bytes(0x7FC0, rom_name) - rom.write_crc() - rom.write_to_file(target) - - -def patch_rom(world: "KDL3World", rom: RomData): - rom.apply_patch(get_data(__name__, os.path.join("data", "kdl3_basepatch.bsdiff4"))) - tiles = get_data(__name__, os.path.join("data", "APPauseIcons.dat")) - rom.write_bytes(0x3F000, tiles) - - # Write open world patch - if world.options.open_world: - rom.write_bytes(0x143C7, [0xAD, 0xC1, 0x5A, 0xCD, 0xC1, 0x5A, ]) - # changes the stage flag function to compare $5AC1 to $5AC1, - # always running the "new stage" function - # This has further checks present for bosses already, so we just - # need to handle regular stages - # write check for boss to be unlocked - - if world.options.consumables: - # reroute maxim tomatoes to use the 1-UP function, then null out the function - rom.write_bytes(0x3002F, [0x37, 0x00]) - rom.write_bytes(0x30037, [0xA9, 0x26, 0x00, # LDA #$0026 - 0x22, 0x27, 0xD9, 0x00, # JSL $00D927 - 0xA4, 0xD2, # LDY $D2 - 0x6B, # RTL - 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, # NOP #10 - ]) - - # stars handling is built into the rom, so no changes there - - rooms = world.rooms - if world.options.music_shuffle > 0: - if world.options.music_shuffle == 1: - shuffled_music = music_choices.copy() - world.random.shuffle(shuffled_music) - music_map = dict(zip(music_choices, shuffled_music)) - # Avoid putting star twinkle in the pool - music_map[5] = world.random.choice(music_choices) - # Heart Star music doesn't work on regular stages - music_map[8] = world.random.choice(music_choices) - for room in rooms: - room.music = music_map[room.music] - for room in room_pointers: - old_music = rom.read_byte(room + 2) - rom.write_byte(room + 2, music_map[old_music]) - for i in range(5): - # level themes - old_music = rom.read_byte(0x133F2 + i) - rom.write_byte(0x133F2 + i, music_map[old_music]) - # Zero - rom.write_byte(0x9AE79, music_map[0x18]) - # Heart Star success and fail - rom.write_byte(0x4A388, music_map[0x08]) - rom.write_byte(0x4A38D, music_map[0x1D]) - elif world.options.music_shuffle == 2: - for room in rooms: - room.music = world.random.choice(music_choices) - for room in room_pointers: - rom.write_byte(room + 2, world.random.choice(music_choices)) - for i in range(5): - # level themes - rom.write_byte(0x133F2 + i, world.random.choice(music_choices)) - # Zero - rom.write_byte(0x9AE79, world.random.choice(music_choices)) - # Heart Star success and fail - rom.write_byte(0x4A388, world.random.choice(music_choices)) - rom.write_byte(0x4A38D, world.random.choice(music_choices)) - - for room in rooms: - room.patch(rom) - - if world.options.virtual_console in [1, 3]: - # Flash Reduction - rom.write_byte(0x9AE68, 0x10) - rom.write_bytes(0x9AE8E, [0x08, 0x00, 0x22, 0x5D, 0xF7, 0x00, 0xA2, 0x08, ]) - rom.write_byte(0x9AEA1, 0x08) - rom.write_byte(0x9AEC9, 0x01) - rom.write_bytes(0x9AED2, [0xA9, 0x1F]) - rom.write_byte(0x9AEE1, 0x08) - - if world.options.virtual_console in [2, 3]: - # Hyper Zone BB colors - rom.write_bytes(0x2C5E16, [0xEE, 0x1B, 0x18, 0x5B, 0xD3, 0x4A, 0xF4, 0x3B, ]) - rom.write_bytes(0x2C8217, [0xFF, 0x1E, ]) - - # boss requirements - rom.write_bytes(0x3D000, struct.pack("HHHHH", world.boss_requirements[0], world.boss_requirements[1], - world.boss_requirements[2], world.boss_requirements[3], - world.boss_requirements[4])) - rom.write_bytes(0x3D00A, struct.pack("H", world.required_heart_stars if world.options.goal_speed == 1 else 0xFFFF)) - rom.write_byte(0x3D00C, world.options.goal_speed.value) - rom.write_byte(0x3D00E, world.options.open_world.value) - rom.write_byte(0x3D010, world.options.death_link.value) - rom.write_byte(0x3D012, world.options.goal.value) - rom.write_byte(0x3D014, world.options.stage_shuffle.value) - rom.write_byte(0x3D016, world.options.ow_boss_requirement.value) - rom.write_byte(0x3D018, world.options.consumables.value) - rom.write_byte(0x3D01A, world.options.starsanity.value) - rom.write_byte(0x3D01C, world.options.gifting.value if world.multiworld.players > 1 else 0) - rom.write_byte(0x3D01E, world.options.strict_bosses.value) - # don't write gifting for solo game, since there's no one to send anything to - - for level in world.player_levels: - for i in range(len(world.player_levels[level])): - rom.write_bytes(0x3F002E + ((level - 1) * 14) + (i * 2), - struct.pack("H", level_pointers[world.player_levels[level][i]])) - rom.write_bytes(0x3D020 + (level - 1) * 14 + (i * 2), - struct.pack("H", world.player_levels[level][i] & 0x00FFFF)) - if (i == 0) or (i > 0 and i % 6 != 0): - rom.write_bytes(0x3D080 + (level - 1) * 12 + (i * 2), - struct.pack("H", (world.player_levels[level][i] & 0x00FFFF) % 6)) - - for i in range(6): - if world.boss_butch_bosses[i]: - rom.write_bytes(0x3F0000 + (level_pointers[0x770200 + i]), struct.pack("I", bb_bosses[0x770200 + i])) - - # copy ability shuffle - if world.options.copy_ability_randomization.value > 0: - for enemy in world.copy_abilities: - if enemy in miniboss_remap: - rom.write_bytes(0xB417E + (miniboss_remap[enemy] << 1), - struct.pack("H", ability_remap[world.copy_abilities[enemy]])) - else: - rom.write_bytes(0xB3CAC + (enemy_remap[enemy] << 1), - struct.pack("H", ability_remap[world.copy_abilities[enemy]])) - # following only needs done on non-door rando - # incredibly lucky this follows the same order (including 5E == star block) - rom.write_byte(0x2F77EA, 0x5E + (ability_remap[world.copy_abilities["Sparky"]] << 1)) - rom.write_byte(0x2F7811, 0x5E + (ability_remap[world.copy_abilities["Sparky"]] << 1)) - rom.write_byte(0x2F9BC4, 0x5E + (ability_remap[world.copy_abilities["Blocky"]] << 1)) - rom.write_byte(0x2F9BEB, 0x5E + (ability_remap[world.copy_abilities["Blocky"]] << 1)) - rom.write_byte(0x2FAC06, 0x5E + (ability_remap[world.copy_abilities["Jumper Shoot"]] << 1)) - rom.write_byte(0x2FAC2D, 0x5E + (ability_remap[world.copy_abilities["Jumper Shoot"]] << 1)) - rom.write_byte(0x2F9E7B, 0x5E + (ability_remap[world.copy_abilities["Yuki"]] << 1)) - rom.write_byte(0x2F9EA2, 0x5E + (ability_remap[world.copy_abilities["Yuki"]] << 1)) - rom.write_byte(0x2FA951, 0x5E + (ability_remap[world.copy_abilities["Sir Kibble"]] << 1)) - rom.write_byte(0x2FA978, 0x5E + (ability_remap[world.copy_abilities["Sir Kibble"]] << 1)) - rom.write_byte(0x2FA132, 0x5E + (ability_remap[world.copy_abilities["Haboki"]] << 1)) - rom.write_byte(0x2FA159, 0x5E + (ability_remap[world.copy_abilities["Haboki"]] << 1)) - rom.write_byte(0x2FA3E8, 0x5E + (ability_remap[world.copy_abilities["Boboo"]] << 1)) - rom.write_byte(0x2FA40F, 0x5E + (ability_remap[world.copy_abilities["Boboo"]] << 1)) - rom.write_byte(0x2F90E2, 0x5E + (ability_remap[world.copy_abilities["Captain Stitch"]] << 1)) - rom.write_byte(0x2F9109, 0x5E + (ability_remap[world.copy_abilities["Captain Stitch"]] << 1)) - - if world.options.copy_ability_randomization == 2: - for enemy in enemy_remap: - # we just won't include it for minibosses - rom.write_bytes(0xB3E40 + (enemy_remap[enemy] << 1), struct.pack("h", world.random.randint(-1, 2))) - - # write jumping goal - rom.write_bytes(0x94F8, struct.pack("H", world.options.jumping_target)) - rom.write_bytes(0x944E, struct.pack("H", world.options.jumping_target)) - - from Utils import __version__ - rom.name = bytearray( - f'KDL3{__version__.replace(".", "")[0:3]}_{world.player}_{world.multiworld.seed:11}\0', 'utf8')[:21] - rom.name.extend([0] * (21 - len(rom.name))) - rom.write_bytes(0x3C000, rom.name) - rom.write_byte(0x3C020, world.options.game_language.value) - - # handle palette - if world.options.kirby_flavor_preset.value != 0: - for addr in kirby_target_palettes: - target = kirby_target_palettes[addr] - palette = get_kirby_palette(world) - rom.write_bytes(addr, get_palette_bytes(palette, target[0], target[1], target[2])) - - if world.options.gooey_flavor_preset.value != 0: - for addr in gooey_target_palettes: - target = gooey_target_palettes[addr] - palette = get_gooey_palette(world) - rom.write_bytes(addr, get_palette_bytes(palette, target[0], target[1], target[2])) - - -def get_base_rom_bytes() -> bytes: - rom_file: str = get_base_rom_path() - base_rom_bytes: Optional[bytes] = getattr(get_base_rom_bytes, "base_rom_bytes", None) - if not base_rom_bytes: - base_rom_bytes = bytes(Utils.read_snes_rom(open(rom_file, "rb"))) - - basemd5 = hashlib.md5() - basemd5.update(base_rom_bytes) - if basemd5.hexdigest() not in {KDL3UHASH, KDL3JHASH}: - raise Exception("Supplied Base Rom does not match known MD5 for US or JP release. " - "Get the correct game and version, then dump it") - get_base_rom_bytes.base_rom_bytes = base_rom_bytes - return base_rom_bytes - - -def get_base_rom_path(file_name: str = "") -> str: - options: settings.Settings = settings.get_settings() - if not file_name: - file_name = options["kdl3_options"]["rom_file"] - if not os.path.exists(file_name): - file_name = Utils.user_path(file_name) - return file_name diff --git a/worlds/kdl3/Room.py b/worlds/kdl3/Room.py deleted file mode 100644 index 256955b924ab..000000000000 --- a/worlds/kdl3/Room.py +++ /dev/null @@ -1,95 +0,0 @@ -import struct -import typing -from BaseClasses import Region, ItemClassification - -if typing.TYPE_CHECKING: - from .Rom import RomData - -animal_map = { - "Rick Spawn": 0, - "Kine Spawn": 1, - "Coo Spawn": 2, - "Nago Spawn": 3, - "ChuChu Spawn": 4, - "Pitch Spawn": 5 -} - - -class KDL3Room(Region): - pointer: int = 0 - level: int = 0 - stage: int = 0 - room: int = 0 - music: int = 0 - default_exits: typing.List[typing.Dict[str, typing.Union[int, typing.List[str]]]] - animal_pointers: typing.List[int] - enemies: typing.List[str] - entity_load: typing.List[typing.List[int]] - consumables: typing.List[typing.Dict[str, typing.Union[int, str]]] - - def __init__(self, name, player, multiworld, hint, level, stage, room, pointer, music, default_exits, - animal_pointers, enemies, entity_load, consumables, consumable_pointer): - super().__init__(name, player, multiworld, hint) - self.level = level - self.stage = stage - self.room = room - self.pointer = pointer - self.music = music - self.default_exits = default_exits - self.animal_pointers = animal_pointers - self.enemies = enemies - self.entity_load = entity_load - self.consumables = consumables - self.consumable_pointer = consumable_pointer - - def patch(self, rom: "RomData"): - rom.write_byte(self.pointer + 2, self.music) - animals = [x.item.name for x in self.locations if "Animal" in x.name] - if len(animals) > 0: - for current_animal, address in zip(animals, self.animal_pointers): - rom.write_byte(self.pointer + address + 7, animal_map[current_animal]) - if self.multiworld.worlds[self.player].options.consumables: - load_len = len(self.entity_load) - for consumable in self.consumables: - location = next(x for x in self.locations if x.name == consumable["name"]) - assert location.item - is_progression = location.item.classification & ItemClassification.progression - if load_len == 8: - # edge case, there is exactly 1 room with 8 entities and only 1 consumable among them - if not (any(x in self.entity_load for x in [[0, 22], [1, 22]]) - and any(x in self.entity_load for x in [[2, 22], [3, 22]])): - replacement_target = self.entity_load.index( - next(x for x in self.entity_load if x in [[0, 22], [1, 22], [2, 22], [3, 22]])) - if is_progression: - vtype = 0 - else: - vtype = 2 - rom.write_byte(self.pointer + 88 + (replacement_target * 2), vtype) - self.entity_load[replacement_target] = [vtype, 22] - else: - if is_progression: - # we need to see if 1-ups are in our load list - if any(x not in self.entity_load for x in [[0, 22], [1, 22]]): - self.entity_load.append([0, 22]) - else: - if any(x not in self.entity_load for x in [[2, 22], [3, 22]]): - # edge case: if (1, 22) is in, we need to load (3, 22) instead - if [1, 22] in self.entity_load: - self.entity_load.append([3, 22]) - else: - self.entity_load.append([2, 22]) - if load_len < len(self.entity_load): - rom.write_bytes(self.pointer + 88 + (load_len * 2), bytes(self.entity_load[load_len])) - rom.write_bytes(self.pointer + 104 + (load_len * 2), - bytes(struct.pack("H", self.consumable_pointer))) - if is_progression: - if [1, 22] in self.entity_load: - vtype = 1 - else: - vtype = 0 - else: - if [3, 22] in self.entity_load: - vtype = 3 - else: - vtype = 2 - rom.write_byte(self.pointer + consumable["pointer"] + 7, vtype) diff --git a/worlds/kdl3/__init__.py b/worlds/kdl3/__init__.py index 8c9f3cc46a4e..12f56a02304d 100644 --- a/worlds/kdl3/__init__.py +++ b/worlds/kdl3/__init__.py @@ -1,25 +1,25 @@ import logging -import typing -from BaseClasses import Tutorial, ItemClassification, MultiWorld +from BaseClasses import Tutorial, ItemClassification, MultiWorld, CollectionState, Item from Fill import fill_restrictive from Options import PerGameCommonOptions from worlds.AutoWorld import World, WebWorld -from .Items import item_table, item_names, copy_ability_table, animal_friend_table, filler_item_weights, KDL3Item, \ - trap_item_table, copy_ability_access_table, star_item_weights, total_filler_weights -from .Locations import location_table, KDL3Location, level_consumables, consumable_locations, star_locations -from .Names.AnimalFriendSpawns import animal_friend_spawns -from .Names.EnemyAbilities import vanilla_enemies, enemy_mapping, enemy_restrictive -from .Regions import create_levels, default_levels -from .Options import KDL3Options -from .Presets import kdl3_options_presets -from .Names import LocationName -from .Room import KDL3Room -from .Rules import set_rules -from .Rom import KDL3DeltaPatch, get_base_rom_path, RomData, patch_rom, KDL3JHASH, KDL3UHASH -from .Client import KDL3SNIClient - -from typing import Dict, TextIO, Optional, List +from .items import item_table, item_names, copy_ability_table, animal_friend_table, filler_item_weights, KDL3Item, \ + trap_item_table, copy_ability_access_table, star_item_weights, total_filler_weights, animal_friend_spawn_table,\ + lookup_item_to_id +from .locations import location_table, KDL3Location, level_consumables, consumable_locations, star_locations +from .names.animal_friend_spawns import animal_friend_spawns, problematic_sets +from .names.enemy_abilities import vanilla_enemies, enemy_mapping, enemy_restrictive +from .regions import create_levels, default_levels +from .options import KDL3Options, kdl3_option_groups +from .presets import kdl3_options_presets +from .names import location_name +from .room import KDL3Room +from .rules import set_rules +from .rom import KDL3ProcedurePatch, get_base_rom_path, patch_rom, KDL3JHASH, KDL3UHASH +from .client import KDL3SNIClient + +from typing import Dict, TextIO, Optional, List, Any, Mapping, ClassVar, Type import os import math import threading @@ -53,6 +53,7 @@ class KDL3WebWorld(WebWorld): ) ] options_presets = kdl3_options_presets + option_groups = kdl3_option_groups class KDL3World(World): @@ -61,35 +62,35 @@ class KDL3World(World): """ game = "Kirby's Dream Land 3" - options_dataclass: typing.ClassVar[typing.Type[PerGameCommonOptions]] = KDL3Options + options_dataclass: ClassVar[Type[PerGameCommonOptions]] = KDL3Options options: KDL3Options - item_name_to_id = {item: item_table[item].code for item in item_table} + item_name_to_id = lookup_item_to_id location_name_to_id = {location_table[location]: location for location in location_table} item_name_groups = item_names web = KDL3WebWorld() - settings: typing.ClassVar[KDL3Settings] + settings: ClassVar[KDL3Settings] def __init__(self, multiworld: MultiWorld, player: int): - self.rom_name = None + self.rom_name: bytes = bytes() self.rom_name_available_event = threading.Event() super().__init__(multiworld, player) self.copy_abilities: Dict[str, str] = vanilla_enemies.copy() self.required_heart_stars: int = 0 # we fill this during create_items - self.boss_requirements: Dict[int, int] = dict() + self.boss_requirements: List[int] = [] self.player_levels = default_levels.copy() self.stage_shuffle_enabled = False - self.boss_butch_bosses: List[Optional[bool]] = list() - self.rooms: Optional[List[KDL3Room]] = None - - @classmethod - def stage_assert_generate(cls, multiworld: MultiWorld) -> None: - rom_file: str = get_base_rom_path() - if not os.path.exists(rom_file): - raise FileNotFoundError(f"Could not find base ROM for {cls.game}: {rom_file}") + self.boss_butch_bosses: List[Optional[bool]] = [] + self.rooms: List[KDL3Room] = [] create_regions = create_levels - def create_item(self, name: str, force_non_progression=False) -> KDL3Item: + def generate_early(self) -> None: + if self.options.total_heart_stars != -1: + logger.warning(f"Kirby's Dream Land 3 ({self.player_name}): Use of \"total_heart_stars\" is deprecated. " + f"Please use \"max_heart_stars\" instead.") + self.options.max_heart_stars.value = self.options.total_heart_stars.value + + def create_item(self, name: str, force_non_progression: bool = False) -> KDL3Item: item = item_table[name] classification = ItemClassification.filler if item.progression and not force_non_progression: @@ -99,7 +100,7 @@ def create_item(self, name: str, force_non_progression=False) -> KDL3Item: classification = ItemClassification.trap return KDL3Item(name, classification, item.code, self.player) - def get_filler_item_name(self, include_stars=True) -> str: + def get_filler_item_name(self, include_stars: bool = True) -> str: if include_stars: return self.random.choices(list(total_filler_weights.keys()), weights=list(total_filler_weights.values()))[0] @@ -112,8 +113,8 @@ def get_trap_item_name(self) -> str: self.options.slow_trap_weight.value, self.options.ability_trap_weight.value])[0] - def get_restrictive_copy_ability_placement(self, copy_ability: str, enemies_to_set: typing.List[str], - level: int, stage: int): + def get_restrictive_copy_ability_placement(self, copy_ability: str, enemies_to_set: List[str], + level: int, stage: int) -> Optional[str]: valid_rooms = [room for room in self.rooms if (room.level < level) or (room.level == level and room.stage < stage)] # leave out the stage in question to avoid edge valid_enemies = set() @@ -124,6 +125,10 @@ def get_restrictive_copy_ability_placement(self, copy_ability: str, enemies_to_s return None # a valid enemy got placed by a more restrictive placement return self.random.choice(sorted([enemy for enemy in valid_enemies if enemy not in placed_enemies])) + def get_pre_fill_items(self) -> List[Item]: + return [self.create_item(item) + for item in [*copy_ability_access_table.keys(), *animal_friend_spawn_table.keys()]] + def pre_fill(self) -> None: if self.options.copy_ability_randomization: # randomize copy abilities @@ -207,10 +212,32 @@ def pre_fill(self) -> None: # If Kine is ever the last animal friend placed, he will cause fill errors on closed world animal_pool.sort() locations = [self.multiworld.get_location(spawn, self.player) for spawn in spawns] - items = [self.create_item(animal) for animal in animal_pool] - allstate = self.multiworld.get_all_state(False) + items: List[Item] = [self.create_item(animal) for animal in animal_pool] + allstate = CollectionState(self.multiworld) + for item in [*copy_ability_table, *animal_friend_table, *["Heart Star" for _ in range(99)]]: + self.collect(allstate, self.create_item(item)) self.random.shuffle(locations) fill_restrictive(self.multiworld, allstate, locations, items, True, True) + + # Need to ensure all of these are unique items, and replace them if they aren't + for spawns in problematic_sets: + placed = [self.get_location(spawn).item for spawn in spawns] + placed_names = set([item.name for item in placed]) + if len(placed_names) != len(placed): + # have a duplicate + animals = [] + for spawn in spawns: + spawn_location = self.get_location(spawn) + if spawn_location.item.name not in animals: + animals.append(spawn_location.item.name) + else: + new_animal = self.random.choice([x for x in ["Rick Spawn", "Coo Spawn", "Kine Spawn", + "ChuChu Spawn", "Nago Spawn", "Pitch Spawn"] + if x not in placed_names and x not in animals]) + spawn_location.item = None + spawn_location.place_locked_item(self.create_item(new_animal)) + animals.append(new_animal) + # logically, this should be sound pre-ER. May need to adjust around it with ER in the future else: animal_friends = animal_friend_spawns.copy() for animal in animal_friends: @@ -225,21 +252,20 @@ def create_items(self) -> None: remaining_items = len(location_table) - len(itempool) if not self.options.consumables: remaining_items -= len(consumable_locations) - remaining_items -= len(star_locations) - if self.options.starsanity: - # star fill, keep consumable pool locked to consumable and fill 767 stars specifically - star_items = list(star_item_weights.keys()) - star_weights = list(star_item_weights.values()) - itempool.extend([self.create_item(item) for item in self.random.choices(star_items, weights=star_weights, - k=767)]) - total_heart_stars = self.options.total_heart_stars + if not self.options.starsanity: + remaining_items -= len(star_locations) + max_heart_stars = self.options.max_heart_stars.value + if max_heart_stars > remaining_items: + max_heart_stars = remaining_items # ensure at least 1 heart star required per world - required_heart_stars = max(int(total_heart_stars * required_percentage), 5) - filler_items = total_heart_stars - required_heart_stars - filler_amount = math.floor(filler_items * (self.options.filler_percentage / 100.0)) - trap_amount = math.floor(filler_amount * (self.options.trap_percentage / 100.0)) - filler_amount -= trap_amount - non_required_heart_stars = filler_items - filler_amount - trap_amount + required_heart_stars = min(max(int(max_heart_stars * required_percentage), 5), 99) + filler_items = remaining_items - required_heart_stars + converted_heart_stars = math.floor((max_heart_stars - required_heart_stars) * (self.options.filler_percentage / 100.0)) + non_required_heart_stars = max_heart_stars - converted_heart_stars - required_heart_stars + filler_items -= non_required_heart_stars + trap_amount = math.floor(filler_items * (self.options.trap_percentage / 100.0)) + + filler_items -= trap_amount self.required_heart_stars = required_heart_stars # handle boss requirements here requirements = [required_heart_stars] @@ -261,8 +287,8 @@ def create_items(self) -> None: requirements.insert(i - 1, quotient * i) self.boss_requirements = requirements itempool.extend([self.create_item("Heart Star") for _ in range(required_heart_stars)]) - itempool.extend([self.create_item(self.get_filler_item_name(False)) - for _ in range(filler_amount + (remaining_items - total_heart_stars))]) + itempool.extend([self.create_item(self.get_filler_item_name(bool(self.options.starsanity.value))) + for _ in range(filler_items)]) itempool.extend([self.create_item(self.get_trap_item_name()) for _ in range(trap_amount)]) itempool.extend([self.create_item("Heart Star", True) for _ in range(non_required_heart_stars)]) @@ -273,15 +299,15 @@ def create_items(self) -> None: self.multiworld.get_location(location_table[self.player_levels[level][stage]] .replace("Complete", "Stage Completion"), self.player) \ .place_locked_item(KDL3Item( - f"{LocationName.level_names_inverse[level]} - Stage Completion", + f"{location_name.level_names_inverse[level]} - Stage Completion", ItemClassification.progression, None, self.player)) set_rules = set_rules def generate_basic(self) -> None: self.stage_shuffle_enabled = self.options.stage_shuffle > 0 - goal = self.options.goal - goal_location = self.multiworld.get_location(LocationName.goals[goal], self.player) + goal = self.options.goal.value + goal_location = self.multiworld.get_location(location_name.goals[goal], self.player) goal_location.place_locked_item(KDL3Item("Love-Love Rod", ItemClassification.progression, None, self.player)) for level in range(1, 6): self.multiworld.get_location(f"Level {level} Boss - Defeated", self.player) \ @@ -300,60 +326,65 @@ def generate_basic(self) -> None: else: self.boss_butch_bosses = [False for _ in range(6)] - def generate_output(self, output_directory: str): - rom_path = "" + def generate_output(self, output_directory: str) -> None: try: - rom = RomData(get_base_rom_path()) - patch_rom(self, rom) + patch = KDL3ProcedurePatch() + patch_rom(self, patch) - rom_path = os.path.join(output_directory, f"{self.multiworld.get_out_file_name_base(self.player)}.sfc") - rom.write_to_file(rom_path) - self.rom_name = rom.name + self.rom_name = patch.name - patch = KDL3DeltaPatch(os.path.splitext(rom_path)[0] + KDL3DeltaPatch.patch_file_ending, player=self.player, - player_name=self.multiworld.player_name[self.player], patched_path=rom_path) - patch.write() + patch.write(os.path.join(output_directory, + f"{self.multiworld.get_out_file_name_base(self.player)}{patch.patch_file_ending}")) except Exception: raise finally: self.rom_name_available_event.set() # make sure threading continues and errors are collected - if os.path.exists(rom_path): - os.unlink(rom_path) - def modify_multidata(self, multidata: dict): + def modify_multidata(self, multidata: Dict[str, Any]) -> None: # wait for self.rom_name to be available. self.rom_name_available_event.wait() + assert isinstance(self.rom_name, bytes) rom_name = getattr(self, "rom_name", None) # we skip in case of error, so that the original error in the output thread is the one that gets raised if rom_name: - new_name = base64.b64encode(bytes(self.rom_name)).decode() + new_name = base64.b64encode(self.rom_name).decode() multidata["connect_names"][new_name] = multidata["connect_names"][self.multiworld.player_name[self.player]] + def fill_slot_data(self) -> Mapping[str, Any]: + # UT support + return {"player_levels": self.player_levels} + + def interpret_slot_data(self, slot_data: Mapping[str, Any]): + # UT support + player_levels = {int(key): value for key, value in slot_data["player_levels"].items()} + return {"player_levels": player_levels} + def write_spoiler(self, spoiler_handle: TextIO) -> None: if self.stage_shuffle_enabled: spoiler_handle.write(f"\nLevel Layout ({self.multiworld.get_player_name(self.player)}):\n") - for level in LocationName.level_names: - for stage, i in zip(self.player_levels[LocationName.level_names[level]], range(1, 7)): + for level in location_name.level_names: + for stage, i in zip(self.player_levels[location_name.level_names[level]], range(1, 7)): spoiler_handle.write(f"{level} {i}: {location_table[stage].replace(' - Complete', '')}\n") if self.options.animal_randomization: spoiler_handle.write(f"\nAnimal Friends ({self.multiworld.get_player_name(self.player)}):\n") - for level in self.player_levels: + for lvl in self.player_levels: for stage in range(6): - rooms = [room for room in self.rooms if room.level == level and room.stage == stage] + rooms = [room for room in self.rooms if room.level == lvl and room.stage == stage] animals = [] for room in rooms: animals.extend([location.item.name.replace(" Spawn", "") - for location in room.locations if "Animal" in location.name]) - spoiler_handle.write(f"{location_table[self.player_levels[level][stage]].replace(' - Complete','')}" + for location in room.locations if "Animal" in location.name + and location.item is not None]) + spoiler_handle.write(f"{location_table[self.player_levels[lvl][stage]].replace(' - Complete','')}" f": {', '.join(animals)}\n") if self.options.copy_ability_randomization: spoiler_handle.write(f"\nCopy Abilities ({self.multiworld.get_player_name(self.player)}):\n") for enemy in self.copy_abilities: spoiler_handle.write(f"{enemy}: {self.copy_abilities[enemy].replace('No Ability', 'None').replace(' Ability', '')}\n") - def extend_hint_information(self, hint_data: Dict[int, Dict[int, str]]): + def extend_hint_information(self, hint_data: Dict[int, Dict[int, str]]) -> None: if self.stage_shuffle_enabled: - regions = {LocationName.level_names[level]: level for level in LocationName.level_names} + regions = {location_name.level_names[level]: level for level in location_name.level_names} level_hint_data = {} for level in regions: for stage in range(7): @@ -361,6 +392,6 @@ def extend_hint_information(self, hint_data: Dict[int, Dict[int, str]]): self.player).name.replace(" - Complete", "") stage_regions = [room for room in self.rooms if stage_name in room.name] for region in stage_regions: - for location in [location for location in region.locations if location.address]: + for location in [location for location in list(region.get_locations()) if location.address]: level_hint_data[location.address] = f"{regions[level]} {stage + 1 if stage < 6 else 'Boss'}" hint_data[self.player] = level_hint_data diff --git a/worlds/kdl3/Aesthetics.py b/worlds/kdl3/aesthetics.py similarity index 91% rename from worlds/kdl3/Aesthetics.py rename to worlds/kdl3/aesthetics.py index 8c7363908f52..8b798ff93ede 100644 --- a/worlds/kdl3/Aesthetics.py +++ b/worlds/kdl3/aesthetics.py @@ -1,5 +1,9 @@ import struct -from .Options import KirbyFlavorPreset, GooeyFlavorPreset +from .options import KirbyFlavorPreset, GooeyFlavorPreset +from typing import TYPE_CHECKING, Optional, Dict, List, Tuple + +if TYPE_CHECKING: + from . import KDL3World kirby_flavor_presets = { 1: { @@ -223,6 +227,23 @@ "14": "E6E6FA", "15": "976FBD", }, + 14: { + "1": "373B3E", + "2": "98d5d3", + "3": "1aa5ab", + "4": "168f95", + "5": "4f5559", + "6": "1dbac2", + "7": "137a7f", + "8": "093a3c", + "9": "86cecb", + "10": "a0afbc", + "11": "62bfbb", + "12": "50b8b4", + "13": "bec8d1", + "14": "bce4e2", + "15": "91a2b1", + } } gooey_flavor_presets = { @@ -398,21 +419,21 @@ } -def get_kirby_palette(world): +def get_kirby_palette(world: "KDL3World") -> Optional[Dict[str, str]]: palette = world.options.kirby_flavor_preset.value if palette == KirbyFlavorPreset.option_custom: return world.options.kirby_flavor.value return kirby_flavor_presets.get(palette, None) -def get_gooey_palette(world): +def get_gooey_palette(world: "KDL3World") -> Optional[Dict[str, str]]: palette = world.options.gooey_flavor_preset.value if palette == GooeyFlavorPreset.option_custom: return world.options.gooey_flavor.value return gooey_flavor_presets.get(palette, None) -def rgb888_to_bgr555(red, green, blue) -> bytes: +def rgb888_to_bgr555(red: int, green: int, blue: int) -> bytes: red = red >> 3 green = green >> 3 blue = blue >> 3 @@ -420,15 +441,15 @@ def rgb888_to_bgr555(red, green, blue) -> bytes: return struct.pack("H", outcol) -def get_palette_bytes(palette, target, offset, factor): +def get_palette_bytes(palette: Dict[str, str], target: List[str], offset: int, factor: float) -> bytes: output_data = bytearray() for color in target: hexcol = palette[color] if hexcol.startswith("#"): hexcol = hexcol.replace("#", "") colint = int(hexcol, 16) - col = ((colint & 0xFF0000) >> 16, (colint & 0xFF00) >> 8, colint & 0xFF) + col: Tuple[int, ...] = ((colint & 0xFF0000) >> 16, (colint & 0xFF00) >> 8, colint & 0xFF) col = tuple(int(int(factor*x) + offset) for x in col) byte_data = rgb888_to_bgr555(col[0], col[1], col[2]) output_data.extend(bytearray(byte_data)) - return output_data + return bytes(output_data) diff --git a/worlds/kdl3/Client.py b/worlds/kdl3/client.py similarity index 90% rename from worlds/kdl3/Client.py rename to worlds/kdl3/client.py index 1ca21d550e67..97bf68cbd99a 100644 --- a/worlds/kdl3/Client.py +++ b/worlds/kdl3/client.py @@ -11,13 +11,13 @@ from NetUtils import ClientStatus, color from Utils import async_start from worlds.AutoSNIClient import SNIClient -from .Locations import boss_locations -from .Gifting import kdl3_gifting_options, kdl3_trap_gifts, kdl3_gifts, update_object, pop_object, initialize_giftboxes -from .ClientAddrs import consumable_addrs, star_addrs +from .locations import boss_locations +from .gifting import kdl3_gifting_options, kdl3_trap_gifts, kdl3_gifts, update_object, pop_object, initialize_giftboxes +from .client_addrs import consumable_addrs, star_addrs from typing import TYPE_CHECKING if TYPE_CHECKING: - from SNIClient import SNIClientCommandProcessor + from SNIClient import SNIClientCommandProcessor, SNIContext snes_logger = logging.getLogger("SNES") @@ -81,17 +81,16 @@ @mark_raw -def cmd_gift(self: "SNIClientCommandProcessor"): +def cmd_gift(self: "SNIClientCommandProcessor") -> None: """Toggles gifting for the current game.""" - if not getattr(self.ctx, "gifting", None): - self.ctx.gifting = True - else: - self.ctx.gifting = not self.ctx.gifting - self.output(f"Gifting set to {self.ctx.gifting}") + handler = self.ctx.client_handler + assert isinstance(handler, KDL3SNIClient) + handler.gifting = not handler.gifting + self.output(f"Gifting set to {handler.gifting}") async_start(update_object(self.ctx, f"Giftboxes;{self.ctx.team}", { f"{self.ctx.slot}": { - "IsOpen": self.ctx.gifting, + "IsOpen": handler.gifting, **kdl3_gifting_options } })) @@ -100,16 +99,17 @@ def cmd_gift(self: "SNIClientCommandProcessor"): class KDL3SNIClient(SNIClient): game = "Kirby's Dream Land 3" patch_suffix = ".apkdl3" - levels = None - consumables = None - stars = None - item_queue: typing.List = [] - initialize_gifting = False + levels: typing.Dict[int, typing.List[int]] = {} + consumables: typing.Optional[bool] = None + stars: typing.Optional[bool] = None + item_queue: typing.List[int] = [] + initialize_gifting: bool = False + gifting: bool = False giftbox_key: str = "" motherbox_key: str = "" client_random: random.Random = random.Random() - async def deathlink_kill_player(self, ctx) -> None: + async def deathlink_kill_player(self, ctx: "SNIContext") -> None: from SNIClient import DeathState, snes_buffered_write, snes_flush_writes, snes_read game_state = await snes_read(ctx, KDL3_GAME_STATE, 1) if game_state[0] == 0xFF: @@ -131,7 +131,7 @@ async def deathlink_kill_player(self, ctx) -> None: ctx.death_state = DeathState.dead ctx.last_death_link = time.time() - async def validate_rom(self, ctx) -> bool: + async def validate_rom(self, ctx: "SNIContext") -> bool: from SNIClient import snes_read rom_name = await snes_read(ctx, KDL3_ROMNAME, 0x15) if rom_name is None or rom_name == bytes([0] * 0x15) or rom_name[:4] != b"KDL3": @@ -141,7 +141,7 @@ async def validate_rom(self, ctx) -> bool: ctx.game = self.game ctx.rom = rom_name - ctx.items_handling = 0b111 # always remote items + ctx.items_handling = 0b101 # default local items with remote start inventory ctx.allow_collect = True if "gift" not in ctx.command_processor.commands: ctx.command_processor.commands["gift"] = cmd_gift @@ -149,9 +149,10 @@ async def validate_rom(self, ctx) -> bool: death_link = await snes_read(ctx, KDL3_DEATH_LINK_ADDR, 1) if death_link: await ctx.update_death_link(bool(death_link[0] & 0b1)) + ctx.items_handling |= (death_link[0] & 0b10) # set local items if enabled return True - async def pop_item(self, ctx, in_stage): + async def pop_item(self, ctx: "SNIContext", in_stage: bool) -> None: from SNIClient import snes_buffered_write, snes_read if len(self.item_queue) > 0: item = self.item_queue.pop() @@ -168,8 +169,8 @@ async def pop_item(self, ctx, in_stage): else: self.item_queue.append(item) # no more slots, get it next go around - async def pop_gift(self, ctx): - if ctx.stored_data[self.giftbox_key]: + async def pop_gift(self, ctx: "SNIContext") -> None: + if self.giftbox_key in ctx.stored_data and ctx.stored_data[self.giftbox_key]: from SNIClient import snes_read, snes_buffered_write key, gift = ctx.stored_data[self.giftbox_key].popitem() await pop_object(ctx, self.giftbox_key, key) @@ -214,7 +215,7 @@ async def pop_gift(self, ctx): quality = min(10, quality * 2) else: # it's not really edible, but he'll eat it anyway - quality = self.client_random.choices(range(0, 2), {0: 75, 1: 25})[0] + quality = self.client_random.choices(range(0, 2), [75, 25])[0] kirby_hp = await snes_read(ctx, KDL3_KIRBY_HP, 1) gooey_hp = await snes_read(ctx, KDL3_KIRBY_HP + 2, 1) snes_buffered_write(ctx, KDL3_SOUND_FX, bytes([0x26])) @@ -224,7 +225,8 @@ async def pop_gift(self, ctx): else: snes_buffered_write(ctx, KDL3_KIRBY_HP, struct.pack("H", min(kirby_hp[0] + quality, 10))) - async def pick_gift_recipient(self, ctx, gift): + async def pick_gift_recipient(self, ctx: "SNIContext", gift: int) -> None: + assert ctx.slot if gift != 4: gift_base = kdl3_gifts[gift] else: @@ -238,7 +240,7 @@ async def pick_gift_recipient(self, ctx, gift): if desire > most_applicable: most_applicable = desire most_applicable_slot = int(slot) - elif most_applicable_slot == ctx.slot and info["AcceptsAnyGift"]: + elif most_applicable_slot != ctx.slot and most_applicable == -1 and info["AcceptsAnyGift"]: # only send to ourselves if no one else will take it most_applicable_slot = int(slot) # print(most_applicable, most_applicable_slot) @@ -257,7 +259,7 @@ async def pick_gift_recipient(self, ctx, gift): item_uuid: item, }) - async def game_watcher(self, ctx) -> None: + async def game_watcher(self, ctx: "SNIContext") -> None: try: from SNIClient import snes_buffered_write, snes_flush_writes, snes_read rom = await snes_read(ctx, KDL3_ROMNAME, 0x15) @@ -278,11 +280,12 @@ async def game_watcher(self, ctx) -> None: await initialize_giftboxes(ctx, self.giftbox_key, self.motherbox_key, bool(enable_gifting[0])) self.initialize_gifting = True # can't check debug anymore, without going and copying the value. might be important later. - if self.levels is None: + if not self.levels: self.levels = dict() for i in range(5): level_data = await snes_read(ctx, KDL3_LEVEL_ADDR + (14 * i), 14) - self.levels[i] = unpack("HHHHHHH", level_data) + self.levels[i] = [int.from_bytes(level_data[idx:idx+1], "little") + for idx in range(0, len(level_data), 2)] self.levels[5] = [0x0205, # Hyper Zone 0, # MG-5, can't send from here 0x0300, # Boss Butch @@ -371,7 +374,7 @@ async def game_watcher(self, ctx) -> None: stages_raw = await snes_read(ctx, KDL3_COMPLETED_STAGES, 60) stages = struct.unpack("HHHHHHHHHHHHHHHHHHHHHHHHHHHHHH", stages_raw) for i in range(30): - loc_id = 0x770000 + i + 1 + loc_id = 0x770000 + i if stages[i] == 1 and loc_id not in ctx.checked_locations: new_checks.append(loc_id) elif loc_id in ctx.checked_locations: @@ -381,8 +384,8 @@ async def game_watcher(self, ctx) -> None: heart_stars = await snes_read(ctx, KDL3_HEART_STARS, 35) for i in range(5): start_ind = i * 7 - for j in range(1, 7): - level_ind = start_ind + j - 1 + for j in range(6): + level_ind = start_ind + j loc_id = 0x770100 + (6 * i) + j if heart_stars[level_ind] and loc_id not in ctx.checked_locations: new_checks.append(loc_id) @@ -401,6 +404,9 @@ async def game_watcher(self, ctx) -> None: if star not in ctx.checked_locations and stars[star_addrs[star]] == 0x01: new_checks.append(star) + if not game_state: + return + if game_state[0] != 0xFF: await self.pop_gift(ctx) await self.pop_item(ctx, game_state[0] != 0xFF) @@ -408,7 +414,7 @@ async def game_watcher(self, ctx) -> None: # boss status boss_flag_bytes = await snes_read(ctx, KDL3_BOSS_STATUS, 2) - boss_flag = unpack("H", boss_flag_bytes)[0] + boss_flag = int.from_bytes(boss_flag_bytes, "little") for bitmask, boss in zip(range(1, 11, 2), boss_locations.keys()): if boss_flag & (1 << bitmask) > 0 and boss not in ctx.checked_locations: new_checks.append(boss) diff --git a/worlds/kdl3/ClientAddrs.py b/worlds/kdl3/client_addrs.py similarity index 100% rename from worlds/kdl3/ClientAddrs.py rename to worlds/kdl3/client_addrs.py diff --git a/worlds/kdl3/Compression.py b/worlds/kdl3/compression.py similarity index 100% rename from worlds/kdl3/Compression.py rename to worlds/kdl3/compression.py diff --git a/worlds/kdl3/data/kdl3_basepatch.bsdiff4 b/worlds/kdl3/data/kdl3_basepatch.bsdiff4 index cd002121cd38dcb319ba2148ced46c9592c3905b..3b6b338d5a92ccec33693c644e73d13b15dbce46 100644 GIT binary patch literal 2646 zcmYM0dpOgJAIHBl&6Kej!zPWGSx$zL4oA0;#E^`}G z@=Gp-3TKo{ooTC7L@L*Gq;yi^*YEc`&vV{?z5n>UKcDCGJg-0AbdHC&rzeH{2Kc{X zH2yXK^?!yQ9O-0F+e_f=jTypO06^2~>i5L)jaPT-!TP8~5bprsJJ2K&m9<6(4@f}` zD%gPs#A4Yen`uNDjAu-n0k~086>S5|$GxE~mD}}?7IDIl4BykQJlEt}6XDl0XT8RELEq%`#bdEK+LHA#HGWeP9E<)u zECB4mR%{!8&#GRlk7$E(ssH@w_mH*`0JK+ES65 zp@E6|s252Q>pLLr2(f}gDCaX6NIfznGADBcI)&xZAnzv{WrtiK{1w=hX(J&cNtU*h7t_FblQN0)u4hU!@}JkY2Yn zW5a5{jF&sxdrVLRDgy&?pHQ0Aq}}4?91l%Er@a|$J{h?AJEw)&B&qn&JTaPB_cql> zt8IO7&e=0NGBjL`g&DP@;cf;#z`~IdZYbK>CGJ6B@w`111dAQ%mNnSgdhfB^DgV!1 zs?G;jsvR0(oBVC3%GVrT^viXL67Q!@hcFl(UT+Q@+Jn+6(;IE+HrrG35FI46&1Mc4 zpZ!e>TpG}-mMz6^((#GLHT;=UC$zPHRg^csLEszPe^?s3W5KOzDM5mDi5t6<{7!jD znATy$mhWjT!P_G#{#XO#ah@{ND$@&NFdYzV&g9=XeFxgAU>Gv93Nk29FnPX>`!=R9 z+fxurxovB1YC-2f5GMQ}Qh!wAt(?pTK7ZoKLq?>74T*oz?GO5knxXqMz z@EUPIlL~CMN|@kyXEjJ(t@J&6HZp9B5_n=7*%2WZSE{h)1i z^smKlNlVKQCC7Nw_*MQ`(#O>?!k5*RuS=^*ZA#7WBaw?QtG3*pd;N#atQuRW@2}4- z;Sd(LXFZ0Ma31l|3^hNkz}-teM|aM7Q^?Qa_{sCAi&!j7Aa#}k6j)j^tpaOZ12}D` z*|f`F`*D!kGjQsJ2f{urRi(h8$w0x1HZM8c?8guizs=aD~=pDuCV z$S^OHE+XVor4k^6k${q4@FNcc`5-`n%;iV7oe+M`GWB5DTgrVdg`eE_ zU#{^mK?Wp82CAq^0LT6Ty-o=`c>dH?suhNk+tn-Z4mVD&8$8Brt$~A}FWkOz@%VFn+`jcOEv4QV_d_}_nk<`slcqooyk!P!&2)P%Ke^#D zKs2w;yuf$JSkPz|yaCqTfajf&CPrCQ<(^B2WN5}&R%#PV%D(o)F9j3XU7Div3}2(` zcIFS)loZ#{A9yx#>;G-{?lNs;uCR!iYX0~XG5uFtJHTe(Ad~+*Ix6R?xkmWeKgqYD)%X;5R2k*%~<#dPK z=?a$|Wu{u%xqi5)Th}n;do8{_*XQt1MH84ijR@n4ZgO1<(Dl%%Zo0uMsntmX2;S6G z8`Vw!D0+ zx!`ez;#SmEpoO>VYAUo(C>PzqVdnx9n&a!lq=fbhlbJL5givj#2x_}}AnRa5MEb3_ zsGo1mjy2lVm6`|(>q^l6G;)y^#9Gq^j>tSkZ%fS>30OO0JMCxRqYa#QcRE{8+szc$Z)=&dkoW^q?=@5$^ddWPD&{$Ub4B;ZY;V#QXI+%7K)qLgA5paUnt;t7c2}+4 z*MBUvpjsxrejuPC^BvDiu>{j40J=}gA>qr}sDoS2qlV(g7ud@KJ?7Eqr#5YSnGzqO z@0i%A2Zu3>Yj?wb&OM3Q@0f1BU@f3~BXaQ9qk~&W5_6-&h7r=oJ9L{ZW&XQfq|Vpp zH1E3L(bv^Zt*{SB)mR3$63}o9H)1bipyc$yHjVo{F=2hZ|H-3Nt*xI2?YhF;M?H!w z_NmH0R_l%B?;ws=M@B|J$!_Q<-EQa`RiEwGTWr1Y*A~;*fh!k|qjU*|x#jmKZZ1B5 zjeL=Qjy^Wx#zJUsg&~ieaWOI^{;Q@lt|}nwr2b!Amo^4A?f9CsE@)>#y6Dr>uDhIt z2_5$6OY*35T~y$)m91>E{)p>)vxy|c4n zCKdgCkQ?huXfcGd}N6;FvkjXAL;gnmys4Y_&g}csYI|(;6OK z_)NZMq<3svP+R|tWY#Wr<-(J;YR6`ivf9t)=9Lwu_y|7@x-?lxY?#AT8lH`fxOr~- zAwg2shUSE4rojqLdMY=6l;q?WU>!T!rKAP*T3!cEWYw9siltk0O;XHP{_4E<(w$3s zIV7X9P?$@}7eraQVqv`Y^20_guoMnD@;GV2``wws$7~iU%#_3K0OguOa!Mn{snaLS z*fXe-UX6=H%X#0@%Pz*ffZrW{c6VoQ;iTDHfg&3#(!ob0HiXZvT3NBYwm501xcTwS zX6KP>o8YAjmMR?uCF0!icgxn~bu}v+$}jB?Tm_+0%m~OpqL9; zgG*x3sO6egnoELZ;?km(d8cKxS*|&Vnx(hy+;i@|&xiLs=lSxU=fm^!Vt5Dm`hvt+ z;4gK-|6>5szm3DJ=B#sdog|1`*Kw8fF$CWo*=8AqXpfU|e7&|Bs0sy8YKnsBc zm>6V=A%Fq+ZVMIWpnBYELjd0cMUxQeD198#!~;>sqeG-BXGAWHu3hEfr(Gi1$doc| zpSI_x$dgUvB4++zM!@a*%k=bM@y~y}wYo-Jl|H#%BY8AW5K*Uca|8T~XpJ#MyNU_DdEA+EuYv#eq;K#4(i54p{zcC}udOe=f6&mZ$@2AF zTgYkrb4gR9UR`T`m2>Jx6>Jx;;lZ`GhaJL%2^I=;){!{t+%N}W1TIL#o#SEp?51b{ z4uH7UC_r4HYgL{H1)k|bOc*UrKy73!f{fwd9={T{??rD#5`WRdh%BpDDY@*+b>vp< z`b7jCagl)?1rQQ*1cw76D!_i%8Vc?5W2CIg$avAoRU9x^G3` zP@e*TXi@K%|5z*qvyf}y?+hvq1uH;6g(9BI&qe5nlBDApl^F;m#G5BTxMnExL?AH{ zkx$D70HsucrczylVH1i(6o4oM5MRRo*G5Faxhre41I{LKZ|ulRHaLBJJn=Km%pPu9 z1=p$IOgbUXqbmSeFIxLYT_IZ1H#{}Ng%vo4He9H@uD&(& zVwc4me!yOg)QwLv4rht&nj)A@Hc|Xgd&+Z16y&Xxh&|+!dyxM}e0n=P`*T|JGC1HC z(y}L4-?x8odsO?tCC0|889cbB{(c5Pj!#KWEtRqkwb@So5&kgf4ECRlEQW%ziqg-x z%RDJh$5b!y$Uw23ayUAFEg#bYMIyjQ33n{F<1Jcd*b+OVJZA1ddZ8T5gS zxyy_z9k*)bvzxA7G&J+S4DHX(LHo7dv)TTc=Nnn2GvBkHYVlr}7E1SQ>6lL#83ymI z?Q4zK{I(aBk8LCwq}!}vTn|5I?dn^o%YIN~XyxTn5Rw!-Y`$yKSKLxaXmamL{wSU0 zdVLolmu>40eVQ>DR!09dGUz5}w4rpROMiPjWyh79sGyxJ`EuRgLG31o*-$NBX$fuG za;Y(+FX_|MYH8o<@*S7!Jo?4C*mt=ve8zQ=o`*<$3>rt9(Rc7C-*xPm>&wpS)5(v^ z1-EfJ9eQ~`h6N6M>V6(vu3l^WNp8=s9T>4|d2f8+=?k>P4tbxujzqmN>bE#A6zRDU z3HaE{TbmM0g!E=Bt7M4Uv^LvbujKrVLd!7fh2RyLZm}cl+j7H|cIo8YpWoCHQ#ER%;T6_oW#6i%%V-;ZL4Psb{7J-u=k5C zg?rB^;k1y){<{JrnH9!Gnxw8LkpZjUrEKfsM!e&;No4ahLu)_o`Lgzavn!QbZfhRS z4MiE8vNWHrhNSI7$oz&Xhty0C4A#QOw@Y|Nf--d0;Pt69oMQbzQ}X=Q;2njhin-7$ zUMGhp@PTf#0$_J)x7Y*@z&w8)Ijn1Cg?L!ubEhLb_DIWm!7bZLyg#lip7=lLIu_qX z10e2S$(8=<&%-OH52*c1niEMUMi2HJdA8nzTV_8?ozKZB>VaNrIL@d5&Fe4{BVP#$ zNPy8KaiDb#9R)z@=zpz#gEy#fVf14eTk7gqJG~Kw`e*CS&A-B%1OOlaK%|L^agvZt zp&p}*!C2M;F|N=&Q31pH=93h_Xx-PVLSR%X6_gQN^uA76%x1CkFV{?1*Gx=Fl0?8F zpn^>}1B);Wph~pB1CW~2lXy!g?Pd6*Z{y@tWQ)IeCrLR^%~*P#3K!Lrz!0o4)P>*W zu0+$J>pQLy5lBb3U|vbvO_v|c5m!4c_bJi*punIMPrB>%n-ug;_|#^-dJpy)YMNkt z5JI}=U3&m88bDl+o45+T!xCSdjsfvw`D}y4tO7DK*n7c(HTemyyMNr|qNV!km;l zD=Z8G%0l9t1$+K+>H7Fwx8T%ZRoC1Y-G7(*y*0~ZhL)-6R5U`o(>T}cAKQT zRtbg8OXaHZ5nM!DZPkiiP<_LNxAaR#b*!V>Q*U5nx^~mf4!^kFc%+l}dF9*RG!jBb zvb85+_N+c=y0rLu=!q$ALgMamYM*$;r{)Lw2CCO_BMrBuRQ5u?dAL&#EkX$&KO;a4 zqWV9SHwD|yciRCG;9=O}?eCBAz&T_%>TCmJq#`CHzNk0+)=`2D3~IYYg#R#32Q zdGj(IQ*ak^;KMv`c2ct3Q~UTG@knc+R)9ef(oshGCTk~_x- R2S2ZGPW5pM7JXgjzX0o>8Uz3U diff --git a/worlds/kdl3/Gifting.py b/worlds/kdl3/gifting.py similarity index 90% rename from worlds/kdl3/Gifting.py rename to worlds/kdl3/gifting.py index 8ccba7ec1ae6..e1626091000e 100644 --- a/worlds/kdl3/Gifting.py +++ b/worlds/kdl3/gifting.py @@ -1,8 +1,11 @@ # Small subfile to handle gifting info such as desired traits and giftbox management import typing +if typing.TYPE_CHECKING: + from SNIClient import SNIContext -async def update_object(ctx, key: str, value: typing.Dict): + +async def update_object(ctx: "SNIContext", key: str, value: typing.Dict[str, typing.Any]) -> None: await ctx.send_msgs([ { "cmd": "Set", @@ -16,7 +19,7 @@ async def update_object(ctx, key: str, value: typing.Dict): ]) -async def pop_object(ctx, key: str, value: str): +async def pop_object(ctx: "SNIContext", key: str, value: str) -> None: await ctx.send_msgs([ { "cmd": "Set", @@ -30,14 +33,14 @@ async def pop_object(ctx, key: str, value: str): ]) -async def initialize_giftboxes(ctx, giftbox_key: str, motherbox_key: str, is_open: bool): +async def initialize_giftboxes(ctx: "SNIContext", giftbox_key: str, motherbox_key: str, is_open: bool) -> None: ctx.set_notify(motherbox_key, giftbox_key) await update_object(ctx, f"Giftboxes;{ctx.team}", {f"{ctx.slot}": - { - "IsOpen": is_open, - **kdl3_gifting_options - }}) - ctx.gifting = is_open + { + "IsOpen": is_open, + **kdl3_gifting_options + }}) + ctx.client_handler.gifting = is_open kdl3_gifting_options = { diff --git a/worlds/kdl3/Items.py b/worlds/kdl3/items.py similarity index 95% rename from worlds/kdl3/Items.py rename to worlds/kdl3/items.py index 66c7f8fee323..72687a6065d4 100644 --- a/worlds/kdl3/Items.py +++ b/worlds/kdl3/items.py @@ -77,9 +77,9 @@ class KDL3Item(Item): } star_item_weights = { - "Little Star": 4, - "Medium Star": 2, - "Big Star": 1 + "Little Star": 16, + "Medium Star": 8, + "Big Star": 4 } total_filler_weights = { @@ -102,4 +102,4 @@ class KDL3Item(Item): "Animal Friend": set(animal_friend_table), } -lookup_name_to_id: typing.Dict[str, int] = {item_name: data.code for item_name, data in item_table.items() if data.code} +lookup_item_to_id: typing.Dict[str, int] = {item_name: data.code for item_name, data in item_table.items() if data.code} diff --git a/worlds/kdl3/locations.py b/worlds/kdl3/locations.py new file mode 100644 index 000000000000..4fa1bfad7047 --- /dev/null +++ b/worlds/kdl3/locations.py @@ -0,0 +1,940 @@ +import typing +from BaseClasses import Location, Region +from .names import location_name + +if typing.TYPE_CHECKING: + from .room import KDL3Room + + +class KDL3Location(Location): + game: str = "Kirby's Dream Land 3" + room: typing.Optional["KDL3Room"] = None + + def __init__(self, player: int, name: str, address: typing.Optional[int], parent: typing.Union[Region, None]): + super().__init__(player, name, address, parent) + if not address: + self.show_in_spoiler = False + + +stage_locations = { + 0x770000: location_name.grass_land_1, + 0x770001: location_name.grass_land_2, + 0x770002: location_name.grass_land_3, + 0x770003: location_name.grass_land_4, + 0x770004: location_name.grass_land_5, + 0x770005: location_name.grass_land_6, + 0x770006: location_name.ripple_field_1, + 0x770007: location_name.ripple_field_2, + 0x770008: location_name.ripple_field_3, + 0x770009: location_name.ripple_field_4, + 0x77000A: location_name.ripple_field_5, + 0x77000B: location_name.ripple_field_6, + 0x77000C: location_name.sand_canyon_1, + 0x77000D: location_name.sand_canyon_2, + 0x77000E: location_name.sand_canyon_3, + 0x77000F: location_name.sand_canyon_4, + 0x770010: location_name.sand_canyon_5, + 0x770011: location_name.sand_canyon_6, + 0x770012: location_name.cloudy_park_1, + 0x770013: location_name.cloudy_park_2, + 0x770014: location_name.cloudy_park_3, + 0x770015: location_name.cloudy_park_4, + 0x770016: location_name.cloudy_park_5, + 0x770017: location_name.cloudy_park_6, + 0x770018: location_name.iceberg_1, + 0x770019: location_name.iceberg_2, + 0x77001A: location_name.iceberg_3, + 0x77001B: location_name.iceberg_4, + 0x77001C: location_name.iceberg_5, + 0x77001D: location_name.iceberg_6, +} + +heart_star_locations = { + 0x770100: location_name.grass_land_tulip, + 0x770101: location_name.grass_land_muchi, + 0x770102: location_name.grass_land_pitcherman, + 0x770103: location_name.grass_land_chao, + 0x770104: location_name.grass_land_mine, + 0x770105: location_name.grass_land_pierre, + 0x770106: location_name.ripple_field_kamuribana, + 0x770107: location_name.ripple_field_bakasa, + 0x770108: location_name.ripple_field_elieel, + 0x770109: location_name.ripple_field_toad, + 0x77010A: location_name.ripple_field_mama_pitch, + 0x77010B: location_name.ripple_field_hb002, + 0x77010C: location_name.sand_canyon_mushrooms, + 0x77010D: location_name.sand_canyon_auntie, + 0x77010E: location_name.sand_canyon_caramello, + 0x77010F: location_name.sand_canyon_hikari, + 0x770110: location_name.sand_canyon_nyupun, + 0x770111: location_name.sand_canyon_rob, + 0x770112: location_name.cloudy_park_hibanamodoki, + 0x770113: location_name.cloudy_park_piyokeko, + 0x770114: location_name.cloudy_park_mrball, + 0x770115: location_name.cloudy_park_mikarin, + 0x770116: location_name.cloudy_park_pick, + 0x770117: location_name.cloudy_park_hb007, + 0x770118: location_name.iceberg_kogoesou, + 0x770119: location_name.iceberg_samus, + 0x77011A: location_name.iceberg_kawasaki, + 0x77011B: location_name.iceberg_name, + 0x77011C: location_name.iceberg_shiro, + 0x77011D: location_name.iceberg_angel, +} + +boss_locations = { + 0x770200: location_name.grass_land_whispy, + 0x770201: location_name.ripple_field_acro, + 0x770202: location_name.sand_canyon_poncon, + 0x770203: location_name.cloudy_park_ado, + 0x770204: location_name.iceberg_dedede, +} + +consumable_locations = { + 0x770300: location_name.grass_land_1_u1, + 0x770301: location_name.grass_land_1_m1, + 0x770302: location_name.grass_land_2_u1, + 0x770303: location_name.grass_land_3_u1, + 0x770304: location_name.grass_land_3_m1, + 0x770305: location_name.grass_land_4_m1, + 0x770306: location_name.grass_land_4_u1, + 0x770307: location_name.grass_land_4_m2, + 0x770308: location_name.grass_land_4_m3, + 0x770309: location_name.grass_land_6_u1, + 0x77030A: location_name.grass_land_6_u2, + 0x77030B: location_name.ripple_field_2_u1, + 0x77030C: location_name.ripple_field_2_m1, + 0x77030D: location_name.ripple_field_3_m1, + 0x77030E: location_name.ripple_field_3_u1, + 0x77030F: location_name.ripple_field_4_m2, + 0x770310: location_name.ripple_field_4_u1, + 0x770311: location_name.ripple_field_4_m1, + 0x770312: location_name.ripple_field_5_u1, + 0x770313: location_name.ripple_field_5_m2, + 0x770314: location_name.ripple_field_5_m1, + 0x770315: location_name.sand_canyon_1_u1, + 0x770316: location_name.sand_canyon_2_u1, + 0x770317: location_name.sand_canyon_2_m1, + 0x770318: location_name.sand_canyon_4_m1, + 0x770319: location_name.sand_canyon_4_u1, + 0x77031A: location_name.sand_canyon_4_m2, + 0x77031B: location_name.sand_canyon_5_u1, + 0x77031C: location_name.sand_canyon_5_u3, + 0x77031D: location_name.sand_canyon_5_m1, + 0x77031E: location_name.sand_canyon_5_u4, + 0x77031F: location_name.sand_canyon_5_u2, + 0x770320: location_name.cloudy_park_1_m1, + 0x770321: location_name.cloudy_park_1_u1, + 0x770322: location_name.cloudy_park_4_u1, + 0x770323: location_name.cloudy_park_4_m1, + 0x770324: location_name.cloudy_park_5_m1, + 0x770325: location_name.cloudy_park_6_u1, + 0x770326: location_name.iceberg_3_m1, + 0x770327: location_name.iceberg_5_u1, + 0x770328: location_name.iceberg_5_u2, + 0x770329: location_name.iceberg_5_u3, + 0x77032A: location_name.iceberg_6_m1, + 0x77032B: location_name.iceberg_6_u1, +} + +level_consumables = { + 1: [0, 1], + 2: [2], + 3: [3, 4], + 4: [5, 6, 7, 8], + 6: [9, 10], + 8: [11, 12], + 9: [13, 14], + 10: [15, 16, 17], + 11: [18, 19, 20], + 13: [21], + 14: [22, 23], + 16: [24, 25, 26], + 17: [27, 28, 29, 30, 31], + 19: [32, 33], + 22: [34, 35], + 23: [36], + 24: [37], + 27: [38], + 29: [39, 40, 41], + 30: [42, 43], +} + +star_locations = { + 0x770401: location_name.grass_land_1_s1, + 0x770402: location_name.grass_land_1_s2, + 0x770403: location_name.grass_land_1_s3, + 0x770404: location_name.grass_land_1_s4, + 0x770405: location_name.grass_land_1_s5, + 0x770406: location_name.grass_land_1_s6, + 0x770407: location_name.grass_land_1_s7, + 0x770408: location_name.grass_land_1_s8, + 0x770409: location_name.grass_land_1_s9, + 0x77040a: location_name.grass_land_1_s10, + 0x77040b: location_name.grass_land_1_s11, + 0x77040c: location_name.grass_land_1_s12, + 0x77040d: location_name.grass_land_1_s13, + 0x77040e: location_name.grass_land_1_s14, + 0x77040f: location_name.grass_land_1_s15, + 0x770410: location_name.grass_land_1_s16, + 0x770411: location_name.grass_land_1_s17, + 0x770412: location_name.grass_land_1_s18, + 0x770413: location_name.grass_land_1_s19, + 0x770414: location_name.grass_land_1_s20, + 0x770415: location_name.grass_land_1_s21, + 0x770416: location_name.grass_land_1_s22, + 0x770417: location_name.grass_land_1_s23, + 0x770418: location_name.grass_land_2_s1, + 0x770419: location_name.grass_land_2_s2, + 0x77041a: location_name.grass_land_2_s3, + 0x77041b: location_name.grass_land_2_s4, + 0x77041c: location_name.grass_land_2_s5, + 0x77041d: location_name.grass_land_2_s6, + 0x77041e: location_name.grass_land_2_s7, + 0x77041f: location_name.grass_land_2_s8, + 0x770420: location_name.grass_land_2_s9, + 0x770421: location_name.grass_land_2_s10, + 0x770422: location_name.grass_land_2_s11, + 0x770423: location_name.grass_land_2_s12, + 0x770424: location_name.grass_land_2_s13, + 0x770425: location_name.grass_land_2_s14, + 0x770426: location_name.grass_land_2_s15, + 0x770427: location_name.grass_land_2_s16, + 0x770428: location_name.grass_land_2_s17, + 0x770429: location_name.grass_land_2_s18, + 0x77042a: location_name.grass_land_2_s19, + 0x77042b: location_name.grass_land_2_s20, + 0x77042c: location_name.grass_land_2_s21, + 0x77042d: location_name.grass_land_3_s1, + 0x77042e: location_name.grass_land_3_s2, + 0x77042f: location_name.grass_land_3_s3, + 0x770430: location_name.grass_land_3_s4, + 0x770431: location_name.grass_land_3_s5, + 0x770432: location_name.grass_land_3_s6, + 0x770433: location_name.grass_land_3_s7, + 0x770434: location_name.grass_land_3_s8, + 0x770435: location_name.grass_land_3_s9, + 0x770436: location_name.grass_land_3_s10, + 0x770437: location_name.grass_land_3_s11, + 0x770438: location_name.grass_land_3_s12, + 0x770439: location_name.grass_land_3_s13, + 0x77043a: location_name.grass_land_3_s14, + 0x77043b: location_name.grass_land_3_s15, + 0x77043c: location_name.grass_land_3_s16, + 0x77043d: location_name.grass_land_3_s17, + 0x77043e: location_name.grass_land_3_s18, + 0x77043f: location_name.grass_land_3_s19, + 0x770440: location_name.grass_land_3_s20, + 0x770441: location_name.grass_land_3_s21, + 0x770442: location_name.grass_land_3_s22, + 0x770443: location_name.grass_land_3_s23, + 0x770444: location_name.grass_land_3_s24, + 0x770445: location_name.grass_land_3_s25, + 0x770446: location_name.grass_land_3_s26, + 0x770447: location_name.grass_land_3_s27, + 0x770448: location_name.grass_land_3_s28, + 0x770449: location_name.grass_land_3_s29, + 0x77044a: location_name.grass_land_3_s30, + 0x77044b: location_name.grass_land_3_s31, + 0x77044c: location_name.grass_land_4_s1, + 0x77044d: location_name.grass_land_4_s2, + 0x77044e: location_name.grass_land_4_s3, + 0x77044f: location_name.grass_land_4_s4, + 0x770450: location_name.grass_land_4_s5, + 0x770451: location_name.grass_land_4_s6, + 0x770452: location_name.grass_land_4_s7, + 0x770453: location_name.grass_land_4_s8, + 0x770454: location_name.grass_land_4_s9, + 0x770455: location_name.grass_land_4_s10, + 0x770456: location_name.grass_land_4_s11, + 0x770457: location_name.grass_land_4_s12, + 0x770458: location_name.grass_land_4_s13, + 0x770459: location_name.grass_land_4_s14, + 0x77045a: location_name.grass_land_4_s15, + 0x77045b: location_name.grass_land_4_s16, + 0x77045c: location_name.grass_land_4_s17, + 0x77045d: location_name.grass_land_4_s18, + 0x77045e: location_name.grass_land_4_s19, + 0x77045f: location_name.grass_land_4_s20, + 0x770460: location_name.grass_land_4_s21, + 0x770461: location_name.grass_land_4_s22, + 0x770462: location_name.grass_land_4_s23, + 0x770463: location_name.grass_land_4_s24, + 0x770464: location_name.grass_land_4_s25, + 0x770465: location_name.grass_land_4_s26, + 0x770466: location_name.grass_land_4_s27, + 0x770467: location_name.grass_land_4_s28, + 0x770468: location_name.grass_land_4_s29, + 0x770469: location_name.grass_land_4_s30, + 0x77046a: location_name.grass_land_4_s31, + 0x77046b: location_name.grass_land_4_s32, + 0x77046c: location_name.grass_land_4_s33, + 0x77046d: location_name.grass_land_4_s34, + 0x77046e: location_name.grass_land_4_s35, + 0x77046f: location_name.grass_land_4_s36, + 0x770470: location_name.grass_land_4_s37, + 0x770471: location_name.grass_land_5_s1, + 0x770472: location_name.grass_land_5_s2, + 0x770473: location_name.grass_land_5_s3, + 0x770474: location_name.grass_land_5_s4, + 0x770475: location_name.grass_land_5_s5, + 0x770476: location_name.grass_land_5_s6, + 0x770477: location_name.grass_land_5_s7, + 0x770478: location_name.grass_land_5_s8, + 0x770479: location_name.grass_land_5_s9, + 0x77047a: location_name.grass_land_5_s10, + 0x77047b: location_name.grass_land_5_s11, + 0x77047c: location_name.grass_land_5_s12, + 0x77047d: location_name.grass_land_5_s13, + 0x77047e: location_name.grass_land_5_s14, + 0x77047f: location_name.grass_land_5_s15, + 0x770480: location_name.grass_land_5_s16, + 0x770481: location_name.grass_land_5_s17, + 0x770482: location_name.grass_land_5_s18, + 0x770483: location_name.grass_land_5_s19, + 0x770484: location_name.grass_land_5_s20, + 0x770485: location_name.grass_land_5_s21, + 0x770486: location_name.grass_land_5_s22, + 0x770487: location_name.grass_land_5_s23, + 0x770488: location_name.grass_land_5_s24, + 0x770489: location_name.grass_land_5_s25, + 0x77048a: location_name.grass_land_5_s26, + 0x77048b: location_name.grass_land_5_s27, + 0x77048c: location_name.grass_land_5_s28, + 0x77048d: location_name.grass_land_5_s29, + 0x77048e: location_name.grass_land_6_s1, + 0x77048f: location_name.grass_land_6_s2, + 0x770490: location_name.grass_land_6_s3, + 0x770491: location_name.grass_land_6_s4, + 0x770492: location_name.grass_land_6_s5, + 0x770493: location_name.grass_land_6_s6, + 0x770494: location_name.grass_land_6_s7, + 0x770495: location_name.grass_land_6_s8, + 0x770496: location_name.grass_land_6_s9, + 0x770497: location_name.grass_land_6_s10, + 0x770498: location_name.grass_land_6_s11, + 0x770499: location_name.grass_land_6_s12, + 0x77049a: location_name.grass_land_6_s13, + 0x77049b: location_name.grass_land_6_s14, + 0x77049c: location_name.grass_land_6_s15, + 0x77049d: location_name.grass_land_6_s16, + 0x77049e: location_name.grass_land_6_s17, + 0x77049f: location_name.grass_land_6_s18, + 0x7704a0: location_name.grass_land_6_s19, + 0x7704a1: location_name.grass_land_6_s20, + 0x7704a2: location_name.grass_land_6_s21, + 0x7704a3: location_name.grass_land_6_s22, + 0x7704a4: location_name.grass_land_6_s23, + 0x7704a5: location_name.grass_land_6_s24, + 0x7704a6: location_name.grass_land_6_s25, + 0x7704a7: location_name.grass_land_6_s26, + 0x7704a8: location_name.grass_land_6_s27, + 0x7704a9: location_name.grass_land_6_s28, + 0x7704aa: location_name.grass_land_6_s29, + 0x7704ab: location_name.ripple_field_1_s1, + 0x7704ac: location_name.ripple_field_1_s2, + 0x7704ad: location_name.ripple_field_1_s3, + 0x7704ae: location_name.ripple_field_1_s4, + 0x7704af: location_name.ripple_field_1_s5, + 0x7704b0: location_name.ripple_field_1_s6, + 0x7704b1: location_name.ripple_field_1_s7, + 0x7704b2: location_name.ripple_field_1_s8, + 0x7704b3: location_name.ripple_field_1_s9, + 0x7704b4: location_name.ripple_field_1_s10, + 0x7704b5: location_name.ripple_field_1_s11, + 0x7704b6: location_name.ripple_field_1_s12, + 0x7704b7: location_name.ripple_field_1_s13, + 0x7704b8: location_name.ripple_field_1_s14, + 0x7704b9: location_name.ripple_field_1_s15, + 0x7704ba: location_name.ripple_field_1_s16, + 0x7704bb: location_name.ripple_field_1_s17, + 0x7704bc: location_name.ripple_field_1_s18, + 0x7704bd: location_name.ripple_field_1_s19, + 0x7704be: location_name.ripple_field_2_s1, + 0x7704bf: location_name.ripple_field_2_s2, + 0x7704c0: location_name.ripple_field_2_s3, + 0x7704c1: location_name.ripple_field_2_s4, + 0x7704c2: location_name.ripple_field_2_s5, + 0x7704c3: location_name.ripple_field_2_s6, + 0x7704c4: location_name.ripple_field_2_s7, + 0x7704c5: location_name.ripple_field_2_s8, + 0x7704c6: location_name.ripple_field_2_s9, + 0x7704c7: location_name.ripple_field_2_s10, + 0x7704c8: location_name.ripple_field_2_s11, + 0x7704c9: location_name.ripple_field_2_s12, + 0x7704ca: location_name.ripple_field_2_s13, + 0x7704cb: location_name.ripple_field_2_s14, + 0x7704cc: location_name.ripple_field_2_s15, + 0x7704cd: location_name.ripple_field_2_s16, + 0x7704ce: location_name.ripple_field_2_s17, + 0x7704cf: location_name.ripple_field_3_s1, + 0x7704d0: location_name.ripple_field_3_s2, + 0x7704d1: location_name.ripple_field_3_s3, + 0x7704d2: location_name.ripple_field_3_s4, + 0x7704d3: location_name.ripple_field_3_s5, + 0x7704d4: location_name.ripple_field_3_s6, + 0x7704d5: location_name.ripple_field_3_s7, + 0x7704d6: location_name.ripple_field_3_s8, + 0x7704d7: location_name.ripple_field_3_s9, + 0x7704d8: location_name.ripple_field_3_s10, + 0x7704d9: location_name.ripple_field_3_s11, + 0x7704da: location_name.ripple_field_3_s12, + 0x7704db: location_name.ripple_field_3_s13, + 0x7704dc: location_name.ripple_field_3_s14, + 0x7704dd: location_name.ripple_field_3_s15, + 0x7704de: location_name.ripple_field_3_s16, + 0x7704df: location_name.ripple_field_3_s17, + 0x7704e0: location_name.ripple_field_3_s18, + 0x7704e1: location_name.ripple_field_3_s19, + 0x7704e2: location_name.ripple_field_3_s20, + 0x7704e3: location_name.ripple_field_3_s21, + 0x7704e4: location_name.ripple_field_4_s1, + 0x7704e5: location_name.ripple_field_4_s2, + 0x7704e6: location_name.ripple_field_4_s3, + 0x7704e7: location_name.ripple_field_4_s4, + 0x7704e8: location_name.ripple_field_4_s5, + 0x7704e9: location_name.ripple_field_4_s6, + 0x7704ea: location_name.ripple_field_4_s7, + 0x7704eb: location_name.ripple_field_4_s8, + 0x7704ec: location_name.ripple_field_4_s9, + 0x7704ed: location_name.ripple_field_4_s10, + 0x7704ee: location_name.ripple_field_4_s11, + 0x7704ef: location_name.ripple_field_4_s12, + 0x7704f0: location_name.ripple_field_4_s13, + 0x7704f1: location_name.ripple_field_4_s14, + 0x7704f2: location_name.ripple_field_4_s15, + 0x7704f3: location_name.ripple_field_4_s16, + 0x7704f4: location_name.ripple_field_4_s17, + 0x7704f5: location_name.ripple_field_4_s18, + 0x7704f6: location_name.ripple_field_4_s19, + 0x7704f7: location_name.ripple_field_4_s20, + 0x7704f8: location_name.ripple_field_4_s21, + 0x7704f9: location_name.ripple_field_4_s22, + 0x7704fa: location_name.ripple_field_4_s23, + 0x7704fb: location_name.ripple_field_4_s24, + 0x7704fc: location_name.ripple_field_4_s25, + 0x7704fd: location_name.ripple_field_4_s26, + 0x7704fe: location_name.ripple_field_4_s27, + 0x7704ff: location_name.ripple_field_4_s28, + 0x770500: location_name.ripple_field_4_s29, + 0x770501: location_name.ripple_field_4_s30, + 0x770502: location_name.ripple_field_4_s31, + 0x770503: location_name.ripple_field_4_s32, + 0x770504: location_name.ripple_field_4_s33, + 0x770505: location_name.ripple_field_4_s34, + 0x770506: location_name.ripple_field_4_s35, + 0x770507: location_name.ripple_field_4_s36, + 0x770508: location_name.ripple_field_4_s37, + 0x770509: location_name.ripple_field_4_s38, + 0x77050a: location_name.ripple_field_4_s39, + 0x77050b: location_name.ripple_field_4_s40, + 0x77050c: location_name.ripple_field_4_s41, + 0x77050d: location_name.ripple_field_4_s42, + 0x77050e: location_name.ripple_field_4_s43, + 0x77050f: location_name.ripple_field_4_s44, + 0x770510: location_name.ripple_field_4_s45, + 0x770511: location_name.ripple_field_4_s46, + 0x770512: location_name.ripple_field_4_s47, + 0x770513: location_name.ripple_field_4_s48, + 0x770514: location_name.ripple_field_4_s49, + 0x770515: location_name.ripple_field_4_s50, + 0x770516: location_name.ripple_field_4_s51, + 0x770517: location_name.ripple_field_5_s1, + 0x770518: location_name.ripple_field_5_s2, + 0x770519: location_name.ripple_field_5_s3, + 0x77051a: location_name.ripple_field_5_s4, + 0x77051b: location_name.ripple_field_5_s5, + 0x77051c: location_name.ripple_field_5_s6, + 0x77051d: location_name.ripple_field_5_s7, + 0x77051e: location_name.ripple_field_5_s8, + 0x77051f: location_name.ripple_field_5_s9, + 0x770520: location_name.ripple_field_5_s10, + 0x770521: location_name.ripple_field_5_s11, + 0x770522: location_name.ripple_field_5_s12, + 0x770523: location_name.ripple_field_5_s13, + 0x770524: location_name.ripple_field_5_s14, + 0x770525: location_name.ripple_field_5_s15, + 0x770526: location_name.ripple_field_5_s16, + 0x770527: location_name.ripple_field_5_s17, + 0x770528: location_name.ripple_field_5_s18, + 0x770529: location_name.ripple_field_5_s19, + 0x77052a: location_name.ripple_field_5_s20, + 0x77052b: location_name.ripple_field_5_s21, + 0x77052c: location_name.ripple_field_5_s22, + 0x77052d: location_name.ripple_field_5_s23, + 0x77052e: location_name.ripple_field_5_s24, + 0x77052f: location_name.ripple_field_5_s25, + 0x770530: location_name.ripple_field_5_s26, + 0x770531: location_name.ripple_field_5_s27, + 0x770532: location_name.ripple_field_5_s28, + 0x770533: location_name.ripple_field_5_s29, + 0x770534: location_name.ripple_field_5_s30, + 0x770535: location_name.ripple_field_5_s31, + 0x770536: location_name.ripple_field_5_s32, + 0x770537: location_name.ripple_field_5_s33, + 0x770538: location_name.ripple_field_5_s34, + 0x770539: location_name.ripple_field_5_s35, + 0x77053a: location_name.ripple_field_5_s36, + 0x77053b: location_name.ripple_field_5_s37, + 0x77053c: location_name.ripple_field_5_s38, + 0x77053d: location_name.ripple_field_5_s39, + 0x77053e: location_name.ripple_field_5_s40, + 0x77053f: location_name.ripple_field_5_s41, + 0x770540: location_name.ripple_field_5_s42, + 0x770541: location_name.ripple_field_5_s43, + 0x770542: location_name.ripple_field_5_s44, + 0x770543: location_name.ripple_field_5_s45, + 0x770544: location_name.ripple_field_5_s46, + 0x770545: location_name.ripple_field_5_s47, + 0x770546: location_name.ripple_field_5_s48, + 0x770547: location_name.ripple_field_5_s49, + 0x770548: location_name.ripple_field_5_s50, + 0x770549: location_name.ripple_field_5_s51, + 0x77054a: location_name.ripple_field_6_s1, + 0x77054b: location_name.ripple_field_6_s2, + 0x77054c: location_name.ripple_field_6_s3, + 0x77054d: location_name.ripple_field_6_s4, + 0x77054e: location_name.ripple_field_6_s5, + 0x77054f: location_name.ripple_field_6_s6, + 0x770550: location_name.ripple_field_6_s7, + 0x770551: location_name.ripple_field_6_s8, + 0x770552: location_name.ripple_field_6_s9, + 0x770553: location_name.ripple_field_6_s10, + 0x770554: location_name.ripple_field_6_s11, + 0x770555: location_name.ripple_field_6_s12, + 0x770556: location_name.ripple_field_6_s13, + 0x770557: location_name.ripple_field_6_s14, + 0x770558: location_name.ripple_field_6_s15, + 0x770559: location_name.ripple_field_6_s16, + 0x77055a: location_name.ripple_field_6_s17, + 0x77055b: location_name.ripple_field_6_s18, + 0x77055c: location_name.ripple_field_6_s19, + 0x77055d: location_name.ripple_field_6_s20, + 0x77055e: location_name.ripple_field_6_s21, + 0x77055f: location_name.ripple_field_6_s22, + 0x770560: location_name.ripple_field_6_s23, + 0x770561: location_name.sand_canyon_1_s1, + 0x770562: location_name.sand_canyon_1_s2, + 0x770563: location_name.sand_canyon_1_s3, + 0x770564: location_name.sand_canyon_1_s4, + 0x770565: location_name.sand_canyon_1_s5, + 0x770566: location_name.sand_canyon_1_s6, + 0x770567: location_name.sand_canyon_1_s7, + 0x770568: location_name.sand_canyon_1_s8, + 0x770569: location_name.sand_canyon_1_s9, + 0x77056a: location_name.sand_canyon_1_s10, + 0x77056b: location_name.sand_canyon_1_s11, + 0x77056c: location_name.sand_canyon_1_s12, + 0x77056d: location_name.sand_canyon_1_s13, + 0x77056e: location_name.sand_canyon_1_s14, + 0x77056f: location_name.sand_canyon_1_s15, + 0x770570: location_name.sand_canyon_1_s16, + 0x770571: location_name.sand_canyon_1_s17, + 0x770572: location_name.sand_canyon_1_s18, + 0x770573: location_name.sand_canyon_1_s19, + 0x770574: location_name.sand_canyon_1_s20, + 0x770575: location_name.sand_canyon_1_s21, + 0x770576: location_name.sand_canyon_1_s22, + 0x770577: location_name.sand_canyon_2_s1, + 0x770578: location_name.sand_canyon_2_s2, + 0x770579: location_name.sand_canyon_2_s3, + 0x77057a: location_name.sand_canyon_2_s4, + 0x77057b: location_name.sand_canyon_2_s5, + 0x77057c: location_name.sand_canyon_2_s6, + 0x77057d: location_name.sand_canyon_2_s7, + 0x77057e: location_name.sand_canyon_2_s8, + 0x77057f: location_name.sand_canyon_2_s9, + 0x770580: location_name.sand_canyon_2_s10, + 0x770581: location_name.sand_canyon_2_s11, + 0x770582: location_name.sand_canyon_2_s12, + 0x770583: location_name.sand_canyon_2_s13, + 0x770584: location_name.sand_canyon_2_s14, + 0x770585: location_name.sand_canyon_2_s15, + 0x770586: location_name.sand_canyon_2_s16, + 0x770587: location_name.sand_canyon_2_s17, + 0x770588: location_name.sand_canyon_2_s18, + 0x770589: location_name.sand_canyon_2_s19, + 0x77058a: location_name.sand_canyon_2_s20, + 0x77058b: location_name.sand_canyon_2_s21, + 0x77058c: location_name.sand_canyon_2_s22, + 0x77058d: location_name.sand_canyon_2_s23, + 0x77058e: location_name.sand_canyon_2_s24, + 0x77058f: location_name.sand_canyon_2_s25, + 0x770590: location_name.sand_canyon_2_s26, + 0x770591: location_name.sand_canyon_2_s27, + 0x770592: location_name.sand_canyon_2_s28, + 0x770593: location_name.sand_canyon_2_s29, + 0x770594: location_name.sand_canyon_2_s30, + 0x770595: location_name.sand_canyon_2_s31, + 0x770596: location_name.sand_canyon_2_s32, + 0x770597: location_name.sand_canyon_2_s33, + 0x770598: location_name.sand_canyon_2_s34, + 0x770599: location_name.sand_canyon_2_s35, + 0x77059a: location_name.sand_canyon_2_s36, + 0x77059b: location_name.sand_canyon_2_s37, + 0x77059c: location_name.sand_canyon_2_s38, + 0x77059d: location_name.sand_canyon_2_s39, + 0x77059e: location_name.sand_canyon_2_s40, + 0x77059f: location_name.sand_canyon_2_s41, + 0x7705a0: location_name.sand_canyon_2_s42, + 0x7705a1: location_name.sand_canyon_2_s43, + 0x7705a2: location_name.sand_canyon_2_s44, + 0x7705a3: location_name.sand_canyon_2_s45, + 0x7705a4: location_name.sand_canyon_2_s46, + 0x7705a5: location_name.sand_canyon_2_s47, + 0x7705a6: location_name.sand_canyon_2_s48, + 0x7705a7: location_name.sand_canyon_3_s1, + 0x7705a8: location_name.sand_canyon_3_s2, + 0x7705a9: location_name.sand_canyon_3_s3, + 0x7705aa: location_name.sand_canyon_3_s4, + 0x7705ab: location_name.sand_canyon_3_s5, + 0x7705ac: location_name.sand_canyon_3_s6, + 0x7705ad: location_name.sand_canyon_3_s7, + 0x7705ae: location_name.sand_canyon_3_s8, + 0x7705af: location_name.sand_canyon_3_s9, + 0x7705b0: location_name.sand_canyon_3_s10, + 0x7705b1: location_name.sand_canyon_4_s1, + 0x7705b2: location_name.sand_canyon_4_s2, + 0x7705b3: location_name.sand_canyon_4_s3, + 0x7705b4: location_name.sand_canyon_4_s4, + 0x7705b5: location_name.sand_canyon_4_s5, + 0x7705b6: location_name.sand_canyon_4_s6, + 0x7705b7: location_name.sand_canyon_4_s7, + 0x7705b8: location_name.sand_canyon_4_s8, + 0x7705b9: location_name.sand_canyon_4_s9, + 0x7705ba: location_name.sand_canyon_4_s10, + 0x7705bb: location_name.sand_canyon_4_s11, + 0x7705bc: location_name.sand_canyon_4_s12, + 0x7705bd: location_name.sand_canyon_4_s13, + 0x7705be: location_name.sand_canyon_4_s14, + 0x7705bf: location_name.sand_canyon_4_s15, + 0x7705c0: location_name.sand_canyon_4_s16, + 0x7705c1: location_name.sand_canyon_4_s17, + 0x7705c2: location_name.sand_canyon_4_s18, + 0x7705c3: location_name.sand_canyon_4_s19, + 0x7705c4: location_name.sand_canyon_4_s20, + 0x7705c5: location_name.sand_canyon_4_s21, + 0x7705c6: location_name.sand_canyon_4_s22, + 0x7705c7: location_name.sand_canyon_4_s23, + 0x7705c8: location_name.sand_canyon_5_s1, + 0x7705c9: location_name.sand_canyon_5_s2, + 0x7705ca: location_name.sand_canyon_5_s3, + 0x7705cb: location_name.sand_canyon_5_s4, + 0x7705cc: location_name.sand_canyon_5_s5, + 0x7705cd: location_name.sand_canyon_5_s6, + 0x7705ce: location_name.sand_canyon_5_s7, + 0x7705cf: location_name.sand_canyon_5_s8, + 0x7705d0: location_name.sand_canyon_5_s9, + 0x7705d1: location_name.sand_canyon_5_s10, + 0x7705d2: location_name.sand_canyon_5_s11, + 0x7705d3: location_name.sand_canyon_5_s12, + 0x7705d4: location_name.sand_canyon_5_s13, + 0x7705d5: location_name.sand_canyon_5_s14, + 0x7705d6: location_name.sand_canyon_5_s15, + 0x7705d7: location_name.sand_canyon_5_s16, + 0x7705d8: location_name.sand_canyon_5_s17, + 0x7705d9: location_name.sand_canyon_5_s18, + 0x7705da: location_name.sand_canyon_5_s19, + 0x7705db: location_name.sand_canyon_5_s20, + 0x7705dc: location_name.sand_canyon_5_s21, + 0x7705dd: location_name.sand_canyon_5_s22, + 0x7705de: location_name.sand_canyon_5_s23, + 0x7705df: location_name.sand_canyon_5_s24, + 0x7705e0: location_name.sand_canyon_5_s25, + 0x7705e1: location_name.sand_canyon_5_s26, + 0x7705e2: location_name.sand_canyon_5_s27, + 0x7705e3: location_name.sand_canyon_5_s28, + 0x7705e4: location_name.sand_canyon_5_s29, + 0x7705e5: location_name.sand_canyon_5_s30, + 0x7705e6: location_name.sand_canyon_5_s31, + 0x7705e7: location_name.sand_canyon_5_s32, + 0x7705e8: location_name.sand_canyon_5_s33, + 0x7705e9: location_name.sand_canyon_5_s34, + 0x7705ea: location_name.sand_canyon_5_s35, + 0x7705eb: location_name.sand_canyon_5_s36, + 0x7705ec: location_name.sand_canyon_5_s37, + 0x7705ed: location_name.sand_canyon_5_s38, + 0x7705ee: location_name.sand_canyon_5_s39, + 0x7705ef: location_name.sand_canyon_5_s40, + 0x7705f0: location_name.cloudy_park_1_s1, + 0x7705f1: location_name.cloudy_park_1_s2, + 0x7705f2: location_name.cloudy_park_1_s3, + 0x7705f3: location_name.cloudy_park_1_s4, + 0x7705f4: location_name.cloudy_park_1_s5, + 0x7705f5: location_name.cloudy_park_1_s6, + 0x7705f6: location_name.cloudy_park_1_s7, + 0x7705f7: location_name.cloudy_park_1_s8, + 0x7705f8: location_name.cloudy_park_1_s9, + 0x7705f9: location_name.cloudy_park_1_s10, + 0x7705fa: location_name.cloudy_park_1_s11, + 0x7705fb: location_name.cloudy_park_1_s12, + 0x7705fc: location_name.cloudy_park_1_s13, + 0x7705fd: location_name.cloudy_park_1_s14, + 0x7705fe: location_name.cloudy_park_1_s15, + 0x7705ff: location_name.cloudy_park_1_s16, + 0x770600: location_name.cloudy_park_1_s17, + 0x770601: location_name.cloudy_park_1_s18, + 0x770602: location_name.cloudy_park_1_s19, + 0x770603: location_name.cloudy_park_1_s20, + 0x770604: location_name.cloudy_park_1_s21, + 0x770605: location_name.cloudy_park_1_s22, + 0x770606: location_name.cloudy_park_1_s23, + 0x770607: location_name.cloudy_park_2_s1, + 0x770608: location_name.cloudy_park_2_s2, + 0x770609: location_name.cloudy_park_2_s3, + 0x77060a: location_name.cloudy_park_2_s4, + 0x77060b: location_name.cloudy_park_2_s5, + 0x77060c: location_name.cloudy_park_2_s6, + 0x77060d: location_name.cloudy_park_2_s7, + 0x77060e: location_name.cloudy_park_2_s8, + 0x77060f: location_name.cloudy_park_2_s9, + 0x770610: location_name.cloudy_park_2_s10, + 0x770611: location_name.cloudy_park_2_s11, + 0x770612: location_name.cloudy_park_2_s12, + 0x770613: location_name.cloudy_park_2_s13, + 0x770614: location_name.cloudy_park_2_s14, + 0x770615: location_name.cloudy_park_2_s15, + 0x770616: location_name.cloudy_park_2_s16, + 0x770617: location_name.cloudy_park_2_s17, + 0x770618: location_name.cloudy_park_2_s18, + 0x770619: location_name.cloudy_park_2_s19, + 0x77061a: location_name.cloudy_park_2_s20, + 0x77061b: location_name.cloudy_park_2_s21, + 0x77061c: location_name.cloudy_park_2_s22, + 0x77061d: location_name.cloudy_park_2_s23, + 0x77061e: location_name.cloudy_park_2_s24, + 0x77061f: location_name.cloudy_park_2_s25, + 0x770620: location_name.cloudy_park_2_s26, + 0x770621: location_name.cloudy_park_2_s27, + 0x770622: location_name.cloudy_park_2_s28, + 0x770623: location_name.cloudy_park_2_s29, + 0x770624: location_name.cloudy_park_2_s30, + 0x770625: location_name.cloudy_park_2_s31, + 0x770626: location_name.cloudy_park_2_s32, + 0x770627: location_name.cloudy_park_2_s33, + 0x770628: location_name.cloudy_park_2_s34, + 0x770629: location_name.cloudy_park_2_s35, + 0x77062a: location_name.cloudy_park_2_s36, + 0x77062b: location_name.cloudy_park_2_s37, + 0x77062c: location_name.cloudy_park_2_s38, + 0x77062d: location_name.cloudy_park_2_s39, + 0x77062e: location_name.cloudy_park_2_s40, + 0x77062f: location_name.cloudy_park_2_s41, + 0x770630: location_name.cloudy_park_2_s42, + 0x770631: location_name.cloudy_park_2_s43, + 0x770632: location_name.cloudy_park_2_s44, + 0x770633: location_name.cloudy_park_2_s45, + 0x770634: location_name.cloudy_park_2_s46, + 0x770635: location_name.cloudy_park_2_s47, + 0x770636: location_name.cloudy_park_2_s48, + 0x770637: location_name.cloudy_park_2_s49, + 0x770638: location_name.cloudy_park_2_s50, + 0x770639: location_name.cloudy_park_2_s51, + 0x77063a: location_name.cloudy_park_2_s52, + 0x77063b: location_name.cloudy_park_2_s53, + 0x77063c: location_name.cloudy_park_2_s54, + 0x77063d: location_name.cloudy_park_3_s1, + 0x77063e: location_name.cloudy_park_3_s2, + 0x77063f: location_name.cloudy_park_3_s3, + 0x770640: location_name.cloudy_park_3_s4, + 0x770641: location_name.cloudy_park_3_s5, + 0x770642: location_name.cloudy_park_3_s6, + 0x770643: location_name.cloudy_park_3_s7, + 0x770644: location_name.cloudy_park_3_s8, + 0x770645: location_name.cloudy_park_3_s9, + 0x770646: location_name.cloudy_park_3_s10, + 0x770647: location_name.cloudy_park_3_s11, + 0x770648: location_name.cloudy_park_3_s12, + 0x770649: location_name.cloudy_park_3_s13, + 0x77064a: location_name.cloudy_park_3_s14, + 0x77064b: location_name.cloudy_park_3_s15, + 0x77064c: location_name.cloudy_park_3_s16, + 0x77064d: location_name.cloudy_park_3_s17, + 0x77064e: location_name.cloudy_park_3_s18, + 0x77064f: location_name.cloudy_park_3_s19, + 0x770650: location_name.cloudy_park_3_s20, + 0x770651: location_name.cloudy_park_3_s21, + 0x770652: location_name.cloudy_park_3_s22, + 0x770653: location_name.cloudy_park_4_s1, + 0x770654: location_name.cloudy_park_4_s2, + 0x770655: location_name.cloudy_park_4_s3, + 0x770656: location_name.cloudy_park_4_s4, + 0x770657: location_name.cloudy_park_4_s5, + 0x770658: location_name.cloudy_park_4_s6, + 0x770659: location_name.cloudy_park_4_s7, + 0x77065a: location_name.cloudy_park_4_s8, + 0x77065b: location_name.cloudy_park_4_s9, + 0x77065c: location_name.cloudy_park_4_s10, + 0x77065d: location_name.cloudy_park_4_s11, + 0x77065e: location_name.cloudy_park_4_s12, + 0x77065f: location_name.cloudy_park_4_s13, + 0x770660: location_name.cloudy_park_4_s14, + 0x770661: location_name.cloudy_park_4_s15, + 0x770662: location_name.cloudy_park_4_s16, + 0x770663: location_name.cloudy_park_4_s17, + 0x770664: location_name.cloudy_park_4_s18, + 0x770665: location_name.cloudy_park_4_s19, + 0x770666: location_name.cloudy_park_4_s20, + 0x770667: location_name.cloudy_park_4_s21, + 0x770668: location_name.cloudy_park_4_s22, + 0x770669: location_name.cloudy_park_4_s23, + 0x77066a: location_name.cloudy_park_4_s24, + 0x77066b: location_name.cloudy_park_4_s25, + 0x77066c: location_name.cloudy_park_4_s26, + 0x77066d: location_name.cloudy_park_4_s27, + 0x77066e: location_name.cloudy_park_4_s28, + 0x77066f: location_name.cloudy_park_4_s29, + 0x770670: location_name.cloudy_park_4_s30, + 0x770671: location_name.cloudy_park_4_s31, + 0x770672: location_name.cloudy_park_4_s32, + 0x770673: location_name.cloudy_park_4_s33, + 0x770674: location_name.cloudy_park_4_s34, + 0x770675: location_name.cloudy_park_4_s35, + 0x770676: location_name.cloudy_park_4_s36, + 0x770677: location_name.cloudy_park_4_s37, + 0x770678: location_name.cloudy_park_4_s38, + 0x770679: location_name.cloudy_park_4_s39, + 0x77067a: location_name.cloudy_park_4_s40, + 0x77067b: location_name.cloudy_park_4_s41, + 0x77067c: location_name.cloudy_park_4_s42, + 0x77067d: location_name.cloudy_park_4_s43, + 0x77067e: location_name.cloudy_park_4_s44, + 0x77067f: location_name.cloudy_park_4_s45, + 0x770680: location_name.cloudy_park_4_s46, + 0x770681: location_name.cloudy_park_4_s47, + 0x770682: location_name.cloudy_park_4_s48, + 0x770683: location_name.cloudy_park_4_s49, + 0x770684: location_name.cloudy_park_4_s50, + 0x770685: location_name.cloudy_park_5_s1, + 0x770686: location_name.cloudy_park_5_s2, + 0x770687: location_name.cloudy_park_5_s3, + 0x770688: location_name.cloudy_park_5_s4, + 0x770689: location_name.cloudy_park_5_s5, + 0x77068a: location_name.cloudy_park_5_s6, + 0x77068b: location_name.cloudy_park_6_s1, + 0x77068c: location_name.cloudy_park_6_s2, + 0x77068d: location_name.cloudy_park_6_s3, + 0x77068e: location_name.cloudy_park_6_s4, + 0x77068f: location_name.cloudy_park_6_s5, + 0x770690: location_name.cloudy_park_6_s6, + 0x770691: location_name.cloudy_park_6_s7, + 0x770692: location_name.cloudy_park_6_s8, + 0x770693: location_name.cloudy_park_6_s9, + 0x770694: location_name.cloudy_park_6_s10, + 0x770695: location_name.cloudy_park_6_s11, + 0x770696: location_name.cloudy_park_6_s12, + 0x770697: location_name.cloudy_park_6_s13, + 0x770698: location_name.cloudy_park_6_s14, + 0x770699: location_name.cloudy_park_6_s15, + 0x77069a: location_name.cloudy_park_6_s16, + 0x77069b: location_name.cloudy_park_6_s17, + 0x77069c: location_name.cloudy_park_6_s18, + 0x77069d: location_name.cloudy_park_6_s19, + 0x77069e: location_name.cloudy_park_6_s20, + 0x77069f: location_name.cloudy_park_6_s21, + 0x7706a0: location_name.cloudy_park_6_s22, + 0x7706a1: location_name.cloudy_park_6_s23, + 0x7706a2: location_name.cloudy_park_6_s24, + 0x7706a3: location_name.cloudy_park_6_s25, + 0x7706a4: location_name.cloudy_park_6_s26, + 0x7706a5: location_name.cloudy_park_6_s27, + 0x7706a6: location_name.cloudy_park_6_s28, + 0x7706a7: location_name.cloudy_park_6_s29, + 0x7706a8: location_name.cloudy_park_6_s30, + 0x7706a9: location_name.cloudy_park_6_s31, + 0x7706aa: location_name.cloudy_park_6_s32, + 0x7706ab: location_name.cloudy_park_6_s33, + 0x7706ac: location_name.iceberg_1_s1, + 0x7706ad: location_name.iceberg_1_s2, + 0x7706ae: location_name.iceberg_1_s3, + 0x7706af: location_name.iceberg_1_s4, + 0x7706b0: location_name.iceberg_1_s5, + 0x7706b1: location_name.iceberg_1_s6, + 0x7706b2: location_name.iceberg_2_s1, + 0x7706b3: location_name.iceberg_2_s2, + 0x7706b4: location_name.iceberg_2_s3, + 0x7706b5: location_name.iceberg_2_s4, + 0x7706b6: location_name.iceberg_2_s5, + 0x7706b7: location_name.iceberg_2_s6, + 0x7706b8: location_name.iceberg_2_s7, + 0x7706b9: location_name.iceberg_2_s8, + 0x7706ba: location_name.iceberg_2_s9, + 0x7706bb: location_name.iceberg_2_s10, + 0x7706bc: location_name.iceberg_2_s11, + 0x7706bd: location_name.iceberg_2_s12, + 0x7706be: location_name.iceberg_2_s13, + 0x7706bf: location_name.iceberg_2_s14, + 0x7706c0: location_name.iceberg_2_s15, + 0x7706c1: location_name.iceberg_2_s16, + 0x7706c2: location_name.iceberg_2_s17, + 0x7706c3: location_name.iceberg_2_s18, + 0x7706c4: location_name.iceberg_2_s19, + 0x7706c5: location_name.iceberg_3_s1, + 0x7706c6: location_name.iceberg_3_s2, + 0x7706c7: location_name.iceberg_3_s3, + 0x7706c8: location_name.iceberg_3_s4, + 0x7706c9: location_name.iceberg_3_s5, + 0x7706ca: location_name.iceberg_3_s6, + 0x7706cb: location_name.iceberg_3_s7, + 0x7706cc: location_name.iceberg_3_s8, + 0x7706cd: location_name.iceberg_3_s9, + 0x7706ce: location_name.iceberg_3_s10, + 0x7706cf: location_name.iceberg_3_s11, + 0x7706d0: location_name.iceberg_3_s12, + 0x7706d1: location_name.iceberg_3_s13, + 0x7706d2: location_name.iceberg_3_s14, + 0x7706d3: location_name.iceberg_3_s15, + 0x7706d4: location_name.iceberg_3_s16, + 0x7706d5: location_name.iceberg_3_s17, + 0x7706d6: location_name.iceberg_3_s18, + 0x7706d7: location_name.iceberg_3_s19, + 0x7706d8: location_name.iceberg_3_s20, + 0x7706d9: location_name.iceberg_3_s21, + 0x7706da: location_name.iceberg_4_s1, + 0x7706db: location_name.iceberg_4_s2, + 0x7706dc: location_name.iceberg_4_s3, + 0x7706dd: location_name.iceberg_5_s1, + 0x7706de: location_name.iceberg_5_s2, + 0x7706df: location_name.iceberg_5_s3, + 0x7706e0: location_name.iceberg_5_s4, + 0x7706e1: location_name.iceberg_5_s5, + 0x7706e2: location_name.iceberg_5_s6, + 0x7706e3: location_name.iceberg_5_s7, + 0x7706e4: location_name.iceberg_5_s8, + 0x7706e5: location_name.iceberg_5_s9, + 0x7706e6: location_name.iceberg_5_s10, + 0x7706e7: location_name.iceberg_5_s11, + 0x7706e8: location_name.iceberg_5_s12, + 0x7706e9: location_name.iceberg_5_s13, + 0x7706ea: location_name.iceberg_5_s14, + 0x7706eb: location_name.iceberg_5_s15, + 0x7706ec: location_name.iceberg_5_s16, + 0x7706ed: location_name.iceberg_5_s17, + 0x7706ee: location_name.iceberg_5_s18, + 0x7706ef: location_name.iceberg_5_s19, + 0x7706f0: location_name.iceberg_5_s20, + 0x7706f1: location_name.iceberg_5_s21, + 0x7706f2: location_name.iceberg_5_s22, + 0x7706f3: location_name.iceberg_5_s23, + 0x7706f4: location_name.iceberg_5_s24, + 0x7706f5: location_name.iceberg_5_s25, + 0x7706f6: location_name.iceberg_5_s26, + 0x7706f7: location_name.iceberg_5_s27, + 0x7706f8: location_name.iceberg_5_s28, + 0x7706f9: location_name.iceberg_5_s29, + 0x7706fa: location_name.iceberg_5_s30, + 0x7706fb: location_name.iceberg_5_s31, + 0x7706fc: location_name.iceberg_5_s32, + 0x7706fd: location_name.iceberg_5_s33, + 0x7706fe: location_name.iceberg_5_s34, + 0x7706ff: location_name.iceberg_6_s1, + +} + +location_table = { + **stage_locations, + **heart_star_locations, + **boss_locations, + **consumable_locations, + **star_locations +} diff --git a/worlds/kdl3/Names/__init__.py b/worlds/kdl3/names/__init__.py similarity index 100% rename from worlds/kdl3/Names/__init__.py rename to worlds/kdl3/names/__init__.py diff --git a/worlds/kdl3/Names/AnimalFriendSpawns.py b/worlds/kdl3/names/animal_friend_spawns.py similarity index 95% rename from worlds/kdl3/Names/AnimalFriendSpawns.py rename to worlds/kdl3/names/animal_friend_spawns.py index 4520cf143803..5c1ba3969748 100644 --- a/worlds/kdl3/Names/AnimalFriendSpawns.py +++ b/worlds/kdl3/names/animal_friend_spawns.py @@ -1,3 +1,5 @@ +from typing import List + grass_land_1_a1 = "Grass Land 1 - Animal 1" # Nago grass_land_1_a2 = "Grass Land 1 - Animal 2" # Rick grass_land_2_a1 = "Grass Land 2 - Animal 1" # ChuChu @@ -197,3 +199,12 @@ iceberg_6_a5: "ChuChu Spawn", iceberg_6_a6: "Nago Spawn", } + +problematic_sets: List[List[str]] = [ + # Animal groups that must be guaranteed unique. Potential for softlocks on future-ER if not. + [ripple_field_4_a1, ripple_field_4_a2, ripple_field_4_a3], + [sand_canyon_3_a1, sand_canyon_3_a2, sand_canyon_3_a3], + [cloudy_park_6_a1, cloudy_park_6_a2, cloudy_park_6_a3], + [iceberg_6_a1, iceberg_6_a2, iceberg_6_a3], + [iceberg_6_a4, iceberg_6_a5, iceberg_6_a6] +] diff --git a/worlds/kdl3/Names/EnemyAbilities.py b/worlds/kdl3/names/enemy_abilities.py similarity index 99% rename from worlds/kdl3/Names/EnemyAbilities.py rename to worlds/kdl3/names/enemy_abilities.py index 016e3033ab25..ace15054da59 100644 --- a/worlds/kdl3/Names/EnemyAbilities.py +++ b/worlds/kdl3/names/enemy_abilities.py @@ -809,7 +809,7 @@ enemy_restrictive: List[Tuple[List[str], List[str]]] = [ # abilities, enemies, set_all (False to set any) - (["Burning Ability", "Stone Ability"], ["Rocky", "Sparky", "Babut", "Squishy", ]), # Ribbon Field 5 - 7 + (["Stone Ability"], ["Rocky", "Sparky", "Babut", "Squishy", ]), # Ribbon Field 5 - 7 # Sand Canyon 6 (["Parasol Ability", "Cutter Ability"], ['Bukiset (Parasol)', 'Bukiset (Cutter)']), (["Spark Ability", "Clean Ability"], ['Bukiset (Spark)', 'Bukiset (Clean)']), diff --git a/worlds/kdl3/Names/LocationName.py b/worlds/kdl3/names/location_name.py similarity index 100% rename from worlds/kdl3/Names/LocationName.py rename to worlds/kdl3/names/location_name.py diff --git a/worlds/kdl3/Options.py b/worlds/kdl3/options.py similarity index 82% rename from worlds/kdl3/Options.py rename to worlds/kdl3/options.py index e0a4f12f15dc..b9163794ad19 100644 --- a/worlds/kdl3/Options.py +++ b/worlds/kdl3/options.py @@ -1,13 +1,21 @@ import random from dataclasses import dataclass +from typing import List -from Options import DeathLink, Choice, Toggle, OptionDict, Range, PlandoBosses, DefaultOnToggle, \ - PerGameCommonOptions, PlandoConnections -from .Names import LocationName +from Options import DeathLinkMixin, Choice, Toggle, OptionDict, Range, PlandoBosses, DefaultOnToggle, \ + PerGameCommonOptions, Visibility, NamedRange, OptionGroup, PlandoConnections +from .names import location_name + + +class RemoteItems(DefaultOnToggle): + """ + Enables receiving items from your own world, primarily for co-op play. + """ + display_name = "Remote Items" class KDL3PlandoConnections(PlandoConnections): - entrances = exits = {f"{i} {j}" for i in LocationName.level_names for j in range(1, 7)} + entrances = exits = {f"{i} {j}" for i in location_name.level_names for j in range(1, 7)} class Goal(Choice): @@ -30,6 +38,7 @@ def get_option_name(cls, value: int) -> str: return cls.name_lookup[value].upper() return super().get_option_name(value) + class GoalSpeed(Choice): """ Normal: the goal is unlocked after purifying the five bosses @@ -40,13 +49,14 @@ class GoalSpeed(Choice): option_fast = 1 -class TotalHeartStars(Range): +class MaxHeartStars(Range): """ Maximum number of heart stars to include in the pool of items. + If fewer available locations exist in the pool than this number, the number of available locations will be used instead. """ display_name = "Max Heart Stars" range_start = 5 # set to 5 so strict bosses does not degrade - range_end = 50 # 30 default locations + 30 stage clears + 5 bosses - 14 progression items = 51, so round down + range_end = 99 # previously set to 50, set to highest it can be should there be less locations than heart stars default = 30 @@ -84,9 +94,9 @@ class BossShuffle(PlandoBosses): Singularity: All (non-Zero) bosses will be replaced with a single boss Supports plando placement. """ - bosses = frozenset(LocationName.boss_names.keys()) + bosses = frozenset(location_name.boss_names.keys()) - locations = frozenset(LocationName.level_names.keys()) + locations = frozenset(location_name.level_names.keys()) duplicate_bosses = True @@ -278,7 +288,8 @@ class KirbyFlavorPreset(Choice): option_orange = 11 option_lime = 12 option_lavender = 13 - option_custom = 14 + option_miku = 14 + option_custom = 15 default = 0 @classmethod @@ -296,6 +307,7 @@ class KirbyFlavor(OptionDict): A custom color for Kirby. To use a custom color, set the preset to Custom and then define a dict of keys from "1" to "15", with their values being an HTML hex color. """ + display_name = "Custom Kirby Flavor" default = { "1": "B01810", "2": "F0E0E8", @@ -313,6 +325,7 @@ class KirbyFlavor(OptionDict): "14": "F8F8F8", "15": "B03830", } + visibility = Visibility.template | Visibility.spoiler # likely never supported on guis class GooeyFlavorPreset(Choice): @@ -352,6 +365,7 @@ class GooeyFlavor(OptionDict): A custom color for Gooey. To use a custom color, set the preset to Custom and then define a dict of keys from "1" to "15", with their values being an HTML hex color. """ + display_name = "Custom Gooey Flavor" default = { "1": "000808", "2": "102838", @@ -363,6 +377,7 @@ class GooeyFlavor(OptionDict): "8": "D0C0C0", "9": "F8F8F8", } + visibility = Visibility.template | Visibility.spoiler # likely never supported on guis class MusicShuffle(Choice): @@ -402,14 +417,27 @@ class Gifting(Toggle): display_name = "Gifting" +class TotalHeartStars(NamedRange): + """ + Deprecated. Use max_heart_stars instead. Supported for only one version. + """ + default = -1 + range_start = 5 + range_end = 99 + special_range_names = { + "default": -1 + } + visibility = Visibility.none + + @dataclass -class KDL3Options(PerGameCommonOptions): +class KDL3Options(PerGameCommonOptions, DeathLinkMixin): + remote_items: RemoteItems plando_connections: KDL3PlandoConnections - death_link: DeathLink game_language: GameLanguage goal: Goal goal_speed: GoalSpeed - total_heart_stars: TotalHeartStars + max_heart_stars: MaxHeartStars heart_stars_required: HeartStarsRequired filler_percentage: FillerPercentage trap_percentage: TrapPercentage @@ -435,3 +463,17 @@ class KDL3Options(PerGameCommonOptions): gooey_flavor: GooeyFlavor music_shuffle: MusicShuffle virtual_console: VirtualConsoleChanges + + total_heart_stars: TotalHeartStars # remove in 2 versions + + +kdl3_option_groups: List[OptionGroup] = [ + OptionGroup("Goal Options", [Goal, GoalSpeed, MaxHeartStars, HeartStarsRequired, JumpingTarget, ]), + OptionGroup("World Options", [RemoteItems, StrictBosses, OpenWorld, OpenWorldBossRequirement, ConsumableChecks, + StarChecks, FillerPercentage, TrapPercentage, GooeyTrapPercentage, + SlowTrapPercentage, AbilityTrapPercentage, LevelShuffle, BossShuffle, + AnimalRandomization, CopyAbilityRandomization, BossRequirementRandom, + Gifting, ]), + OptionGroup("Cosmetic Options", [GameLanguage, BossShuffleAllowBB, KirbyFlavorPreset, KirbyFlavor, + GooeyFlavorPreset, GooeyFlavor, MusicShuffle, VirtualConsoleChanges, ]), +] diff --git a/worlds/kdl3/Presets.py b/worlds/kdl3/presets.py similarity index 98% rename from worlds/kdl3/Presets.py rename to worlds/kdl3/presets.py index d3a7146ded5f..491ad9dca993 100644 --- a/worlds/kdl3/Presets.py +++ b/worlds/kdl3/presets.py @@ -25,6 +25,7 @@ "ow_boss_requirement": "random", "boss_requirement_random": "random", "consumables": "random", + "starsanity": "random", "kirby_flavor_preset": "random", "gooey_flavor_preset": "random", "music_shuffle": "random", diff --git a/worlds/kdl3/Regions.py b/worlds/kdl3/regions.py similarity index 66% rename from worlds/kdl3/Regions.py rename to worlds/kdl3/regions.py index 407dcf9680f4..c47e5dee4095 100644 --- a/worlds/kdl3/Regions.py +++ b/worlds/kdl3/regions.py @@ -1,60 +1,62 @@ import orjson import os from pkgutil import get_data +from copy import deepcopy -from typing import TYPE_CHECKING, List, Dict, Optional, Union -from BaseClasses import Region +from typing import TYPE_CHECKING, List, Dict, Optional, Union, Callable +from BaseClasses import Region, CollectionState from worlds.generic.Rules import add_item_rule -from .Locations import KDL3Location -from .Names import LocationName -from .Options import BossShuffle -from .Room import KDL3Room +from .locations import KDL3Location +from .names import location_name +from .options import BossShuffle +from .room import KDL3Room if TYPE_CHECKING: from . import KDL3World default_levels = { - 1: [0x770001, 0x770002, 0x770003, 0x770004, 0x770005, 0x770006, 0x770200], - 2: [0x770007, 0x770008, 0x770009, 0x77000A, 0x77000B, 0x77000C, 0x770201], - 3: [0x77000D, 0x77000E, 0x77000F, 0x770010, 0x770011, 0x770012, 0x770202], - 4: [0x770013, 0x770014, 0x770015, 0x770016, 0x770017, 0x770018, 0x770203], - 5: [0x770019, 0x77001A, 0x77001B, 0x77001C, 0x77001D, 0x77001E, 0x770204], + 1: [0x770000, 0x770001, 0x770002, 0x770003, 0x770004, 0x770005, 0x770200], + 2: [0x770006, 0x770007, 0x770008, 0x770009, 0x77000A, 0x77000B, 0x770201], + 3: [0x77000C, 0x77000D, 0x77000E, 0x77000F, 0x770010, 0x770011, 0x770202], + 4: [0x770012, 0x770013, 0x770014, 0x770015, 0x770016, 0x770017, 0x770203], + 5: [0x770018, 0x770019, 0x77001A, 0x77001B, 0x77001C, 0x77001D, 0x770204], } first_stage_blacklist = { # We want to confirm that the first stage can be completed without any items - 0x77000B, # 2-5 needs Kine - 0x770011, # 3-5 needs Cutter - 0x77001C, # 5-4 needs Burning + 0x77000A, # 2-5 needs Kine + 0x770010, # 3-5 needs Cutter + 0x77001B, # 5-4 needs Burning } first_world_limit = { # We need to limit the number of very restrictive stages in level 1 on solo gens *first_stage_blacklist, # all three of the blacklist stages need 2+ items for both checks + 0x770006, 0x770007, - 0x770008, - 0x770013, - 0x77001E, + 0x770012, + 0x77001D, } def generate_valid_level(world: "KDL3World", level: int, stage: int, - possible_stages: List[int], placed_stages: List[int]): + possible_stages: List[int], placed_stages: List[Optional[int]]) -> int: new_stage = world.random.choice(possible_stages) if level == 1: if stage == 0 and new_stage in first_stage_blacklist: + possible_stages.remove(new_stage) return generate_valid_level(world, level, stage, possible_stages, placed_stages) elif (not (world.multiworld.players > 1 or world.options.consumables or world.options.starsanity) and - new_stage in first_world_limit and - sum(p_stage in first_world_limit for p_stage in placed_stages) + new_stage in first_world_limit and + sum(p_stage in first_world_limit for p_stage in placed_stages) >= (2 if world.options.open_world else 1)): return generate_valid_level(world, level, stage, possible_stages, placed_stages) return new_stage -def generate_rooms(world: "KDL3World", level_regions: Dict[int, Region]): - level_names = {LocationName.level_names[level]: level for level in LocationName.level_names} +def generate_rooms(world: "KDL3World", level_regions: Dict[int, Region]) -> None: + level_names = {location_name.level_names[level]: level for level in location_name.level_names} room_data = orjson.loads(get_data(__name__, os.path.join("data", "Rooms.json"))) rooms: Dict[str, KDL3Room] = dict() for room_entry in room_data: @@ -63,7 +65,7 @@ def generate_rooms(world: "KDL3World", level_regions: Dict[int, Region]): room_entry["default_exits"], room_entry["animal_pointers"], room_entry["enemies"], room_entry["entity_load"], room_entry["consumables"], room_entry["consumables_pointer"]) room.add_locations({location: world.location_name_to_id[location] if location in world.location_name_to_id else - None for location in room_entry["locations"] + None for location in room_entry["locations"] if (not any(x in location for x in ["1-Up", "Maxim"]) or world.options.consumables.value) and ("Star" not in location or world.options.starsanity.value)}, @@ -83,8 +85,8 @@ def generate_rooms(world: "KDL3World", level_regions: Dict[int, Region]): if room.stage == 7: first_rooms[0x770200 + room.level - 1] = room else: - first_rooms[0x770000 + ((room.level - 1) * 6) + room.stage] = room - exits = dict() + first_rooms[0x770000 + ((room.level - 1) * 6) + room.stage - 1] = room + exits: Dict[str, Callable[[CollectionState], bool]] = dict() for def_exit in room.default_exits: target = f"{level_names[room.level]} {room.stage} - {def_exit['room']}" access_rule = tuple(def_exit["access_rule"]) @@ -115,50 +117,54 @@ def generate_rooms(world: "KDL3World", level_regions: Dict[int, Region]): if world.options.open_world: level_regions[level].add_exits([first_rooms[0x770200 + level - 1].name]) else: - world.multiworld.get_location(world.location_id_to_name[world.player_levels[level][5]], world.player)\ + world.multiworld.get_location(world.location_id_to_name[world.player_levels[level][5]], world.player) \ .parent_region.add_exits([first_rooms[0x770200 + level - 1].name]) -def generate_valid_levels(world: "KDL3World", enforce_world: bool, enforce_pattern: bool) -> dict: - levels: Dict[int, List[Optional[int]]] = { - 1: [None] * 7, - 2: [None] * 7, - 3: [None] * 7, - 4: [None] * 7, - 5: [None] * 7, - } +def generate_valid_levels(world: "KDL3World", shuffle_mode: int) -> Dict[int, List[int]]: + if shuffle_mode: + levels: Dict[int, List[Optional[int]]] = { + 1: [None] * 7, + 2: [None] * 7, + 3: [None] * 7, + 4: [None] * 7, + 5: [None] * 7, + } + + possible_stages = [default_levels[level][stage] for level in default_levels for stage in range(6)] + if world.options.plando_connections: + for connection in world.options.plando_connections: + try: + entrance_world, entrance_stage = connection.entrance.rsplit(" ", 1) + stage_world, stage_stage = connection.exit.rsplit(" ", 1) + new_stage = default_levels[location_name.level_names[stage_world.strip()]][int(stage_stage) - 1] + levels[location_name.level_names[entrance_world.strip()]][int(entrance_stage) - 1] = new_stage + possible_stages.remove(new_stage) - possible_stages = [default_levels[level][stage] for level in default_levels for stage in range(6)] - if world.options.plando_connections: - for connection in world.options.plando_connections: - try: - entrance_world, entrance_stage = connection.entrance.rsplit(" ", 1) - stage_world, stage_stage = connection.exit.rsplit(" ", 1) - new_stage = default_levels[LocationName.level_names[stage_world.strip()]][int(stage_stage) - 1] - levels[LocationName.level_names[entrance_world.strip()]][int(entrance_stage) - 1] = new_stage - possible_stages.remove(new_stage) - - except Exception: - raise Exception( - f"Invalid connection: {connection.entrance} =>" - f" {connection.exit} for player {world.player} ({world.player_name})") - - for level in range(1, 6): - for stage in range(6): - # Randomize bosses separately - try: + except Exception: + raise Exception( + f"Invalid connection: {connection.entrance} =>" + f" {connection.exit} for player {world.player} ({world.player_name})") + + for level in range(1, 6): + for stage in range(6): + # Randomize bosses separately if levels[level][stage] is None: stage_candidates = [candidate for candidate in possible_stages - if (enforce_world and candidate in default_levels[level]) - or (enforce_pattern and ((candidate - 1) & 0x00FFFF) % 6 == stage) - or (enforce_pattern == enforce_world) + if (shuffle_mode == 1 and candidate in default_levels[level]) + or (shuffle_mode == 2 and (candidate & 0x00FFFF) % 6 == stage) + or (shuffle_mode == 3) ] + if not stage_candidates: + raise Exception( + f"Failed to find valid stage for {level}-{stage}. Remaining Stages:{possible_stages}") new_stage = generate_valid_level(world, level, stage, stage_candidates, levels[level]) possible_stages.remove(new_stage) levels[level][stage] = new_stage - except Exception: - raise Exception(f"Failed to find valid stage for {level}-{stage}. Remaining Stages:{possible_stages}") - + else: + levels = deepcopy(default_levels) + for level in levels: + levels[level][6] = None # now handle bosses boss_shuffle: Union[int, str] = world.options.boss_shuffle.value plando_bosses = [] @@ -168,17 +174,17 @@ def generate_valid_levels(world: "KDL3World", enforce_world: bool, enforce_patte boss_shuffle = BossShuffle.options[options.pop()] for option in options: if "-" in option: - loc, boss = option.split("-") + loc, plando_boss = option.split("-") loc = loc.title() - boss = boss.title() - levels[LocationName.level_names[loc]][6] = LocationName.boss_names[boss] - plando_bosses.append(LocationName.boss_names[boss]) + plando_boss = plando_boss.title() + levels[location_name.level_names[loc]][6] = location_name.boss_names[plando_boss] + plando_bosses.append(location_name.boss_names[plando_boss]) else: option = option.title() for level in levels: if levels[level][6] is None: - levels[level][6] = LocationName.boss_names[option] - plando_bosses.append(LocationName.boss_names[option]) + levels[level][6] = location_name.boss_names[option] + plando_bosses.append(location_name.boss_names[option]) if boss_shuffle > 0: if boss_shuffle == BossShuffle.option_full: @@ -223,15 +229,14 @@ def create_levels(world: "KDL3World") -> None: 5: level5, } level_shuffle = world.options.stage_shuffle.value - if level_shuffle != 0: - world.player_levels = generate_valid_levels( - world, - level_shuffle == 1, - level_shuffle == 2) + if hasattr(world.multiworld, "re_gen_passthrough"): + world.player_levels = getattr(world.multiworld, "re_gen_passthrough")["Kirby's Dream Land 3"]["player_levels"] + else: + world.player_levels = generate_valid_levels(world, level_shuffle) generate_rooms(world, levels) - level6.add_locations({LocationName.goals[world.options.goal]: None}, KDL3Location) + level6.add_locations({location_name.goals[world.options.goal.value]: None}, KDL3Location) menu.connect(level1, "Start Game") level1.connect(level2, "To Level 2") diff --git a/worlds/kdl3/rom.py b/worlds/kdl3/rom.py new file mode 100644 index 000000000000..3dd10ce1c43f --- /dev/null +++ b/worlds/kdl3/rom.py @@ -0,0 +1,602 @@ +import typing +from pkgutil import get_data + +import Utils +from typing import Optional, TYPE_CHECKING, Tuple, Dict, List +import hashlib +import os +import struct + +import settings +from worlds.Files import APProcedurePatch, APTokenMixin, APTokenTypes, APPatchExtension +from .aesthetics import get_palette_bytes, kirby_target_palettes, get_kirby_palette, gooey_target_palettes, \ + get_gooey_palette +from .compression import hal_decompress +import bsdiff4 + +if TYPE_CHECKING: + from . import KDL3World + +KDL3UHASH = "201e7658f6194458a3869dde36bf8ec2" +KDL3JHASH = "b2f2d004ea640c3db66df958fce122b2" + +level_pointers = { + 0x770000: 0x0084, + 0x770001: 0x009C, + 0x770002: 0x00B8, + 0x770003: 0x00D8, + 0x770004: 0x0104, + 0x770005: 0x0124, + 0x770006: 0x014C, + 0x770007: 0x0170, + 0x770008: 0x0190, + 0x770009: 0x01B0, + 0x77000A: 0x01E8, + 0x77000B: 0x0218, + 0x77000C: 0x024C, + 0x77000D: 0x0270, + 0x77000E: 0x02A0, + 0x77000F: 0x02C4, + 0x770010: 0x02EC, + 0x770011: 0x0314, + 0x770012: 0x03CC, + 0x770013: 0x0404, + 0x770014: 0x042C, + 0x770015: 0x044C, + 0x770016: 0x0478, + 0x770017: 0x049C, + 0x770018: 0x04E4, + 0x770019: 0x0504, + 0x77001A: 0x0530, + 0x77001B: 0x0554, + 0x77001C: 0x05A8, + 0x77001D: 0x0640, + 0x770200: 0x0148, + 0x770201: 0x0248, + 0x770202: 0x03C8, + 0x770203: 0x04E0, + 0x770204: 0x06A4, + 0x770205: 0x06A8, +} + +bb_bosses = { + 0x770200: 0xED85F1, + 0x770201: 0xF01360, + 0x770202: 0xEDA3DF, + 0x770203: 0xEDC2B9, + 0x770204: 0xED7C3F, + 0x770205: 0xEC29D2, +} + +level_sprites = { + 0x19B2C6: 1827, + 0x1A195C: 1584, + 0x19F6F3: 1679, + 0x19DC8B: 1717, + 0x197900: 1872 +} + +stage_tiles = { + 0: [ + 0, 1, 2, + 16, 17, 18, + 32, 33, 34, + 48, 49, 50 + ], + 1: [ + 3, 4, 5, + 19, 20, 21, + 35, 36, 37, + 51, 52, 53 + ], + 2: [ + 6, 7, 8, + 22, 23, 24, + 38, 39, 40, + 54, 55, 56 + ], + 3: [ + 9, 10, 11, + 25, 26, 27, + 41, 42, 43, + 57, 58, 59, + ], + 4: [ + 12, 13, 64, + 28, 29, 65, + 44, 45, 66, + 60, 61, 67 + ], + 5: [ + 14, 15, 68, + 30, 31, 69, + 46, 47, 70, + 62, 63, 71 + ] +} + +heart_star_address = 0x2D0000 +heart_star_size = 456 +consumable_address = 0x2F91DD +consumable_size = 698 + +stage_palettes = [0x60964, 0x60B64, 0x60D64, 0x60F64, 0x61164] + +music_choices = [ + 2, # Boss 1 + 3, # Boss 2 (Unused) + 4, # Boss 3 (Miniboss) + 7, # Dedede + 9, # Event 2 (used once) + 10, # Field 1 + 11, # Field 2 + 12, # Field 3 + 13, # Field 4 + 14, # Field 5 + 15, # Field 6 + 16, # Field 7 + 17, # Field 8 + 18, # Field 9 + 19, # Field 10 + 20, # Field 11 + 21, # Field 12 (Gourmet Race) + 23, # Dark Matter in the Hyper Zone + 24, # Zero + 25, # Level 1 + 26, # Level 2 + 27, # Level 4 + 28, # Level 3 + 29, # Heart Star Failed + 30, # Level 5 + 31, # Minigame + 38, # Animal Friend 1 + 39, # Animal Friend 2 + 40, # Animal Friend 3 +] +# extra room pointers we don't want to track other than for music +room_music = { + 3079990: 23, # Zero + 2983409: 2, # BB Whispy + 3150688: 2, # BB Acro + 2991071: 2, # BB PonCon + 2998969: 2, # BB Ado + 2980927: 7, # BB Dedede + 2894290: 23 # BB Zero +} + +enemy_remap = { + "Waddle Dee": 0, + "Bronto Burt": 2, + "Rocky": 3, + "Bobo": 5, + "Chilly": 6, + "Poppy Bros Jr.": 7, + "Sparky": 8, + "Polof": 9, + "Broom Hatter": 11, + "Cappy": 12, + "Bouncy": 13, + "Nruff": 15, + "Glunk": 16, + "Togezo": 18, + "Kabu": 19, + "Mony": 20, + "Blipper": 21, + "Squishy": 22, + "Gabon": 24, + "Oro": 25, + "Galbo": 26, + "Sir Kibble": 27, + "Nidoo": 28, + "Kany": 29, + "Sasuke": 30, + "Yaban": 32, + "Boten": 33, + "Coconut": 34, + "Doka": 35, + "Icicle": 36, + "Pteran": 39, + "Loud": 40, + "Como": 41, + "Klinko": 42, + "Babut": 43, + "Wappa": 44, + "Mariel": 45, + "Tick": 48, + "Apolo": 49, + "Popon Ball": 50, + "KeKe": 51, + "Magoo": 53, + "Raft Waddle Dee": 57, + "Madoo": 58, + "Corori": 60, + "Kapar": 67, + "Batamon": 68, + "Peran": 72, + "Bobin": 73, + "Mopoo": 74, + "Gansan": 75, + "Bukiset (Burning)": 76, + "Bukiset (Stone)": 77, + "Bukiset (Ice)": 78, + "Bukiset (Needle)": 79, + "Bukiset (Clean)": 80, + "Bukiset (Parasol)": 81, + "Bukiset (Spark)": 82, + "Bukiset (Cutter)": 83, + "Waddle Dee Drawing": 84, + "Bronto Burt Drawing": 85, + "Bouncy Drawing": 86, + "Kabu (Dekabu)": 87, + "Wapod": 88, + "Propeller": 89, + "Dogon": 90, + "Joe": 91 +} + +miniboss_remap = { + "Captain Stitch": 0, + "Yuki": 1, + "Blocky": 2, + "Jumper Shoot": 3, + "Boboo": 4, + "Haboki": 5 +} + +ability_remap = { + "No Ability": 0, + "Burning Ability": 1, + "Stone Ability": 2, + "Ice Ability": 3, + "Needle Ability": 4, + "Clean Ability": 5, + "Parasol Ability": 6, + "Spark Ability": 7, + "Cutter Ability": 8, +} + + +class RomData: + def __init__(self, file: bytes, name: typing.Optional[str] = None): + self.file = bytearray(file) + self.name = name + + def read_byte(self, offset: int) -> int: + return self.file[offset] + + def read_bytes(self, offset: int, length: int) -> bytearray: + return self.file[offset:offset + length] + + def write_byte(self, offset: int, value: int) -> None: + self.file[offset] = value + + def write_bytes(self, offset: int, values: typing.Sequence[int]) -> None: + self.file[offset:offset + len(values)] = values + + def get_bytes(self) -> bytes: + return bytes(self.file) + + +def handle_level_sprites(stages: List[Tuple[int, ...]], sprites: List[bytearray], palettes: List[List[bytearray]]) \ + -> Tuple[List[bytearray], List[bytearray]]: + palette_by_level = list() + for palette in palettes: + palette_by_level.extend(palette[10:16]) + out_palettes = list() + for i in range(5): + for j in range(6): + palettes[i][10 + j] = palette_by_level[stages[i][j]] + out_palettes.append(bytearray([x for palette in palettes[i] for x in palette])) + tiles_by_level = list() + for spritesheet in sprites: + decompressed = hal_decompress(spritesheet) + tiles = [decompressed[i:i + 32] for i in range(0, 2304, 32)] + tiles_by_level.extend([[tiles[x] for x in stage_tiles[stage]] for stage in stage_tiles]) + out_sprites = list() + for world in range(5): + levels = [stages[world][x] for x in range(6)] + world_tiles: typing.List[bytes] = [bytes() for _ in range(72)] + for i in range(6): + for x in range(12): + world_tiles[stage_tiles[i][x]] = tiles_by_level[levels[i]][x] + out_sprites.append(bytearray()) + for tile in world_tiles: + out_sprites[world].extend(tile) + # insert our fake compression + out_sprites[world][0:0] = [0xe3, 0xff] + out_sprites[world][1026:1026] = [0xe3, 0xff] + out_sprites[world][2052:2052] = [0xe0, 0xff] + out_sprites[world].append(0xff) + return out_sprites, out_palettes + + +def write_heart_star_sprites(rom: RomData) -> None: + compressed = rom.read_bytes(heart_star_address, heart_star_size) + decompressed = hal_decompress(compressed) + patch = get_data(__name__, os.path.join("data", "APHeartStar.bsdiff4")) + patched = bytearray(bsdiff4.patch(decompressed, patch)) + rom.write_bytes(0x1AF7DF, patched) + patched[0:0] = [0xE3, 0xFF] + patched.append(0xFF) + rom.write_bytes(0x1CD000, patched) + rom.write_bytes(0x3F0EBF, [0x00, 0xD0, 0x39]) + + +def write_consumable_sprites(rom: RomData, consumables: bool, stars: bool) -> None: + compressed = rom.read_bytes(consumable_address, consumable_size) + decompressed = hal_decompress(compressed) + patched = bytearray(decompressed) + if consumables: + patch = get_data(__name__, os.path.join("data", "APConsumable.bsdiff4")) + patched = bytearray(bsdiff4.patch(bytes(patched), patch)) + if stars: + patch = get_data(__name__, os.path.join("data", "APStars.bsdiff4")) + patched = bytearray(bsdiff4.patch(bytes(patched), patch)) + patched[0:0] = [0xE3, 0xFF] + patched.append(0xFF) + rom.write_bytes(0x1CD500, patched) + rom.write_bytes(0x3F0DAE, [0x00, 0xD5, 0x39]) + + +class KDL3PatchExtensions(APPatchExtension): + game = "Kirby's Dream Land 3" + + @staticmethod + def apply_post_patch(_: APProcedurePatch, rom: bytes) -> bytes: + rom_data = RomData(rom) + write_heart_star_sprites(rom_data) + if rom_data.read_bytes(0x3D014, 1)[0] > 0: + stages = [struct.unpack("HHHHHHH", rom_data.read_bytes(0x3D020 + x * 14, 14)) for x in range(5)] + palettes = [rom_data.read_bytes(full_pal, 512) for full_pal in stage_palettes] + read_palettes = [[palette[i:i + 32] for i in range(0, 512, 32)] for palette in palettes] + sprites = [rom_data.read_bytes(offset, level_sprites[offset]) for offset in level_sprites] + sprites, palettes = handle_level_sprites(stages, sprites, read_palettes) + for addr, palette in zip(stage_palettes, palettes): + rom_data.write_bytes(addr, palette) + for addr, level_sprite in zip([0x1CA000, 0x1CA920, 0x1CB230, 0x1CBB40, 0x1CC450], sprites): + rom_data.write_bytes(addr, level_sprite) + rom_data.write_bytes(0x460A, [0x00, 0xA0, 0x39, 0x20, 0xA9, 0x39, 0x30, 0xB2, 0x39, 0x40, 0xBB, 0x39, + 0x50, 0xC4, 0x39]) + write_consumable_sprites(rom_data, rom_data.read_byte(0x3D018) > 0, rom_data.read_byte(0x3D01A) > 0) + return rom_data.get_bytes() + + +class KDL3ProcedurePatch(APProcedurePatch, APTokenMixin): + hash = [KDL3UHASH, KDL3JHASH] + game = "Kirby's Dream Land 3" + patch_file_ending = ".apkdl3" + procedure = [ + ("apply_bsdiff4", ["kdl3_basepatch.bsdiff4"]), + ("apply_tokens", ["token_patch.bin"]), + ("apply_post_patch", []), + ("calc_snes_crc", []) + ] + name: bytes # used to pass to __init__ + + @classmethod + def get_source_data(cls) -> bytes: + return get_base_rom_bytes() + + +def patch_rom(world: "KDL3World", patch: KDL3ProcedurePatch) -> None: + patch.write_file("kdl3_basepatch.bsdiff4", + get_data(__name__, os.path.join("data", "kdl3_basepatch.bsdiff4"))) + + # Write open world patch + if world.options.open_world: + patch.write_token(APTokenTypes.WRITE, 0x143C7, bytes([0xAD, 0xC1, 0x5A, 0xCD, 0xC1, 0x5A, ])) + # changes the stage flag function to compare $5AC1 to $5AC1, + # always running the "new stage" function + # This has further checks present for bosses already, so we just + # need to handle regular stages + # write check for boss to be unlocked + + if world.options.consumables: + # reroute maxim tomatoes to use the 1-UP function, then null out the function + patch.write_token(APTokenTypes.WRITE, 0x3002F, bytes([0x37, 0x00])) + patch.write_token(APTokenTypes.WRITE, 0x30037, bytes([0xA9, 0x26, 0x00, # LDA #$0026 + 0x22, 0x27, 0xD9, 0x00, # JSL $00D927 + 0xA4, 0xD2, # LDY $D2 + 0x6B, # RTL + 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, + 0xEA, # NOP #10 + ])) + + # stars handling is built into the rom, so no changes there + + rooms = world.rooms + if world.options.music_shuffle > 0: + if world.options.music_shuffle == 1: + shuffled_music = music_choices.copy() + world.random.shuffle(shuffled_music) + music_map = dict(zip(music_choices, shuffled_music)) + # Avoid putting star twinkle in the pool + music_map[5] = world.random.choice(music_choices) + # Heart Star music doesn't work on regular stages + music_map[8] = world.random.choice(music_choices) + for room in rooms: + room.music = music_map[room.music] + for room_ptr in room_music: + patch.write_token(APTokenTypes.WRITE, room_ptr + 2, bytes([music_map[room_music[room_ptr]]])) + for i, old_music in zip(range(5), [25, 26, 28, 27, 30]): + # level themes + patch.write_token(APTokenTypes.WRITE, 0x133F2 + i, bytes([music_map[old_music]])) + # Zero + patch.write_token(APTokenTypes.WRITE, 0x9AE79, music_map[0x18].to_bytes(1, "little")) + # Heart Star success and fail + patch.write_token(APTokenTypes.WRITE, 0x4A388, music_map[0x08].to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x4A38D, music_map[0x1D].to_bytes(1, "little")) + elif world.options.music_shuffle == 2: + for room in rooms: + room.music = world.random.choice(music_choices) + for room_ptr in room_music: + patch.write_token(APTokenTypes.WRITE, room_ptr + 2, + world.random.choice(music_choices).to_bytes(1, "little")) + for i in range(5): + # level themes + patch.write_token(APTokenTypes.WRITE, 0x133F2 + i, + world.random.choice(music_choices).to_bytes(1, "little")) + # Zero + patch.write_token(APTokenTypes.WRITE, 0x9AE79, world.random.choice(music_choices).to_bytes(1, "little")) + # Heart Star success and fail + patch.write_token(APTokenTypes.WRITE, 0x4A388, world.random.choice(music_choices).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x4A38D, world.random.choice(music_choices).to_bytes(1, "little")) + + for room in rooms: + room.patch(patch, bool(world.options.consumables.value), not bool(world.options.remote_items.value)) + + if world.options.virtual_console in [1, 3]: + # Flash Reduction + patch.write_token(APTokenTypes.WRITE, 0x9AE68, b"\x10") + patch.write_token(APTokenTypes.WRITE, 0x9AE8E, bytes([0x08, 0x00, 0x22, 0x5D, 0xF7, 0x00, 0xA2, 0x08, ])) + patch.write_token(APTokenTypes.WRITE, 0x9AEA1, b"\x08") + patch.write_token(APTokenTypes.WRITE, 0x9AEC9, b"\x01") + patch.write_token(APTokenTypes.WRITE, 0x9AED2, bytes([0xA9, 0x1F])) + patch.write_token(APTokenTypes.WRITE, 0x9AEE1, b"\x08") + + if world.options.virtual_console in [2, 3]: + # Hyper Zone BB colors + patch.write_token(APTokenTypes.WRITE, 0x2C5E16, bytes([0xEE, 0x1B, 0x18, 0x5B, 0xD3, 0x4A, 0xF4, 0x3B, ])) + patch.write_token(APTokenTypes.WRITE, 0x2C8217, bytes([0xFF, 0x1E, ])) + + # boss requirements + patch.write_token(APTokenTypes.WRITE, 0x3D000, + struct.pack("HHHHH", world.boss_requirements[0], world.boss_requirements[1], + world.boss_requirements[2], world.boss_requirements[3], + world.boss_requirements[4])) + patch.write_token(APTokenTypes.WRITE, 0x3D00A, + struct.pack("H", world.required_heart_stars if world.options.goal_speed == 1 else 0xFFFF)) + patch.write_token(APTokenTypes.WRITE, 0x3D00C, world.options.goal_speed.value.to_bytes(2, "little")) + patch.write_token(APTokenTypes.WRITE, 0x3D00E, world.options.open_world.value.to_bytes(2, "little")) + patch.write_token(APTokenTypes.WRITE, 0x3D010, ((world.options.remote_items.value << 1) + + world.options.death_link.value).to_bytes(2, "little")) + patch.write_token(APTokenTypes.WRITE, 0x3D012, world.options.goal.value.to_bytes(2, "little")) + patch.write_token(APTokenTypes.WRITE, 0x3D014, world.options.stage_shuffle.value.to_bytes(2, "little")) + patch.write_token(APTokenTypes.WRITE, 0x3D016, world.options.ow_boss_requirement.value.to_bytes(2, "little")) + patch.write_token(APTokenTypes.WRITE, 0x3D018, world.options.consumables.value.to_bytes(2, "little")) + patch.write_token(APTokenTypes.WRITE, 0x3D01A, world.options.starsanity.value.to_bytes(2, "little")) + patch.write_token(APTokenTypes.WRITE, 0x3D01C, world.options.gifting.value.to_bytes(2, "little") + if world.multiworld.players > 1 else bytes([0, 0])) + patch.write_token(APTokenTypes.WRITE, 0x3D01E, world.options.strict_bosses.value.to_bytes(2, "little")) + # don't write gifting for solo game, since there's no one to send anything to + + for level in world.player_levels: + for i in range(len(world.player_levels[level])): + patch.write_token(APTokenTypes.WRITE, 0x3F002E + ((level - 1) * 14) + (i * 2), + struct.pack("H", level_pointers[world.player_levels[level][i]])) + patch.write_token(APTokenTypes.WRITE, 0x3D020 + (level - 1) * 14 + (i * 2), + struct.pack("H", world.player_levels[level][i] & 0x00FFFF)) + if (i == 0) or (i > 0 and i % 6 != 0): + patch.write_token(APTokenTypes.WRITE, 0x3D080 + (level - 1) * 12 + (i * 2), + struct.pack("H", (world.player_levels[level][i] & 0x00FFFF) % 6)) + + for i in range(6): + if world.boss_butch_bosses[i]: + patch.write_token(APTokenTypes.WRITE, 0x3F0000 + (level_pointers[0x770200 + i]), + struct.pack("I", bb_bosses[0x770200 + i])) + + # copy ability shuffle + if world.options.copy_ability_randomization.value > 0: + for enemy in world.copy_abilities: + if enemy in miniboss_remap: + patch.write_token(APTokenTypes.WRITE, 0xB417E + (miniboss_remap[enemy] << 1), + struct.pack("H", ability_remap[world.copy_abilities[enemy]])) + else: + patch.write_token(APTokenTypes.WRITE, 0xB3CAC + (enemy_remap[enemy] << 1), + struct.pack("H", ability_remap[world.copy_abilities[enemy]])) + # following only needs done on non-door rando + # incredibly lucky this follows the same order (including 5E == star block) + patch.write_token(APTokenTypes.WRITE, 0x2F77EA, + (0x5E + (ability_remap[world.copy_abilities["Sparky"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2F7811, + (0x5E + (ability_remap[world.copy_abilities["Sparky"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2F9BC4, + (0x5E + (ability_remap[world.copy_abilities["Blocky"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2F9BEB, + (0x5E + (ability_remap[world.copy_abilities["Blocky"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2FAC06, + (0x5E + (ability_remap[world.copy_abilities["Jumper Shoot"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2FAC2D, + (0x5E + (ability_remap[world.copy_abilities["Jumper Shoot"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2F9E7B, + (0x5E + (ability_remap[world.copy_abilities["Yuki"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2F9EA2, + (0x5E + (ability_remap[world.copy_abilities["Yuki"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2FA951, + (0x5E + (ability_remap[world.copy_abilities["Sir Kibble"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2FA978, + (0x5E + (ability_remap[world.copy_abilities["Sir Kibble"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2FA132, + (0x5E + (ability_remap[world.copy_abilities["Haboki"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2FA159, + (0x5E + (ability_remap[world.copy_abilities["Haboki"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2FA3E8, + (0x5E + (ability_remap[world.copy_abilities["Boboo"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2FA40F, + (0x5E + (ability_remap[world.copy_abilities["Boboo"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2F90E2, + (0x5E + (ability_remap[world.copy_abilities["Captain Stitch"]] << 1)).to_bytes(1, "little")) + patch.write_token(APTokenTypes.WRITE, 0x2F9109, + (0x5E + (ability_remap[world.copy_abilities["Captain Stitch"]] << 1)).to_bytes(1, "little")) + + if world.options.copy_ability_randomization == 2: + for enemy in enemy_remap: + # we just won't include it for minibosses + patch.write_token(APTokenTypes.WRITE, 0xB3E40 + (enemy_remap[enemy] << 1), + struct.pack("h", world.random.randint(-1, 2))) + + # write jumping goal + patch.write_token(APTokenTypes.WRITE, 0x94F8, struct.pack("H", world.options.jumping_target)) + patch.write_token(APTokenTypes.WRITE, 0x944E, struct.pack("H", world.options.jumping_target)) + + from Utils import __version__ + patch_name = bytearray( + f'KDL3{__version__.replace(".", "")[0:3]}_{world.player}_{world.multiworld.seed:11}\0', 'utf8')[:21] + patch_name.extend([0] * (21 - len(patch_name))) + patch.name = bytes(patch_name) + patch.write_token(APTokenTypes.WRITE, 0x3C000, patch.name) + patch.write_token(APTokenTypes.WRITE, 0x3C020, world.options.game_language.value.to_bytes(1, "little")) + + patch.write_token(APTokenTypes.COPY, 0x7FC0, (21, 0x3C000)) + patch.write_token(APTokenTypes.COPY, 0x7FD9, (1, 0x3C020)) + + # handle palette + if world.options.kirby_flavor_preset.value != 0: + for addr in kirby_target_palettes: + target = kirby_target_palettes[addr] + palette = get_kirby_palette(world) + if palette is not None: + patch.write_token(APTokenTypes.WRITE, addr, get_palette_bytes(palette, target[0], target[1], target[2])) + + if world.options.gooey_flavor_preset.value != 0: + for addr in gooey_target_palettes: + target = gooey_target_palettes[addr] + palette = get_gooey_palette(world) + if palette is not None: + patch.write_token(APTokenTypes.WRITE, addr, get_palette_bytes(palette, target[0], target[1], target[2])) + + patch.write_file("token_patch.bin", patch.get_token_binary()) + + +def get_base_rom_bytes() -> bytes: + rom_file: str = get_base_rom_path() + base_rom_bytes: Optional[bytes] = getattr(get_base_rom_bytes, "base_rom_bytes", None) + if not base_rom_bytes: + base_rom_bytes = bytes(Utils.read_snes_rom(open(rom_file, "rb"))) + + basemd5 = hashlib.md5() + basemd5.update(base_rom_bytes) + if basemd5.hexdigest() not in {KDL3UHASH, KDL3JHASH}: + raise Exception("Supplied Base Rom does not match known MD5 for US or JP release. " + "Get the correct game and version, then dump it") + get_base_rom_bytes.base_rom_bytes = base_rom_bytes + return base_rom_bytes + + +def get_base_rom_path(file_name: str = "") -> str: + options: settings.Settings = settings.get_settings() + if not file_name: + file_name = options["kdl3_options"]["rom_file"] + if not os.path.exists(file_name): + file_name = Utils.user_path(file_name) + return file_name diff --git a/worlds/kdl3/room.py b/worlds/kdl3/room.py new file mode 100644 index 000000000000..bcc1c7a709cb --- /dev/null +++ b/worlds/kdl3/room.py @@ -0,0 +1,133 @@ +import struct +from typing import Optional, Dict, TYPE_CHECKING, List, Union +from BaseClasses import Region, ItemClassification, MultiWorld +from worlds.Files import APTokenTypes +from .client_addrs import consumable_addrs, star_addrs + +if TYPE_CHECKING: + from .rom import KDL3ProcedurePatch + +animal_map = { + "Rick Spawn": 0, + "Kine Spawn": 1, + "Coo Spawn": 2, + "Nago Spawn": 3, + "ChuChu Spawn": 4, + "Pitch Spawn": 5 +} + + +class KDL3Room(Region): + pointer: int = 0 + level: int = 0 + stage: int = 0 + room: int = 0 + music: int = 0 + default_exits: List[Dict[str, Union[int, List[str]]]] + animal_pointers: List[int] + enemies: List[str] + entity_load: List[List[int]] + consumables: List[Dict[str, Union[int, str]]] + + def __init__(self, name: str, player: int, multiworld: MultiWorld, hint: Optional[str], level: int, + stage: int, room: int, pointer: int, music: int, + default_exits: List[Dict[str, List[str]]], + animal_pointers: List[int], enemies: List[str], + entity_load: List[List[int]], + consumables: List[Dict[str, Union[int, str]]], consumable_pointer: int) -> None: + super().__init__(name, player, multiworld, hint) + self.level = level + self.stage = stage + self.room = room + self.pointer = pointer + self.music = music + self.default_exits = default_exits + self.animal_pointers = animal_pointers + self.enemies = enemies + self.entity_load = entity_load + self.consumables = consumables + self.consumable_pointer = consumable_pointer + + def patch(self, patch: "KDL3ProcedurePatch", consumables: bool, local_items: bool) -> None: + patch.write_token(APTokenTypes.WRITE, self.pointer + 2, self.music.to_bytes(1, "little")) + animals = [x.item.name for x in self.locations if "Animal" in x.name and x.item] + if len(animals) > 0: + for current_animal, address in zip(animals, self.animal_pointers): + patch.write_token(APTokenTypes.WRITE, self.pointer + address + 7, + animal_map[current_animal].to_bytes(1, "little")) + if local_items: + for location in self.get_locations(): + if location.item is None or location.item.player != self.player: + continue + item = location.item.code + if item is None: + continue + item_idx = item & 0x00000F + location_idx = location.address & 0xFFFF + if location_idx & 0xF00 in (0x300, 0x400, 0x500, 0x600): + # consumable or star, need remapped + location_base = location_idx & 0xF00 + if location_base == 0x300: + # consumable + location_idx = consumable_addrs[location_idx & 0xFF] | 0x1000 + else: + # star + location_idx = star_addrs[location.address] | 0x2000 + if item & 0x000070 == 0: + patch.write_token(APTokenTypes.WRITE, 0x4B000 + location_idx, bytes([item_idx | 0x10])) + elif item & 0x000010 > 0: + patch.write_token(APTokenTypes.WRITE, 0x4B000 + location_idx, bytes([item_idx | 0x20])) + elif item & 0x000020 > 0: + patch.write_token(APTokenTypes.WRITE, 0x4B000 + location_idx, bytes([item_idx | 0x40])) + elif item & 0x000040 > 0: + patch.write_token(APTokenTypes.WRITE, 0x4B000 + location_idx, bytes([item_idx | 0x80])) + + if consumables: + load_len = len(self.entity_load) + for consumable in self.consumables: + location = next(x for x in self.locations if x.name == consumable["name"]) + assert location.item is not None + is_progression = location.item.classification & ItemClassification.progression + if load_len == 8: + # edge case, there is exactly 1 room with 8 entities and only 1 consumable among them + if not (any(x in self.entity_load for x in [[0, 22], [1, 22]]) + and any(x in self.entity_load for x in [[2, 22], [3, 22]])): + replacement_target = self.entity_load.index( + next(x for x in self.entity_load if x in [[0, 22], [1, 22], [2, 22], [3, 22]])) + if is_progression: + vtype = 0 + else: + vtype = 2 + patch.write_token(APTokenTypes.WRITE, self.pointer + 88 + (replacement_target * 2), + vtype.to_bytes(1, "little")) + self.entity_load[replacement_target] = [vtype, 22] + else: + if is_progression: + # we need to see if 1-ups are in our load list + if any(x not in self.entity_load for x in [[0, 22], [1, 22]]): + self.entity_load.append([0, 22]) + else: + if any(x not in self.entity_load for x in [[2, 22], [3, 22]]): + # edge case: if (1, 22) is in, we need to load (3, 22) instead + if [1, 22] in self.entity_load: + self.entity_load.append([3, 22]) + else: + self.entity_load.append([2, 22]) + if load_len < len(self.entity_load): + patch.write_token(APTokenTypes.WRITE, self.pointer + 88 + (load_len * 2), + bytes(self.entity_load[load_len])) + patch.write_token(APTokenTypes.WRITE, self.pointer + 104 + (load_len * 2), + bytes(struct.pack("H", self.consumable_pointer))) + if is_progression: + if [1, 22] in self.entity_load: + vtype = 1 + else: + vtype = 0 + else: + if [3, 22] in self.entity_load: + vtype = 3 + else: + vtype = 2 + assert isinstance(consumable["pointer"], int) + patch.write_token(APTokenTypes.WRITE, self.pointer + consumable["pointer"] + 7, + vtype.to_bytes(1, "little")) diff --git a/worlds/kdl3/Rules.py b/worlds/kdl3/rules.py similarity index 70% rename from worlds/kdl3/Rules.py rename to worlds/kdl3/rules.py index 6a85ef84f054..a08e99257e17 100644 --- a/worlds/kdl3/Rules.py +++ b/worlds/kdl3/rules.py @@ -1,7 +1,7 @@ from worlds.generic.Rules import set_rule, add_rule -from .Names import LocationName, EnemyAbilities -from .Locations import location_table -from .Options import GoalSpeed +from .names import location_name, enemy_abilities, animal_friend_spawns +from .locations import location_table +from .options import GoalSpeed import typing if typing.TYPE_CHECKING: @@ -10,9 +10,9 @@ def can_reach_boss(state: "CollectionState", player: int, level: int, open_world: int, - ow_boss_req: int, player_levels: typing.Dict[int, typing.Dict[int, int]]): + ow_boss_req: int, player_levels: typing.Dict[int, typing.List[int]]) -> bool: if open_world: - return state.has(f"{LocationName.level_names_inverse[level]} - Stage Completion", player, ow_boss_req) + return state.has(f"{location_name.level_names_inverse[level]} - Stage Completion", player, ow_boss_req) else: return state.can_reach(location_table[player_levels[level][5]], "Location", player) @@ -86,11 +86,11 @@ def can_reach_cutter(state: "CollectionState", player: int) -> bool: } -def can_assemble_rob(state: "CollectionState", player: int, copy_abilities: typing.Dict[str, str]): +def can_assemble_rob(state: "CollectionState", player: int, copy_abilities: typing.Dict[str, str]) -> bool: # check animal requirements if not (can_reach_coo(state, player) and can_reach_kine(state, player)): return False - for abilities, bukisets in EnemyAbilities.enemy_restrictive[1:5]: + for abilities, bukisets in enemy_abilities.enemy_restrictive[1:5]: iterator = iter(x for x in bukisets if copy_abilities[x] in abilities) target_bukiset = next(iterator, None) can_reach = False @@ -103,7 +103,7 @@ def can_assemble_rob(state: "CollectionState", player: int, copy_abilities: typi return can_reach_parasol(state, player) and can_reach_stone(state, player) -def can_fix_angel_wings(state: "CollectionState", player: int, copy_abilities: typing.Dict[str, str]): +def can_fix_angel_wings(state: "CollectionState", player: int, copy_abilities: typing.Dict[str, str]) -> bool: can_reach = True for enemy in {"Sparky", "Blocky", "Jumper Shoot", "Yuki", "Sir Kibble", "Haboki", "Boboo", "Captain Stitch"}: can_reach = can_reach & ability_map[copy_abilities[enemy]](state, player) @@ -112,114 +112,114 @@ def can_fix_angel_wings(state: "CollectionState", player: int, copy_abilities: t def set_rules(world: "KDL3World") -> None: # Level 1 - set_rule(world.multiworld.get_location(LocationName.grass_land_muchi, world.player), + set_rule(world.multiworld.get_location(location_name.grass_land_muchi, world.player), lambda state: can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.grass_land_chao, world.player), + set_rule(world.multiworld.get_location(location_name.grass_land_chao, world.player), lambda state: can_reach_stone(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.grass_land_mine, world.player), + set_rule(world.multiworld.get_location(location_name.grass_land_mine, world.player), lambda state: can_reach_kine(state, world.player)) # Level 2 - set_rule(world.multiworld.get_location(LocationName.ripple_field_5, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_5, world.player), lambda state: can_reach_kine(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_kamuribana, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_kamuribana, world.player), lambda state: can_reach_pitch(state, world.player) and can_reach_clean(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_bakasa, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_bakasa, world.player), lambda state: can_reach_kine(state, world.player) and can_reach_parasol(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_toad, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_toad, world.player), lambda state: can_reach_needle(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_mama_pitch, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_mama_pitch, world.player), lambda state: (can_reach_pitch(state, world.player) and can_reach_kine(state, world.player) and can_reach_burning(state, world.player) and can_reach_stone(state, world.player))) # Level 3 - set_rule(world.multiworld.get_location(LocationName.sand_canyon_5, world.player), + set_rule(world.multiworld.get_location(location_name.sand_canyon_5, world.player), lambda state: can_reach_cutter(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.sand_canyon_auntie, world.player), + set_rule(world.multiworld.get_location(location_name.sand_canyon_auntie, world.player), lambda state: can_reach_clean(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.sand_canyon_nyupun, world.player), + set_rule(world.multiworld.get_location(location_name.sand_canyon_nyupun, world.player), lambda state: can_reach_chuchu(state, world.player) and can_reach_cutter(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.sand_canyon_rob, world.player), + set_rule(world.multiworld.get_location(location_name.sand_canyon_rob, world.player), lambda state: can_assemble_rob(state, world.player, world.copy_abilities) ) # Level 4 - set_rule(world.multiworld.get_location(LocationName.cloudy_park_hibanamodoki, world.player), + set_rule(world.multiworld.get_location(location_name.cloudy_park_hibanamodoki, world.player), lambda state: can_reach_coo(state, world.player) and can_reach_clean(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.cloudy_park_piyokeko, world.player), + set_rule(world.multiworld.get_location(location_name.cloudy_park_piyokeko, world.player), lambda state: can_reach_needle(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.cloudy_park_mikarin, world.player), + set_rule(world.multiworld.get_location(location_name.cloudy_park_mikarin, world.player), lambda state: can_reach_coo(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.cloudy_park_pick, world.player), + set_rule(world.multiworld.get_location(location_name.cloudy_park_pick, world.player), lambda state: can_reach_rick(state, world.player)) # Level 5 - set_rule(world.multiworld.get_location(LocationName.iceberg_4, world.player), + set_rule(world.multiworld.get_location(location_name.iceberg_4, world.player), lambda state: can_reach_burning(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.iceberg_kogoesou, world.player), + set_rule(world.multiworld.get_location(location_name.iceberg_kogoesou, world.player), lambda state: can_reach_burning(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.iceberg_samus, world.player), + set_rule(world.multiworld.get_location(location_name.iceberg_samus, world.player), lambda state: can_reach_ice(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.iceberg_name, world.player), + set_rule(world.multiworld.get_location(location_name.iceberg_name, world.player), lambda state: (can_reach_coo(state, world.player) and can_reach_burning(state, world.player) and can_reach_chuchu(state, world.player))) # ChuChu is guaranteed here, but we use this for consistency - set_rule(world.multiworld.get_location(LocationName.iceberg_shiro, world.player), + set_rule(world.multiworld.get_location(location_name.iceberg_shiro, world.player), lambda state: can_reach_nago(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.iceberg_angel, world.player), + set_rule(world.multiworld.get_location(location_name.iceberg_angel, world.player), lambda state: can_fix_angel_wings(state, world.player, world.copy_abilities)) # Consumables if world.options.consumables: - set_rule(world.multiworld.get_location(LocationName.grass_land_1_u1, world.player), + set_rule(world.multiworld.get_location(location_name.grass_land_1_u1, world.player), lambda state: can_reach_parasol(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.grass_land_1_m1, world.player), + set_rule(world.multiworld.get_location(location_name.grass_land_1_m1, world.player), lambda state: can_reach_spark(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.grass_land_2_u1, world.player), + set_rule(world.multiworld.get_location(location_name.grass_land_2_u1, world.player), lambda state: can_reach_needle(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_2_u1, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_2_u1, world.player), lambda state: can_reach_kine(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_2_m1, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_2_m1, world.player), lambda state: can_reach_kine(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_3_u1, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_3_u1, world.player), lambda state: can_reach_cutter(state, world.player) or can_reach_spark(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_4_u1, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_4_u1, world.player), lambda state: can_reach_stone(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_4_m2, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_4_m2, world.player), lambda state: can_reach_stone(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_5_m1, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_5_m1, world.player), lambda state: can_reach_kine(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.ripple_field_5_u1, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_5_u1, world.player), lambda state: (can_reach_kine(state, world.player) and can_reach_burning(state, world.player) and can_reach_stone(state, world.player))) - set_rule(world.multiworld.get_location(LocationName.ripple_field_5_m2, world.player), + set_rule(world.multiworld.get_location(location_name.ripple_field_5_m2, world.player), lambda state: (can_reach_kine(state, world.player) and can_reach_burning(state, world.player) and can_reach_stone(state, world.player))) - set_rule(world.multiworld.get_location(LocationName.sand_canyon_4_u1, world.player), + set_rule(world.multiworld.get_location(location_name.sand_canyon_4_u1, world.player), lambda state: can_reach_clean(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.sand_canyon_4_m2, world.player), + set_rule(world.multiworld.get_location(location_name.sand_canyon_4_m2, world.player), lambda state: can_reach_needle(state, world.player)) - set_rule(world.multiworld.get_location(LocationName.sand_canyon_5_u2, world.player), + set_rule(world.multiworld.get_location(location_name.sand_canyon_5_u2, world.player), lambda state: can_reach_ice(state, world.player) and (can_reach_rick(state, world.player) or can_reach_coo(state, world.player) or can_reach_chuchu(state, world.player) or can_reach_pitch(state, world.player) or can_reach_nago(state, world.player))) - set_rule(world.multiworld.get_location(LocationName.sand_canyon_5_u3, world.player), + set_rule(world.multiworld.get_location(location_name.sand_canyon_5_u3, world.player), lambda state: can_reach_ice(state, world.player) and (can_reach_rick(state, world.player) or can_reach_coo(state, world.player) or can_reach_chuchu(state, world.player) or can_reach_pitch(state, world.player) or can_reach_nago(state, world.player))) - set_rule(world.multiworld.get_location(LocationName.sand_canyon_5_u4, world.player), + set_rule(world.multiworld.get_location(location_name.sand_canyon_5_u4, world.player), lambda state: can_reach_ice(state, world.player) and (can_reach_rick(state, world.player) or can_reach_coo(state, world.player) or can_reach_chuchu(state, world.player) or can_reach_pitch(state, world.player) or can_reach_nago(state, world.player))) - set_rule(world.multiworld.get_location(LocationName.cloudy_park_6_u1, world.player), + set_rule(world.multiworld.get_location(location_name.cloudy_park_6_u1, world.player), lambda state: can_reach_cutter(state, world.player)) if world.options.starsanity: @@ -274,50 +274,57 @@ def set_rules(world: "KDL3World") -> None: # copy ability access edge cases # Kirby cannot eat enemies fully submerged in water. Vast majority of cases, the enemy can be brought to the surface # and eaten by inhaling while falling on top of them - set_rule(world.multiworld.get_location(EnemyAbilities.Ripple_Field_2_E3, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Ripple_Field_2_E3, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Ripple_Field_3_E6, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Ripple_Field_3_E6, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) # Ripple Field 4 E5, E7, and E8 are doable, but too strict to leave in logic - set_rule(world.multiworld.get_location(EnemyAbilities.Ripple_Field_4_E5, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Ripple_Field_4_E5, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Ripple_Field_4_E7, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Ripple_Field_4_E7, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Ripple_Field_4_E8, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Ripple_Field_4_E8, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Ripple_Field_5_E1, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Ripple_Field_5_E1, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Ripple_Field_5_E2, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Ripple_Field_5_E2, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Ripple_Field_5_E3, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Ripple_Field_5_E3, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Ripple_Field_5_E4, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Ripple_Field_5_E4, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Sand_Canyon_4_E7, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Sand_Canyon_4_E7, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Sand_Canyon_4_E8, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Sand_Canyon_4_E8, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Sand_Canyon_4_E9, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Sand_Canyon_4_E9, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) - set_rule(world.multiworld.get_location(EnemyAbilities.Sand_Canyon_4_E10, world.player), + set_rule(world.multiworld.get_location(enemy_abilities.Sand_Canyon_4_E10, world.player), lambda state: can_reach_kine(state, world.player) or can_reach_chuchu(state, world.player)) + # animal friend rules + set_rule(world.multiworld.get_location(animal_friend_spawns.iceberg_4_a2, world.player), + lambda state: can_reach_coo(state, world.player) and can_reach_burning(state, world.player)) + set_rule(world.multiworld.get_location(animal_friend_spawns.iceberg_4_a3, world.player), + lambda state: can_reach_chuchu(state, world.player) and can_reach_coo(state, world.player) + and can_reach_burning(state, world.player)) + for boss_flag, purification, i in zip(["Level 1 Boss - Purified", "Level 2 Boss - Purified", "Level 3 Boss - Purified", "Level 4 Boss - Purified", "Level 5 Boss - Purified"], - [LocationName.grass_land_whispy, LocationName.ripple_field_acro, - LocationName.sand_canyon_poncon, LocationName.cloudy_park_ado, - LocationName.iceberg_dedede], + [location_name.grass_land_whispy, location_name.ripple_field_acro, + location_name.sand_canyon_poncon, location_name.cloudy_park_ado, + location_name.iceberg_dedede], range(1, 6)): set_rule(world.multiworld.get_location(boss_flag, world.player), - lambda state, i=i: (state.has("Heart Star", world.player, world.boss_requirements[i - 1]) - and can_reach_boss(state, world.player, i, + lambda state, x=i: (state.has("Heart Star", world.player, world.boss_requirements[x - 1]) + and can_reach_boss(state, world.player, x, world.options.open_world.value, world.options.ow_boss_requirement.value, world.player_levels))) set_rule(world.multiworld.get_location(purification, world.player), - lambda state, i=i: (state.has("Heart Star", world.player, world.boss_requirements[i - 1]) - and can_reach_boss(state, world.player, i, + lambda state, x=i: (state.has("Heart Star", world.player, world.boss_requirements[x - 1]) + and can_reach_boss(state, world.player, x, world.options.open_world.value, world.options.ow_boss_requirement.value, world.player_levels))) @@ -327,12 +334,12 @@ def set_rules(world: "KDL3World") -> None: for level in range(2, 6): set_rule(world.multiworld.get_entrance(f"To Level {level}", world.player), - lambda state, i=level: state.has(f"Level {i - 1} Boss Defeated", world.player)) + lambda state, x=level: state.has(f"Level {x - 1} Boss Defeated", world.player)) if world.options.strict_bosses: for level in range(2, 6): add_rule(world.multiworld.get_entrance(f"To Level {level}", world.player), - lambda state, i=level: state.has(f"Level {i - 1} Boss Purified", world.player)) + lambda state, x=level: state.has(f"Level {x - 1} Boss Purified", world.player)) if world.options.goal_speed == GoalSpeed.option_normal: add_rule(world.multiworld.get_entrance("To Level 6", world.player), diff --git a/worlds/kdl3/data/APPauseIcons.dat b/worlds/kdl3/src/APPauseIcons.dat similarity index 100% rename from worlds/kdl3/data/APPauseIcons.dat rename to worlds/kdl3/src/APPauseIcons.dat diff --git a/worlds/kdl3/src/kdl3_basepatch.asm b/worlds/kdl3/src/kdl3_basepatch.asm index e419d0632f0e..95c85f032c55 100644 --- a/worlds/kdl3/src/kdl3_basepatch.asm +++ b/worlds/kdl3/src/kdl3_basepatch.asm @@ -58,6 +58,10 @@ org $01AFC8 org $01B013 SEC ; Remove Dedede Bad Ending +org $01B050 + JSL HookBossPurify + NOP + org $02B7B0 ; Zero unlock LDA $80A0 CMP #$0001 @@ -160,7 +164,6 @@ CopyAbilityAnimalOverride: STA $39DF, X RTL -org $079A00 HeartStarCheck: TXA CMP #$0000 ; is this level 1 @@ -201,7 +204,6 @@ HeartStarCheck: SEC RTL -org $079A80 OpenWorldUnlock: PHX LDX $900E ; Are we on open world? @@ -224,7 +226,6 @@ OpenWorldUnlock: PLX RTL -org $079B00 MainLoopHook: STA $D4 INC $3524 @@ -239,16 +240,18 @@ MainLoopHook: BEQ .Return ; return if we are LDA $5541 ; gooey status BPL .Slowness ; gooey is already spawned + LDA $39D1 ; is kirby alive? + BEQ .Slowness ; branch if he isn't + ; maybe BMI here too? LDA $8080 CMP #$0000 ; did we get a gooey trap BEQ .Slowness ; branch if we did not JSL GooeySpawn - STZ $8080 + DEC $8080 .Slowness: LDA $8082 ; slowness BEQ .Eject ; are we under the effects of a slowness trap - DEC - STA $8082 ; dec by 1 each frame + DEC $8082 ; dec by 1 each frame .Eject: PHX PHY @@ -258,14 +261,13 @@ MainLoopHook: BEQ .PullVars ; branch if we haven't received eject LDA #$2000 ; select button press STA $60C1 ; write to controller mirror - STZ $8084 + DEC $8084 .PullVars: PLY PLX .Return: RTL -org $079B80 HeartStarGraphicFix: LDA #$0000 PHX @@ -288,7 +290,7 @@ HeartStarGraphicFix: ASL TAX LDA $07D080, X ; table of original stage number - CMP #$0003 ; is the current stage a minigame stage? + CMP #$0002 ; is the current stage a minigame stage? BEQ .ReturnTrue ; branch if so CLC BRA .Return @@ -299,7 +301,6 @@ HeartStarGraphicFix: PLX RTL -org $079BF0 ParseItemQueue: ; Local item queue parsing NOP @@ -336,8 +337,6 @@ ParseItemQueue: AND #$000F ASL TAY - LDA $8080,Y - BNE .LoopCheck JSL .ApplyNegative RTL .ApplyAbility: @@ -418,35 +417,73 @@ ParseItemQueue: CPY #$0005 BCS .PlayNone LDA $8080,Y - BNE .Return + CPY #$0002 + BNE .Increment + CLC LDA #$0384 + ADC $8080, Y + BVC .PlayNegative + LDA #$FFFF + .PlayNegative: STA $8080,Y LDA #$00A7 BRA .PlaySFXLong + .Increment: + INC + STA $8080, Y + BRA .PlayNegative .PlayNone: LDA #$0000 BRA .PlaySFXLong -org $079D00 AnimalFriendSpawn: PHA CPX #$0002 ; is this an animal friend? BNE .Return XBA PHA + PHX + PHA + LDX #$0000 + .CheckSpawned: + LDA $05CA, X + BNE .Continue + LDA #$0002 + CMP $074A, X + BNE .ContinueCheck + PLA + PHA + XBA + CMP $07CA, X + BEQ .AlreadySpawned + .ContinueCheck: + INX + INX + BRA .CheckSpawned + .Continue: + PLA + PLX ASL TAY PLA INC CMP $8000, Y ; do we have this animal friend BEQ .Return ; we have this animal friend + .False: INX .Return: PLY LDA #$9999 RTL + .AlreadySpawned: + PLA + PLX + ASL + TAY + PLA + BRA .False + -org $079E00 WriteBWRAM: LDY #$6001 ;starting addr LDA #$1FFE ;bytes to write @@ -479,7 +516,6 @@ WriteBWRAM: .Return: RTL -org $079E80 ConsumableSet: PHA PHX @@ -507,7 +543,6 @@ ConsumableSet: ASL TAX LDA $07D020, X ; current stage - DEC ASL #6 TAX PLA @@ -519,8 +554,16 @@ ConsumableSet: BRA .LoopHead ; return to loop head .ApplyCheck: LDA $A000, X ; consumables index + PHA ORA #$0001 STA $A000, X + PLA + AND #$00FF + BNE .Return + TXA + ORA #$1000 + JSL ApplyLocalCheck + .Return: PLY PLX PLA @@ -528,7 +571,6 @@ ConsumableSet: AND #$00FF RTL -org $079F00 NormalGoalSet: PHX LDA $07D012 @@ -549,7 +591,6 @@ NormalGoalSet: STA $5AC1 ; cutscene RTL -org $079F80 FinalIcebergFix: PHX PHY @@ -572,7 +613,7 @@ FinalIcebergFix: ASL TAX LDA $07D020, X - CMP #$001E + CMP #$001D BEQ .ReturnTrue CLC BRA .Return @@ -583,7 +624,6 @@ FinalIcebergFix: PLX RTL -org $07A000 StrictBosses: PHX LDA $901E ; Do we have strict bosses enabled? @@ -610,7 +650,6 @@ StrictBosses: LDA $53CD RTL -org $07A030 NintenHalken: LDX #$0005 .Halken: @@ -628,7 +667,6 @@ NintenHalken: LDA #$0001 RTL -org $07A080 StageCompleteSet: PHX LDA $5AC1 ; completed stage cutscene @@ -656,9 +694,17 @@ StageCompleteSet: ASL TAX LDA $9020, X ; load the stage we completed - DEC ASL TAX + PHX + LDA $8200, X + AND #$00FF + BNE .ApplyClear + TXA + LSR + JSL ApplyLocalCheck + .ApplyClear: + PLX LDA #$0001 ORA $8200, X STA $8200, X @@ -668,7 +714,6 @@ StageCompleteSet: CMP $53CB RTL -org $07A100 OpenWorldBossUnlock: PHX PHY @@ -699,7 +744,6 @@ OpenWorldBossUnlock: .LoopStage: PLX LDY $9020, X ; get stage id - DEY INX INX PHA @@ -732,7 +776,6 @@ OpenWorldBossUnlock: PLX RTL -org $07A180 GooeySpawn: PHY PHX @@ -768,7 +811,6 @@ GooeySpawn: PLY RTL -org $07A200 SpeedTrap: PHX LDX $8082 ; do we have slowness @@ -780,7 +822,6 @@ SpeedTrap: EOR #$FFFF RTL -org $07A280 HeartStarVisual: CPX #$0000 BEQ .SkipInx @@ -844,7 +885,6 @@ HeartStarVisual: .Return: RTL -org $07A300 LoadFont: JSL $00D29F ; play sfx PHX @@ -915,7 +955,6 @@ LoadFont: PLX RTL -org $07A380 HeartStarVisual2: LDA #$2C80 STA $0000, Y @@ -1029,14 +1068,12 @@ HeartStarVisual2: STA $0000, Y RTL -org $07A480 HeartStarSelectFix: PHX TXA ASL TAX LDA $9020, X - DEC TAX .LoopHead: CMP #$0006 @@ -1051,15 +1088,31 @@ HeartStarSelectFix: AND #$00FF RTL -org $07A500 HeartStarCutsceneFix: TAX LDA $53D3 DEC STA $5AC3 + LDA $53A7, X + AND #$00FF + BNE .Return + PHX + TXA + .Loop: + CMP #$0007 + BCC .Continue + SEC + SBC #$0007 + DEX + BRA .Loop + .Continue: + TXA + ORA #$0100 + JSL ApplyLocalCheck + PLX + .Return RTL -org $07A510 GiftGiving: CMP #$0008 .This: @@ -1075,7 +1128,6 @@ GiftGiving: PLX JML $CABC18 -org $07A550 PauseMenu: JSL $00D29F PHX @@ -1136,7 +1188,6 @@ PauseMenu: PLX RTL -org $07A600 StarsSet: PHA PHX @@ -1166,7 +1217,6 @@ StarsSet: ASL TAX LDA $07D020, X - DEC ASL ASL ASL @@ -1183,8 +1233,15 @@ StarsSet: BRA .2LoopHead .2LoopEnd: LDA $B000, X + PHA ORA #$0001 STA $B000, X + PLA + AND #$00FF + BNE .Return + TXA + ORA #$2000 + JSL ApplyLocalCheck .Return: PLY PLX @@ -1199,6 +1256,48 @@ StarsSet: STA $39D7 BRA .Return +ApplyLocalCheck: +; args: A-address of check following $08B000 + TAX + LDA $09B000, X + AND #$00FF + TAY + LDX #$0000 + .Loop: + LDA $C000, X + BEQ .Apply + INX + INX + CPX #$0010 + BCC .Loop + BRA .Return ; this is dangerous, could lose a check here + .Apply: + TYA + STA $C000, X + .Return: + RTL + +HookBossPurify: + ORA $B0 + STA $53D5 + LDA $B0 + LDX #$0000 + LSR + .Loop: + BIT #$0001 + BNE .Apply + LSR + LSR + INX + CPX #$0005 + BCS .Return + BRA .Loop + .Apply: + TXA + ORA #$0200 + JSL ApplyLocalCheck + .Return: + RTL org $07C000 db "KDL3_BASEPATCH_ARCHI" @@ -1234,4 +1333,7 @@ org $07E040 db $3A, $01 db $3B, $05 db $3C, $05 - db $3D, $05 \ No newline at end of file + db $3D, $05 + +org $07F000 +incbin "APPauseIcons.dat" \ No newline at end of file diff --git a/worlds/kdl3/test/__init__.py b/worlds/kdl3/test/__init__.py index 4d3f4d70faae..92f1d7261f1f 100644 --- a/worlds/kdl3/test/__init__.py +++ b/worlds/kdl3/test/__init__.py @@ -6,6 +6,8 @@ from test.general import gen_steps from worlds import AutoWorld from worlds.AutoWorld import call_all +# mypy: ignore-errors +# This is a copy of core code, and I'm not smart enough to solve the errors in here class KDL3TestBase(WorldTestBase): diff --git a/worlds/kdl3/test/test_goal.py b/worlds/kdl3/test/test_goal.py index ce53642a9716..2c6ae614d4aa 100644 --- a/worlds/kdl3/test/test_goal.py +++ b/worlds/kdl3/test/test_goal.py @@ -5,12 +5,12 @@ class TestFastGoal(KDL3TestBase): options = { "open_world": False, "goal_speed": "fast", - "total_heart_stars": 30, + "max_heart_stars": 30, "heart_stars_required": 50, "filler_percentage": 0, } - def test_goal(self): + def test_goal(self) -> None: self.assertBeatable(False) heart_stars = self.get_items_by_name("Heart Star") self.collect(heart_stars[0:14]) @@ -30,12 +30,12 @@ class TestNormalGoal(KDL3TestBase): options = { "open_world": False, "goal_speed": "normal", - "total_heart_stars": 30, + "max_heart_stars": 30, "heart_stars_required": 50, "filler_percentage": 0, } - def test_goal(self): + def test_goal(self) -> None: self.assertBeatable(False) heart_stars = self.get_items_by_name("Heart Star") self.collect(heart_stars[0:14]) @@ -51,14 +51,14 @@ def test_goal(self): self.assertEqual(self.count("Heart Star"), 30, str(self.multiworld.seed)) self.assertBeatable(True) - def test_kine(self): + def test_kine(self) -> None: self.collect_by_name(["Cutter", "Burning", "Heart Star"]) self.assertBeatable(False) - def test_cutter(self): + def test_cutter(self) -> None: self.collect_by_name(["Kine", "Burning", "Heart Star"]) self.assertBeatable(False) - def test_burning(self): + def test_burning(self) -> None: self.collect_by_name(["Cutter", "Kine", "Heart Star"]) self.assertBeatable(False) diff --git a/worlds/kdl3/test/test_locations.py b/worlds/kdl3/test/test_locations.py index bde9abc409ac..024f1b11a591 100644 --- a/worlds/kdl3/test/test_locations.py +++ b/worlds/kdl3/test/test_locations.py @@ -1,6 +1,6 @@ from . import KDL3TestBase +from ..names import location_name from Options import PlandoConnection -from ..Names import LocationName import typing @@ -12,31 +12,31 @@ class TestLocations(KDL3TestBase): # these ensure we can always reach all stages physically } - def test_simple_heart_stars(self): - self.run_location_test(LocationName.grass_land_muchi, ["ChuChu"]) - self.run_location_test(LocationName.grass_land_chao, ["Stone"]) - self.run_location_test(LocationName.grass_land_mine, ["Kine"]) - self.run_location_test(LocationName.ripple_field_kamuribana, ["Pitch", "Clean"]) - self.run_location_test(LocationName.ripple_field_bakasa, ["Kine", "Parasol"]) - self.run_location_test(LocationName.ripple_field_toad, ["Needle"]) - self.run_location_test(LocationName.ripple_field_mama_pitch, ["Pitch", "Kine", "Burning", "Stone"]) - self.run_location_test(LocationName.sand_canyon_auntie, ["Clean"]) - self.run_location_test(LocationName.sand_canyon_nyupun, ["ChuChu", "Cutter"]) - self.run_location_test(LocationName.sand_canyon_rob, ["Stone", "Kine", "Coo", "Parasol", "Spark", "Ice"]) - self.run_location_test(LocationName.sand_canyon_rob, ["Stone", "Kine", "Coo", "Parasol", "Clean", "Ice"]), - self.run_location_test(LocationName.sand_canyon_rob, ["Stone", "Kine", "Coo", "Parasol", "Spark", "Needle"]), - self.run_location_test(LocationName.sand_canyon_rob, ["Stone", "Kine", "Coo", "Parasol", "Clean", "Needle"]), - self.run_location_test(LocationName.cloudy_park_hibanamodoki, ["Coo", "Clean"]) - self.run_location_test(LocationName.cloudy_park_piyokeko, ["Needle"]) - self.run_location_test(LocationName.cloudy_park_mikarin, ["Coo"]) - self.run_location_test(LocationName.cloudy_park_pick, ["Rick"]) - self.run_location_test(LocationName.iceberg_kogoesou, ["Burning"]) - self.run_location_test(LocationName.iceberg_samus, ["Ice"]) - self.run_location_test(LocationName.iceberg_name, ["Burning", "Coo", "ChuChu"]) - self.run_location_test(LocationName.iceberg_angel, ["Cutter", "Burning", "Spark", "Parasol", "Needle", "Clean", + def test_simple_heart_stars(self) -> None: + self.run_location_test(location_name.grass_land_muchi, ["ChuChu"]) + self.run_location_test(location_name.grass_land_chao, ["Stone"]) + self.run_location_test(location_name.grass_land_mine, ["Kine"]) + self.run_location_test(location_name.ripple_field_kamuribana, ["Pitch", "Clean"]) + self.run_location_test(location_name.ripple_field_bakasa, ["Kine", "Parasol"]) + self.run_location_test(location_name.ripple_field_toad, ["Needle"]) + self.run_location_test(location_name.ripple_field_mama_pitch, ["Pitch", "Kine", "Burning", "Stone"]) + self.run_location_test(location_name.sand_canyon_auntie, ["Clean"]) + self.run_location_test(location_name.sand_canyon_nyupun, ["ChuChu", "Cutter"]) + self.run_location_test(location_name.sand_canyon_rob, ["Stone", "Kine", "Coo", "Parasol", "Spark", "Ice"]) + self.run_location_test(location_name.sand_canyon_rob, ["Stone", "Kine", "Coo", "Parasol", "Clean", "Ice"]) + self.run_location_test(location_name.sand_canyon_rob, ["Stone", "Kine", "Coo", "Parasol", "Spark", "Needle"]) + self.run_location_test(location_name.sand_canyon_rob, ["Stone", "Kine", "Coo", "Parasol", "Clean", "Needle"]) + self.run_location_test(location_name.cloudy_park_hibanamodoki, ["Coo", "Clean"]) + self.run_location_test(location_name.cloudy_park_piyokeko, ["Needle"]) + self.run_location_test(location_name.cloudy_park_mikarin, ["Coo"]) + self.run_location_test(location_name.cloudy_park_pick, ["Rick"]) + self.run_location_test(location_name.iceberg_kogoesou, ["Burning"]) + self.run_location_test(location_name.iceberg_samus, ["Ice"]) + self.run_location_test(location_name.iceberg_name, ["Burning", "Coo", "ChuChu"]) + self.run_location_test(location_name.iceberg_angel, ["Cutter", "Burning", "Spark", "Parasol", "Needle", "Clean", "Stone", "Ice"]) - def run_location_test(self, location: str, itempool: typing.List[str]): + def run_location_test(self, location: str, itempool: typing.List[str]) -> None: items = itempool.copy() while len(itempool) > 0: self.assertFalse(self.can_reach_location(location), str(self.multiworld.seed)) @@ -57,7 +57,7 @@ class TestShiro(KDL3TestBase): "plando_options": "connections" } - def test_shiro(self): + def test_shiro(self) -> None: self.assertFalse(self.can_reach_location("Iceberg 5 - Shiro"), str(self.multiworld.seed)) self.collect_by_name("Nago") self.assertFalse(self.can_reach_location("Iceberg 5 - Shiro"), str(self.multiworld.seed)) diff --git a/worlds/kdl3/test/test_shuffles.py b/worlds/kdl3/test/test_shuffles.py index d676b641b056..3ba376d068e6 100644 --- a/worlds/kdl3/test/test_shuffles.py +++ b/worlds/kdl3/test/test_shuffles.py @@ -1,47 +1,61 @@ -from typing import List, Tuple +from typing import List, Tuple, Optional from . import KDL3TestBase -from ..Room import KDL3Room +from ..room import KDL3Room +from ..names import animal_friend_spawns class TestCopyAbilityShuffle(KDL3TestBase): options = { "open_world": False, "goal_speed": "normal", - "total_heart_stars": 30, + "max_heart_stars": 30, "heart_stars_required": 50, "filler_percentage": 0, "copy_ability_randomization": "enabled", } - def test_goal(self): - self.assertBeatable(False) - heart_stars = self.get_items_by_name("Heart Star") - self.collect(heart_stars[0:14]) - self.assertEqual(self.count("Heart Star"), 14, str(self.multiworld.seed)) - self.assertBeatable(False) - self.collect(heart_stars[14:15]) - self.assertEqual(self.count("Heart Star"), 15, str(self.multiworld.seed)) - self.assertBeatable(False) - self.collect_by_name(["Burning", "Cutter", "Kine"]) - self.assertBeatable(True) - self.remove([self.get_item_by_name("Love-Love Rod")]) - self.collect(heart_stars) - self.assertEqual(self.count("Heart Star"), 30, str(self.multiworld.seed)) - self.assertBeatable(True) - - def test_kine(self): - self.collect_by_name(["Cutter", "Burning", "Heart Star"]) - self.assertBeatable(False) - - def test_cutter(self): - self.collect_by_name(["Kine", "Burning", "Heart Star"]) - self.assertBeatable(False) - - def test_burning(self): - self.collect_by_name(["Cutter", "Kine", "Heart Star"]) - self.assertBeatable(False) - - def test_cutter_and_burning_reachable(self): + def test_goal(self) -> None: + try: + self.assertBeatable(False) + heart_stars = self.get_items_by_name("Heart Star") + self.collect(heart_stars[0:14]) + self.assertEqual(self.count("Heart Star"), 14, str(self.multiworld.seed)) + self.assertBeatable(False) + self.collect(heart_stars[14:15]) + self.assertEqual(self.count("Heart Star"), 15, str(self.multiworld.seed)) + self.assertBeatable(False) + self.collect_by_name(["Burning", "Cutter", "Kine"]) + self.assertBeatable(True) + self.remove([self.get_item_by_name("Love-Love Rod")]) + self.collect(heart_stars) + self.assertEqual(self.count("Heart Star"), 30, str(self.multiworld.seed)) + self.assertBeatable(True) + except AssertionError as ex: + # if assert beatable fails, this will catch and print the seed + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_kine(self) -> None: + try: + self.collect_by_name(["Cutter", "Burning", "Heart Star"]) + self.assertBeatable(False) + except AssertionError as ex: + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_cutter(self) -> None: + try: + self.collect_by_name(["Kine", "Burning", "Heart Star"]) + self.assertBeatable(False) + except AssertionError as ex: + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_burning(self) -> None: + try: + self.collect_by_name(["Cutter", "Kine", "Heart Star"]) + self.assertBeatable(False) + except AssertionError as ex: + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_cutter_and_burning_reachable(self) -> None: rooms = self.multiworld.worlds[1].rooms copy_abilities = self.multiworld.worlds[1].copy_abilities sand_canyon_5 = self.multiworld.get_region("Sand Canyon 5 - 9", 1) @@ -63,7 +77,7 @@ def test_cutter_and_burning_reachable(self): else: self.fail("Could not reach Burning Ability before Iceberg 4!") - def test_valid_abilities_for_ROB(self): + def test_valid_abilities_for_ROB(self) -> None: # there exists a subset of 4-7 abilities that will allow us access to ROB heart star on default settings self.collect_by_name(["Heart Star", "Kine", "Coo"]) # we will guaranteed need Coo, Kine, and Heart Stars to reach # first we need to identify our bukiset requirements @@ -74,13 +88,13 @@ def test_valid_abilities_for_ROB(self): ({"Stone Ability", "Burning Ability"}, {'Bukiset (Stone)', 'Bukiset (Burning)'}), ] copy_abilities = self.multiworld.worlds[1].copy_abilities - required_abilities: List[Tuple[str]] = [] + required_abilities: List[List[str]] = [] for abilities, bukisets in groups: potential_abilities: List[str] = list() for bukiset in bukisets: if copy_abilities[bukiset] in abilities: potential_abilities.append(copy_abilities[bukiset]) - required_abilities.append(tuple(potential_abilities)) + required_abilities.append(potential_abilities) collected_abilities = list() for group in required_abilities: self.assertFalse(len(group) == 0, str(self.multiworld.seed)) @@ -103,91 +117,147 @@ class TestAnimalShuffle(KDL3TestBase): options = { "open_world": False, "goal_speed": "normal", - "total_heart_stars": 30, + "max_heart_stars": 30, "heart_stars_required": 50, "filler_percentage": 0, "animal_randomization": "full", } - def test_goal(self): - self.assertBeatable(False) - heart_stars = self.get_items_by_name("Heart Star") - self.collect(heart_stars[0:14]) - self.assertEqual(self.count("Heart Star"), 14, str(self.multiworld.seed)) - self.assertBeatable(False) - self.collect(heart_stars[14:15]) - self.assertEqual(self.count("Heart Star"), 15, str(self.multiworld.seed)) - self.assertBeatable(False) - self.collect_by_name(["Burning", "Cutter", "Kine"]) - self.assertBeatable(True) - self.remove([self.get_item_by_name("Love-Love Rod")]) - self.collect(heart_stars) - self.assertEqual(self.count("Heart Star"), 30, str(self.multiworld.seed)) - self.assertBeatable(True) - - def test_kine(self): - self.collect_by_name(["Cutter", "Burning", "Heart Star"]) - self.assertBeatable(False) - - def test_cutter(self): - self.collect_by_name(["Kine", "Burning", "Heart Star"]) - self.assertBeatable(False) - - def test_burning(self): - self.collect_by_name(["Cutter", "Kine", "Heart Star"]) - self.assertBeatable(False) - - def test_locked_animals(self): - self.assertTrue(self.multiworld.get_location("Ripple Field 5 - Animal 2", 1).item.name == "Pitch Spawn") - self.assertTrue(self.multiworld.get_location("Iceberg 4 - Animal 1", 1).item.name == "ChuChu Spawn") - self.assertTrue(self.multiworld.get_location("Sand Canyon 6 - Animal 1", 1).item.name in {"Kine Spawn", "Coo Spawn"}) + def test_goal(self) -> None: + try: + self.assertBeatable(False) + heart_stars = self.get_items_by_name("Heart Star") + self.collect(heart_stars[0:14]) + self.assertEqual(self.count("Heart Star"), 14, str(self.multiworld.seed)) + self.assertBeatable(False) + self.collect(heart_stars[14:15]) + self.assertEqual(self.count("Heart Star"), 15, str(self.multiworld.seed)) + self.assertBeatable(False) + self.collect_by_name(["Burning", "Cutter", "Kine"]) + self.assertBeatable(True) + self.remove([self.get_item_by_name("Love-Love Rod")]) + self.collect(heart_stars) + self.assertEqual(self.count("Heart Star"), 30, str(self.multiworld.seed)) + self.assertBeatable(True) + except AssertionError as ex: + # if assert beatable fails, this will catch and print the seed + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_kine(self) -> None: + try: + self.collect_by_name(["Cutter", "Burning", "Heart Star"]) + self.assertBeatable(False) + except AssertionError as ex: + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_cutter(self) -> None: + try: + self.collect_by_name(["Kine", "Burning", "Heart Star"]) + self.assertBeatable(False) + except AssertionError as ex: + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_burning(self) -> None: + try: + self.collect_by_name(["Cutter", "Kine", "Heart Star"]) + self.assertBeatable(False) + except AssertionError as ex: + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_locked_animals(self) -> None: + ripple_field_5 = self.multiworld.get_location("Ripple Field 5 - Animal 2", 1) + self.assertTrue(ripple_field_5.item is not None and ripple_field_5.item.name == "Pitch Spawn", + f"Multiworld did not place Pitch, Seed: {self.multiworld.seed}") + iceberg_4 = self.multiworld.get_location("Iceberg 4 - Animal 1", 1) + self.assertTrue(iceberg_4.item is not None and iceberg_4.item.name == "ChuChu Spawn", + f"Multiworld did not place ChuChu, Seed: {self.multiworld.seed}") + sand_canyon_6 = self.multiworld.get_location("Sand Canyon 6 - Animal 1", 1) + self.assertTrue(sand_canyon_6.item is not None and sand_canyon_6.item.name in + {"Kine Spawn", "Coo Spawn"}, f"Multiworld did not place Coo/Kine, Seed: {self.multiworld.seed}") + + def test_problematic(self) -> None: + for spawns in animal_friend_spawns.problematic_sets: + placed = [self.multiworld.get_location(spawn, 1).item for spawn in spawns] + placed_names = set([item.name for item in placed]) + self.assertEqual(len(placed), len(placed_names), + f"Duplicate animal placed in problematic locations:" + f" {[spawn.location for spawn in placed]}, " + f"Seed: {self.multiworld.seed}") class TestAllShuffle(KDL3TestBase): options = { "open_world": False, "goal_speed": "normal", - "total_heart_stars": 30, + "max_heart_stars": 30, "heart_stars_required": 50, "filler_percentage": 0, "animal_randomization": "full", "copy_ability_randomization": "enabled", } - def test_goal(self): - self.assertBeatable(False) - heart_stars = self.get_items_by_name("Heart Star") - self.collect(heart_stars[0:14]) - self.assertEqual(self.count("Heart Star"), 14, str(self.multiworld.seed)) - self.assertBeatable(False) - self.collect(heart_stars[14:15]) - self.assertEqual(self.count("Heart Star"), 15, str(self.multiworld.seed)) - self.assertBeatable(False) - self.collect_by_name(["Burning", "Cutter", "Kine"]) - self.assertBeatable(True) - self.remove([self.get_item_by_name("Love-Love Rod")]) - self.collect(heart_stars) - self.assertEqual(self.count("Heart Star"), 30, str(self.multiworld.seed)) - self.assertBeatable(True) - - def test_kine(self): - self.collect_by_name(["Cutter", "Burning", "Heart Star"]) - self.assertBeatable(False) - - def test_cutter(self): - self.collect_by_name(["Kine", "Burning", "Heart Star"]) - self.assertBeatable(False) - - def test_burning(self): - self.collect_by_name(["Cutter", "Kine", "Heart Star"]) - self.assertBeatable(False) - - def test_locked_animals(self): - self.assertTrue(self.multiworld.get_location("Ripple Field 5 - Animal 2", 1).item.name == "Pitch Spawn") - self.assertTrue(self.multiworld.get_location("Iceberg 4 - Animal 1", 1).item.name == "ChuChu Spawn") - self.assertTrue(self.multiworld.get_location("Sand Canyon 6 - Animal 1", 1).item.name in {"Kine Spawn", "Coo Spawn"}) - - def test_cutter_and_burning_reachable(self): + def test_goal(self) -> None: + try: + self.assertBeatable(False) + heart_stars = self.get_items_by_name("Heart Star") + self.collect(heart_stars[0:14]) + self.assertEqual(self.count("Heart Star"), 14, str(self.multiworld.seed)) + self.assertBeatable(False) + self.collect(heart_stars[14:15]) + self.assertEqual(self.count("Heart Star"), 15, str(self.multiworld.seed)) + self.assertBeatable(False) + self.collect_by_name(["Burning", "Cutter", "Kine"]) + self.assertBeatable(True) + self.remove([self.get_item_by_name("Love-Love Rod")]) + self.collect(heart_stars) + self.assertEqual(self.count("Heart Star"), 30, str(self.multiworld.seed)) + self.assertBeatable(True) + except AssertionError as ex: + # if assert beatable fails, this will catch and print the seed + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_kine(self) -> None: + try: + self.collect_by_name(["Cutter", "Burning", "Heart Star"]) + self.assertBeatable(False) + except AssertionError as ex: + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_cutter(self) -> None: + try: + self.collect_by_name(["Kine", "Burning", "Heart Star"]) + self.assertBeatable(False) + except AssertionError as ex: + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_burning(self) -> None: + try: + self.collect_by_name(["Cutter", "Kine", "Heart Star"]) + self.assertBeatable(False) + except AssertionError as ex: + raise AssertionError(f"Test failed, Seed:{self.multiworld.seed}") from ex + + def test_locked_animals(self) -> None: + ripple_field_5 = self.multiworld.get_location("Ripple Field 5 - Animal 2", 1) + self.assertTrue(ripple_field_5.item is not None and ripple_field_5.item.name == "Pitch Spawn", + f"Multiworld did not place Pitch, Seed: {self.multiworld.seed}") + iceberg_4 = self.multiworld.get_location("Iceberg 4 - Animal 1", 1) + self.assertTrue(iceberg_4.item is not None and iceberg_4.item.name == "ChuChu Spawn", + f"Multiworld did not place ChuChu, Seed: {self.multiworld.seed}") + sand_canyon_6 = self.multiworld.get_location("Sand Canyon 6 - Animal 1", 1) + self.assertTrue(sand_canyon_6.item is not None and sand_canyon_6.item.name in + {"Kine Spawn", "Coo Spawn"}, f"Multiworld did not place Coo/Kine, Seed: {self.multiworld.seed}") + + def test_problematic(self) -> None: + for spawns in animal_friend_spawns.problematic_sets: + placed = [self.multiworld.get_location(spawn, 1).item for spawn in spawns] + placed_names = set([item.name for item in placed]) + self.assertEqual(len(placed), len(placed_names), + f"Duplicate animal placed in problematic locations:" + f" {[spawn.location for spawn in placed]}, " + f"Seed: {self.multiworld.seed}") + + def test_cutter_and_burning_reachable(self) -> None: rooms = self.multiworld.worlds[1].rooms copy_abilities = self.multiworld.worlds[1].copy_abilities sand_canyon_5 = self.multiworld.get_region("Sand Canyon 5 - 9", 1) @@ -209,7 +279,7 @@ def test_cutter_and_burning_reachable(self): else: self.fail("Could not reach Burning Ability before Iceberg 4!") - def test_valid_abilities_for_ROB(self): + def test_valid_abilities_for_ROB(self) -> None: # there exists a subset of 4-7 abilities that will allow us access to ROB heart star on default settings self.collect_by_name(["Heart Star", "Kine", "Coo"]) # we will guaranteed need Coo, Kine, and Heart Stars to reach # first we need to identify our bukiset requirements @@ -220,13 +290,13 @@ def test_valid_abilities_for_ROB(self): ({"Stone Ability", "Burning Ability"}, {'Bukiset (Stone)', 'Bukiset (Burning)'}), ] copy_abilities = self.multiworld.worlds[1].copy_abilities - required_abilities: List[Tuple[str]] = [] + required_abilities: List[List[str]] = [] for abilities, bukisets in groups: potential_abilities: List[str] = list() for bukiset in bukisets: if copy_abilities[bukiset] in abilities: potential_abilities.append(copy_abilities[bukiset]) - required_abilities.append(tuple(potential_abilities)) + required_abilities.append(potential_abilities) collected_abilities = list() for group in required_abilities: self.assertFalse(len(group) == 0, str(self.multiworld.seed)) @@ -242,4 +312,4 @@ def test_valid_abilities_for_ROB(self): self.collect_by_name(["Cutter"]) self.assertTrue(self.can_reach_location("Sand Canyon 6 - Professor Hector & R.O.B"), - ''.join(str(self.multiworld.seed)).join(collected_abilities)) + f"Seed: {self.multiworld.seed}, Collected: {collected_abilities}") From 8ed466bf245e600cefb186fea547960b6b3de31f Mon Sep 17 00:00:00 2001 From: Kory Dondzila Date: Sat, 31 Aug 2024 06:30:42 -0500 Subject: [PATCH 48/60] Shivers: Add collect behavior option. (#3854) * Add collect behavior option. * Add comma Co-authored-by: Scipio Wright --------- Co-authored-by: Scipio Wright --- worlds/shivers/Options.py | 16 ++++++++++++++++ worlds/shivers/__init__.py | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/worlds/shivers/Options.py b/worlds/shivers/Options.py index 2f33eb18e5d1..72791bef3e7b 100644 --- a/worlds/shivers/Options.py +++ b/worlds/shivers/Options.py @@ -92,6 +92,21 @@ class FullPots(Choice): option_mixed = 2 +class PuzzleCollectBehavior(Choice): + """ + Defines what happens to puzzles on collect. + - Solve None: No puzzles will be solved when collected. + - Prevent Out Of Logic Access: All puzzles, except Red Door and Skull Door, will be solved when collected. + This prevents out of logic access to Gods Room and Slide. + - Solve All: All puzzles will be solved when collected. (original behavior) + """ + display_name = "Puzzle Collect Behavior" + option_solve_none = 0 + option_prevent_out_of_logic_access = 1 + option_solve_all = 2 + default = 1 + + @dataclass class ShiversOptions(PerGameCommonOptions): ixupi_captures_needed: IxupiCapturesNeeded @@ -104,3 +119,4 @@ class ShiversOptions(PerGameCommonOptions): early_lightning: EarlyLightning location_pot_pieces: LocationPotPieces full_pots: FullPots + puzzle_collect_behavior: PuzzleCollectBehavior diff --git a/worlds/shivers/__init__.py b/worlds/shivers/__init__.py index a2d7bc14644e..3ca87ae164f2 100644 --- a/worlds/shivers/__init__.py +++ b/worlds/shivers/__init__.py @@ -219,7 +219,8 @@ def fill_slot_data(self) -> dict: "ElevatorsStaySolved": self.options.elevators_stay_solved.value, "EarlyBeth": self.options.early_beth.value, "EarlyLightning": self.options.early_lightning.value, - "FrontDoorUsable": self.options.front_door_usable.value + "FrontDoorUsable": self.options.front_door_usable.value, + "PuzzleCollectBehavior": self.options.puzzle_collect_behavior.value, } From f81335d614fdec431564062d9f71b4553a5c9355 Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Sat, 31 Aug 2024 04:44:09 -0700 Subject: [PATCH 49/60] DS3: Don't return early in the location loop (#3856) This caused behavior errors when some locations in a group were excluded and others were not. --- worlds/dark_souls_3/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py index c31a3681df36..f6e5cde615c8 100644 --- a/worlds/dark_souls_3/__init__.py +++ b/worlds/dark_souls_3/__init__.py @@ -1292,10 +1292,10 @@ def _add_location_rule(self, location: Union[str, List[str]], rule: Union[Collec locations = location if isinstance(location, list) else [location] for location in locations: data = location_dictionary[location] - if data.dlc and not self.options.enable_dlc: return - if data.ngp and not self.options.enable_ngp: return + if data.dlc and not self.options.enable_dlc: continue + if data.ngp and not self.options.enable_ngp: continue - if not self._is_location_available(location): return + if not self._is_location_available(location): continue if isinstance(rule, str): assert item_dictionary[rule].classification == ItemClassification.progression rule = lambda state, item=rule: state.has(item, self.player) From b37bb60891a9a45838491a621562f8f970e34c55 Mon Sep 17 00:00:00 2001 From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Date: Sat, 31 Aug 2024 07:44:48 -0400 Subject: [PATCH 50/60] DS3: Prevent prioritized+excluded locations (#3855) --- worlds/dark_souls_3/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py index f6e5cde615c8..46c7ef1336c1 100644 --- a/worlds/dark_souls_3/__init__.py +++ b/worlds/dark_souls_3/__init__.py @@ -1252,6 +1252,9 @@ def _add_allow_useful_location_rules(self) -> None: lambda item: not item.advancement ) + # Prevent the player from prioritizing and "excluding" the same location + self.options.priority_locations.value -= allow_useful_locations + if self.options.excluded_location_behavior == "allow_useful": self.options.exclude_locations.value.clear() From 7e0219c214dca799e85b908e0f7a14d5430ca460 Mon Sep 17 00:00:00 2001 From: lordlou <87331798+lordlou@users.noreply.github.com> Date: Sat, 31 Aug 2024 07:49:33 -0400 Subject: [PATCH 51/60] SM and SMZ3 option_definitions deprecation fix (#3372) * - reenabled balancing * post rebase fixes * updated SmClient.py * + added VariaRandomizer LICENSE * + added sm_randomizer_rom project (which builds sm.ips) * Moved VariaRandomizer and sm_randomizer_rom projects inside worlds/sm and done some cleaning * properly revert change made to CollectionState and more cleaning * Fixed multiworld support patch not working with VariaRandomizer's * missing file commit * Fixed syntax error in unused code to satisfy Linter * Revert "Fixed multiworld support patch not working with VariaRandomizer's" This reverts commit fb3ca18528bb331995e3d3051648c8f84d04c08b. * many fixes and improovement - fixed seeded generation - fixed broken logic when more than one SM world - added missing rules for inter-area transitions - added basic patch presence for logic - added DoorManager init call to reflect present patches for logic - moved CollectionState addition out of BaseClasses into SM world - added condition to apply progitempool presorting only if SM world is present - set Bosses item id to None to prevent them going into multidata - now use get_game_players * first working (most of the time) progression generation for SM using VariaRandomizer's rules, items, locations and accessPoint (as regions) * first working single-world randomized SM rom patches * - SM now displays message when getting an item outside for someone else (fills ROM item table) This is dependant on modifications done to sm_randomizer_rom project * First working MultiWorld SM * some missing things: - player name inject in ROM and get in client - end game get from ROM in client - send self item to server - add player names table in ROM * replaced CollectionState inheritance from SMBoolManager with a composition of an array of it (required to generation more than one SM world, which is still fails but is better) * - reenabled balancing * post rebase fixes * updated SmClient.py * + added VariaRandomizer LICENSE * + added sm_randomizer_rom project (which builds sm.ips) * Moved VariaRandomizer and sm_randomizer_rom projects inside worlds/sm and done some cleaning * properly revert change made to CollectionState and more cleaning * Fixed multiworld support patch not working with VariaRandomizer's * missing file commit * Fixed syntax error in unused code to satisfy Linter * Revert "Fixed multiworld support patch not working with VariaRandomizer's" This reverts commit fb3ca18528bb331995e3d3051648c8f84d04c08b. * many fixes and improovement - fixed seeded generation - fixed broken logic when more than one SM world - added missing rules for inter-area transitions - added basic patch presence for logic - added DoorManager init call to reflect present patches for logic - moved CollectionState addition out of BaseClasses into SM world - added condition to apply progitempool presorting only if SM world is present - set Bosses item id to None to prevent them going into multidata - now use get_game_players * Fixed multiworld support patch not working with VariaRandomizer's Added stage_fill_hook to set morph first in progitempool Added back VariaRandomizer's standard patches * + added missing files from variaRandomizer project * + added missing variaRandomizer files (custom sprites) + started integrating VariaRandomizer options (WIP) * Some fixes for player and server name display - fixed player name of 16 characters reading too far in SM client - fixed 12 bytes SM player name limit (now 16) - fixed server name not being displayed in SM when using server cheat ( now displays RECEIVED FROM ARCHIPELAGO) - request: temporarly changed default seed names displayed in SM main menu to OWTCH * Fixed Goal completion not triggering in smClient * integrated VariaRandomizer's options into AP (WIP) - startAP is working - door rando is working - skillset is working * - fixed itemsounds.ips crash by always including nofanfare.ips into multiworld.ips (itemsounds is now always applied and "itemsounds" preset must always be "off") * skillset are now instanced per player instead of being a singleton class * RomPatches are now instanced per player instead of being a singleton class * DoorManager is now instanced per player instead of being a singleton class * - fixed the last bugs that prevented generation of >1 SM world * fixed crash when no skillset preset is specified in randoPreset (default to "casual") * maxDifficulty support and itemsounds removal - added support for maxDifficulty - removed itemsounds patch as its always applied from multiworld patch for now * Fixed bad merge * Post merge adaptation * fixed player name length fix that got lost with the merge * fixed generation with other game type than SM * added default randoPreset json for SM in playerSettings.yaml * fixed broken SM client following merge * beautified json skillset presets * Fixed ArchipelagoSmClient not building * Fixed conflict between mutliworld patch and beam_doors_plms patch - doorsColorsRando now working * SM generation now outputs APBP - Fixed paths for patches and presets when frozen * added missing file and fixed multithreading issue * temporarily set data_version = 0 * more work - added support for AP starting items - fixed client crash with gamemode being None - patch.py "compatible_version" is now 3 * commited missing asm files fixed start item reserve breaking game (was using bad write offset when patching) * Nothing item are now handled game-side. the game will now skip displaying a message box for received Nothing item (but the client will still receive it). fixed crash in SMClient when loosing connection to SNI * fixed No Energy Item missing its ID fixed Plando * merge post fixes * fixed start item Grapple, XRay and Reserve HUD, as well as graphic beams (except ice palette color) * fixed freeze in blue brinstar caused by Varia's custom PLM not being filled with proper Multiworld PLM address (altLocsAddresses) * fixed start item x-ray HUD display * Fixed start items being sent by the server (is all handled in ROM) Start items are now not removed from itempool anymore Nothing Item is now local_items so no player will ever pickup Nothing. Doing so reduces contribution of this world to the Multiworld the more Nothing there is though. Fixed crash (and possibly passing but broken) at generation where the static list of IPSPatches used by all SM worlds was being modified * fixed settings that could be applied to any SM players * fixed auth to server only using player name (now does as ALTTP to authenticate) * - fixed End Credits broken text * added non SM item name display * added all supported SM options in playerSettings.yaml * fixed locations needing a list of parent regions (now generate a region for each location with one-way exits to each (previously) parent region did some cleaning (mainly reverts on unnecessary core classes * minor setting fixes and tweaks - merged Area and lightArea settings - made missileQty, superQty and powerBombQty use value from 10 to 90 and divide value by float(10) when generating - fixed inverted layoutPatch setting * added option start_inventory_removes_from_pool fixed option names formatting fixed lint errors small code and repo cleanup * Hopefully fixed ROR2 that could not send any items * - fixed missing required change to ROR2 * fixed 0 hp when respawning without having ever saved (start items were not updating the save checksum) * fixed typo with doors_colors_rando * fixed checksum * added custom sprites for off-world items (progression or not) the original AP sprite was made with PierRoulette's SM Item Sprite Utility by ijwu * - added missing change following upstream merge - changed patch filename extension from apbp to apm3 so patch can be used with the new client * added morph placement options: early means local and sphere 1 * fixed failing unit tests * - fixed broken custom_preset options * - big cleanup to remove unnecessary or unsupported features * - more cleanup * - moved sm_randomizer_rom and all always applied patches into an external project that outputs basepatch.ips - small cleanup * - added comment to refer to project for generating basepatch.ips (https://github.com/lordlou/SMBasepatch) * fixed g4_skip patch that can be not applied if hud is enabled * - fixed off world sprite that can have broken graphics (restricted to use only first 2 palette) * - updated basepatch to reflect g4_skip removal - moved more asm files to SMBasepatch project * - tourian grey doors at baby metroid are now always flashing (allowing to go back if needed) * fixed wrong path if using built as exe * - cleaned exposed maxDifficulty options - removed always enabled Knows * Merged LttPClient and SMClient into SNIClient * added varia_custom Preset Option that fetch a preset (read from a new varia_custom_preset Option) from varia's web service * small doc precision * - added death_link support - fixed broken Goal Completion - post merge fix * - removed now useless presets * - fixed bad internal mapping with maxDiff - increases maxDiff if only Bosses is preventing beating the game * - added support for lowercase custom preset sections (knows, settings and controller) - fixed controller settings not applying to ROM * - fixed death loop when dying with Door rando, bomb or speed booster as starting items - varia's backup save should now be usable (automatically enabled when doing door rando) * -added docstring for generated yaml * fixed bad merge * fixed broken infinity max difficulty * commented debug prints * adjusted credits to mark progression speed and difficulty as Non Available * added support for more than 255 players (will print Archipelago for higher player number) * fixed missing cleanup * added support for 65535 different player names in ROM * fixed generations failing when only bosses are unreachable * - replaced setting maxDiff to infinity with a bool only affecting boss logics if only bosses are left to finish * fixed failling generations when using 'fun' settings Accessibility checks are forced to 'items' if restricted locations are used by VARIA following usage of 'fun' settings * fixed debug logger * removed unsupported "suits_restriction" option * fixed generations failing when only bosses are unreachable (using a less intrusive approach for AP) * - fixed deathlink emptying reserves - added death_link_survive option that lets player survive when receiving a deathlink if the have non-empty reserves * - merged death_link and death_link_survive options * fixed death_link * added a fallback default starting location instead of failing generation if an invalid one was chosen * added Nothing and NoEnergy as hint blacklist added missing NoEnergy as local items and removed it from progression * replaced deprecated use of option_definitions for SM and SMZ3 by options_dataclass * fixed missed references to option_definitions * Update worlds/sm/variaRandomizer/utils/utils.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * fixed conflicts and made SMZ3 accessibility related code more future proof * Update worlds/smz3/Options.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update worlds/smz3/__init__.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --- worlds/sm/Options.py | 121 ++++++++++++----------- worlds/sm/__init__.py | 38 ++++--- worlds/sm/variaRandomizer/randomizer.py | 14 +-- worlds/sm/variaRandomizer/utils/utils.py | 72 +++++++------- worlds/smz3/Options.py | 36 +++---- worlds/smz3/__init__.py | 40 ++++---- 6 files changed, 161 insertions(+), 160 deletions(-) diff --git a/worlds/sm/Options.py b/worlds/sm/Options.py index 223179529cf4..3dad16ad3afd 100644 --- a/worlds/sm/Options.py +++ b/worlds/sm/Options.py @@ -1,6 +1,7 @@ import typing -from Options import Choice, Range, OptionDict, OptionList, OptionSet, Option, Toggle, DefaultOnToggle +from Options import Choice, PerGameCommonOptions, Range, OptionDict, OptionList, OptionSet, Option, Toggle, DefaultOnToggle from .variaRandomizer.utils.objectives import _goals +from dataclasses import dataclass class StartItemsRemovesFromPool(Toggle): """Remove items in starting inventory from pool.""" @@ -372,62 +373,62 @@ class RelaxedRoundRobinCF(Toggle): """ display_name = "Relaxed round robin Crystal Flash" -sm_options: typing.Dict[str, type(Option)] = { - "start_inventory_removes_from_pool": StartItemsRemovesFromPool, - "preset": Preset, - "start_location": StartLocation, - "remote_items": RemoteItems, - "death_link": DeathLink, - #"majors_split": "Full", - #"scav_num_locs": "10", - #"scav_randomized": "off", - #"scav_escape": "off", - "max_difficulty": MaxDifficulty, - #"progression_speed": "medium", - #"progression_difficulty": "normal", - "morph_placement": MorphPlacement, - #"suits_restriction": SuitsRestriction, - "hide_items": HideItems, - "strict_minors": StrictMinors, - "missile_qty": MissileQty, - "super_qty": SuperQty, - "power_bomb_qty": PowerBombQty, - "minor_qty": MinorQty, - "energy_qty": EnergyQty, - "area_randomization": AreaRandomization, - "area_layout": AreaLayout, - "doors_colors_rando": DoorsColorsRando, - "allow_grey_doors": AllowGreyDoors, - "boss_randomization": BossRandomization, - #"minimizer": "off", - #"minimizer_qty": "45", - #"minimizer_tourian": "off", - "escape_rando": EscapeRando, - "remove_escape_enemies": RemoveEscapeEnemies, - "fun_combat": FunCombat, - "fun_movement": FunMovement, - "fun_suits": FunSuits, - "layout_patches": LayoutPatches, - "varia_tweaks": VariaTweaks, - "nerfed_charge": NerfedCharge, - "gravity_behaviour": GravityBehaviour, - #"item_sounds": "on", - "elevators_speed": ElevatorsSpeed, - "fast_doors": DoorsSpeed, - "spin_jump_restart": SpinJumpRestart, - "rando_speed": SpeedKeep, - "infinite_space_jump": InfiniteSpaceJump, - "refill_before_save": RefillBeforeSave, - "hud": Hud, - "animals": Animals, - "no_music": NoMusic, - "random_music": RandomMusic, - "custom_preset": CustomPreset, - "varia_custom_preset": VariaCustomPreset, - "tourian": Tourian, - "custom_objective": CustomObjective, - "custom_objective_list": CustomObjectiveList, - "custom_objective_count": CustomObjectiveCount, - "objective": Objective, - "relaxed_round_robin_cf": RelaxedRoundRobinCF, - } +@dataclass +class SMOptions(PerGameCommonOptions): + start_inventory_removes_from_pool: StartItemsRemovesFromPool + preset: Preset + start_location: StartLocation + remote_items: RemoteItems + death_link: DeathLink + #majors_split: "Full" + #scav_num_locs: "10" + #scav_randomized: "off" + #scav_escape: "off" + max_difficulty: MaxDifficulty + #progression_speed": "medium" + #progression_difficulty": "normal" + morph_placement: MorphPlacement + #suits_restriction": SuitsRestriction + hide_items: HideItems + strict_minors: StrictMinors + missile_qty: MissileQty + super_qty: SuperQty + power_bomb_qty: PowerBombQty + minor_qty: MinorQty + energy_qty: EnergyQty + area_randomization: AreaRandomization + area_layout: AreaLayout + doors_colors_rando: DoorsColorsRando + allow_grey_doors: AllowGreyDoors + boss_randomization: BossRandomization + #minimizer: "off" + #minimizer_qty: "45" + #minimizer_tourian: "off" + escape_rando: EscapeRando + remove_escape_enemies: RemoveEscapeEnemies + fun_combat: FunCombat + fun_movement: FunMovement + fun_suits: FunSuits + layout_patches: LayoutPatches + varia_tweaks: VariaTweaks + nerfed_charge: NerfedCharge + gravity_behaviour: GravityBehaviour + #item_sounds: "on" + elevators_speed: ElevatorsSpeed + fast_doors: DoorsSpeed + spin_jump_restart: SpinJumpRestart + rando_speed: SpeedKeep + infinite_space_jump: InfiniteSpaceJump + refill_before_save: RefillBeforeSave + hud: Hud + animals: Animals + no_music: NoMusic + random_music: RandomMusic + custom_preset: CustomPreset + varia_custom_preset: VariaCustomPreset + tourian: Tourian + custom_objective: CustomObjective + custom_objective_list: CustomObjectiveList + custom_objective_count: CustomObjectiveCount + objective: Objective + relaxed_round_robin_cf: RelaxedRoundRobinCF diff --git a/worlds/sm/__init__.py b/worlds/sm/__init__.py index 826b1447793d..bf9d6d087edd 100644 --- a/worlds/sm/__init__.py +++ b/worlds/sm/__init__.py @@ -15,7 +15,7 @@ logger = logging.getLogger("Super Metroid") -from .Options import sm_options +from .Options import SMOptions from .Client import SMSNIClient from .Rom import get_base_rom_path, SM_ROM_MAX_PLAYERID, SM_ROM_PLAYERDATA_COUNT, SMDeltaPatch, get_sm_symbols import Utils @@ -96,10 +96,11 @@ class SMWorld(World): a wide range of options to randomize Item locations, required skills and even the connections between the main Areas! """ - game: str = "Super Metroid" topology_present = True - option_definitions = sm_options + options_dataclass = SMOptions + options: SMOptions + settings: typing.ClassVar[SMSettings] item_name_to_id = {value.Name: items_start_id + value.Id for key, value in ItemManager.Items.items() if value.Id != None} @@ -129,27 +130,27 @@ def generate_early(self): Logic.factory('vanilla') dummy_rom_file = Utils.user_path(SMSettings.RomFile.copy_to) # actual rom set in generate_output - self.variaRando = VariaRandomizer(self.multiworld, dummy_rom_file, self.player) + self.variaRando = VariaRandomizer(self.options, dummy_rom_file, self.player) self.multiworld.state.smbm[self.player] = SMBoolManager(self.player, self.variaRando.maxDifficulty) # keeps Nothing items local so no player will ever pickup Nothing # doing so reduces contribution of this world to the Multiworld the more Nothing there is though - self.multiworld.local_items[self.player].value.add('Nothing') - self.multiworld.local_items[self.player].value.add('No Energy') + self.options.local_items.value.add('Nothing') + self.options.local_items.value.add('No Energy') if (self.variaRando.args.morphPlacement == "early"): self.multiworld.local_early_items[self.player]['Morph Ball'] = 1 - self.remote_items = self.multiworld.remote_items[self.player] + self.remote_items = self.options.remote_items if (len(self.variaRando.randoExec.setup.restrictedLocs) > 0): - self.multiworld.accessibility[self.player].value = Accessibility.option_minimal + self.options.accessibility.value = Accessibility.option_minimal logger.warning(f"accessibility forced to 'minimal' for player {self.multiworld.get_player_name(self.player)} because of 'fun' settings") def create_items(self): itemPool = self.variaRando.container.itemPool self.startItems = [variaItem for item in self.multiworld.precollected_items[self.player] for variaItem in ItemManager.Items.values() if variaItem.Name == item.name] - if self.multiworld.start_inventory_removes_from_pool[self.player]: + if self.options.start_inventory_removes_from_pool: for item in self.startItems: if (item in itemPool): itemPool.remove(item) @@ -317,10 +318,10 @@ def create_item(self, name: str) -> Item: player=self.player) def get_filler_item_name(self) -> str: - if self.multiworld.random.randint(0, 100) < self.multiworld.minor_qty[self.player].value: - power_bombs = self.multiworld.power_bomb_qty[self.player].value - missiles = self.multiworld.missile_qty[self.player].value - super_missiles = self.multiworld.super_qty[self.player].value + if self.multiworld.random.randint(0, 100) < self.options.minor_qty.value: + power_bombs = self.options.power_bomb_qty.value + missiles = self.options.missile_qty.value + super_missiles = self.options.super_qty.value roll = self.multiworld.random.randint(1, power_bombs + missiles + super_missiles) if roll <= power_bombs: return "Power Bomb" @@ -633,7 +634,7 @@ def APPostPatchRom(self, romPatcher): deathLink: List[ByteEdit] = [{ "sym": symbols["config_deathlink"], "offset": 0, - "values": [self.multiworld.death_link[self.player].value] + "values": [self.options.death_link.value] }] remoteItem: List[ByteEdit] = [{ "sym": symbols["config_remote_items"], @@ -859,10 +860,7 @@ def modify_multidata(self, multidata: dict): def fill_slot_data(self): slot_data = {} if not self.multiworld.is_race: - for option_name in self.option_definitions: - option = getattr(self.multiworld, option_name)[self.player] - slot_data[option_name] = option.value - + slot_data = self.options.as_dict(*self.options_dataclass.type_hints) slot_data["Preset"] = { "Knows": {}, "Settings": {"hardRooms": Settings.SettingsDict[self.player].hardRooms, "bossesDifficulty": Settings.SettingsDict[self.player].bossesDifficulty, @@ -887,14 +885,14 @@ def fill_slot_data(self): return slot_data def write_spoiler(self, spoiler_handle: TextIO): - if self.multiworld.area_randomization[self.player].value != 0: + if self.options.area_randomization.value != 0: spoiler_handle.write('\n\nArea Transitions:\n\n') spoiler_handle.write('\n'.join(['%s%s %s %s' % (f'{self.multiworld.get_player_name(self.player)}: ' if self.multiworld.players > 1 else '', src.Name, '<=>', dest.Name) for src, dest in self.variaRando.randoExec.areaGraph.InterAreaTransitions if not src.Boss])) - if self.multiworld.boss_randomization[self.player].value != 0: + if self.options.boss_randomization.value != 0: spoiler_handle.write('\n\nBoss Transitions:\n\n') spoiler_handle.write('\n'.join(['%s%s %s %s' % (f'{self.multiworld.get_player_name(self.player)}: ' if self.multiworld.players > 1 else '', src.Name, diff --git a/worlds/sm/variaRandomizer/randomizer.py b/worlds/sm/variaRandomizer/randomizer.py index dab078598ec2..8a7a2ea0e2a5 100644 --- a/worlds/sm/variaRandomizer/randomizer.py +++ b/worlds/sm/variaRandomizer/randomizer.py @@ -250,13 +250,13 @@ class VariaRandomizer: parser.add_argument('--tourianList', help="list to choose from when random", dest='tourianList', nargs='?', default=None) - def __init__(self, world, rom, player): + def __init__(self, options, rom, player): # parse args self.args = copy.deepcopy(VariaRandomizer.parser.parse_args(["--logic", "varia"])) #dummy custom args to skip parsing _sys.argv while still get default values self.player = player args = self.args args.rom = rom - # args.startLocation = to_pascal_case_with_space(world.startLocation[player].current_key) + # args.startLocation = to_pascal_case_with_space(options.startLocation.current_key) if args.output is None and args.rom is None: raise Exception("Need --output or --rom parameter") @@ -288,7 +288,7 @@ def forceArg(arg, value, msg, altValue=None, webArg=None, webValue=None): # print(msg) # optErrMsgs.append(msg) - preset = loadRandoPreset(world, self.player, args) + preset = loadRandoPreset(options, args) # use the skill preset from the rando preset if preset is not None and preset != 'custom' and preset != 'varia_custom' and args.paramsFileName is None: args.paramsFileName = "/".join((appDir, getPresetDir(preset), preset+".json")) @@ -302,12 +302,12 @@ def forceArg(arg, value, msg, altValue=None, webArg=None, webValue=None): preset = args.preset else: if preset == 'custom': - PresetLoader.factory(world.custom_preset[player].value).load(self.player) + PresetLoader.factory(options.custom_preset.value).load(self.player) elif preset == 'varia_custom': - if len(world.varia_custom_preset[player].value) == 0: + if len(options.varia_custom_preset.value) == 0: raise Exception("varia_custom was chosen but varia_custom_preset is missing.") url = 'https://randommetroidsolver.pythonanywhere.com/presetWebService' - preset_name = next(iter(world.varia_custom_preset[player].value)) + preset_name = next(iter(options.varia_custom_preset.value)) payload = '{{"preset": "{}"}}'.format(preset_name) headers = {'content-type': 'application/json', 'Accept-Charset': 'UTF-8'} response = requests.post(url, data=payload, headers=headers) @@ -463,7 +463,7 @@ def forceArg(arg, value, msg, altValue=None, webArg=None, webValue=None): args.startLocation = random.choice(possibleStartAPs) elif args.startLocation not in possibleStartAPs: args.startLocation = 'Landing Site' - world.start_location[player] = StartLocation(StartLocation.default) + options.start_location = StartLocation(StartLocation.default) #optErrMsgs.append('Invalid start location: {}. {}'.format(args.startLocation, reasons[args.startLocation])) #optErrMsgs.append('Possible start locations with these settings: {}'.format(possibleStartAPs)) #dumpErrorMsgs(args.output, optErrMsgs) diff --git a/worlds/sm/variaRandomizer/utils/utils.py b/worlds/sm/variaRandomizer/utils/utils.py index 01029f2f6030..f7d699b66549 100644 --- a/worlds/sm/variaRandomizer/utils/utils.py +++ b/worlds/sm/variaRandomizer/utils/utils.py @@ -358,35 +358,35 @@ def convertParam(randoParams, param, inverse=False): return "random" raise Exception("invalid value for parameter {}".format(param)) -def loadRandoPreset(world, player, args): +def loadRandoPreset(options, args): defaultMultiValues = getDefaultMultiValues() diffs = ["easy", "medium", "hard", "harder", "hardcore", "mania", "infinity"] presetValues = getPresetValues() - args.animals = world.animals[player].value - args.noVariaTweaks = not world.varia_tweaks[player].value - args.maxDifficulty = diffs[world.max_difficulty[player].value] - #args.suitsRestriction = world.suits_restriction[player].value - args.hideItems = world.hide_items[player].value - args.strictMinors = world.strict_minors[player].value - args.noLayout = not world.layout_patches[player].value - args.gravityBehaviour = defaultMultiValues["gravityBehaviour"][world.gravity_behaviour[player].value] - args.nerfedCharge = world.nerfed_charge[player].value - args.area = world.area_randomization[player].current_key + args.animals = options.animals.value + args.noVariaTweaks = not options.varia_tweaks.value + args.maxDifficulty = diffs[options.max_difficulty.value] + #args.suitsRestriction = options.suits_restriction.value + args.hideItems = options.hide_items.value + args.strictMinors = options.strict_minors.value + args.noLayout = not options.layout_patches.value + args.gravityBehaviour = defaultMultiValues["gravityBehaviour"][options.gravity_behaviour.value] + args.nerfedCharge = options.nerfed_charge.value + args.area = options.area_randomization.current_key if (args.area == "true"): args.area = "full" if args.area != "off": - args.areaLayoutBase = not world.area_layout[player].value - args.escapeRando = world.escape_rando[player].value - args.noRemoveEscapeEnemies = not world.remove_escape_enemies[player].value - args.doorsColorsRando = world.doors_colors_rando[player].value - args.allowGreyDoors = world.allow_grey_doors[player].value - args.bosses = world.boss_randomization[player].value - if world.fun_combat[player].value: + args.areaLayoutBase = not options.area_layout.value + args.escapeRando = options.escape_rando.value + args.noRemoveEscapeEnemies = not options.remove_escape_enemies.value + args.doorsColorsRando = options.doors_colors_rando.value + args.allowGreyDoors = options.allow_grey_doors.value + args.bosses = options.boss_randomization.value + if options.fun_combat.value: args.superFun.append("Combat") - if world.fun_movement[player].value: + if options.fun_movement.value: args.superFun.append("Movement") - if world.fun_suits[player].value: + if options.fun_suits.value: args.superFun.append("Suits") ipsPatches = { "spin_jump_restart":"spinjumprestart", @@ -396,36 +396,36 @@ def loadRandoPreset(world, player, args): "refill_before_save":"refill_before_save", "relaxed_round_robin_cf":"relaxed_round_robin_cf"} for settingName, patchName in ipsPatches.items(): - if hasattr(world, settingName) and getattr(world, settingName)[player].value: + if hasattr(options, settingName) and getattr(options, settingName).value: args.patches.append(patchName + '.ips') patches = {"no_music":"No_Music", "infinite_space_jump":"Infinite_Space_Jump"} for settingName, patchName in patches.items(): - if hasattr(world, settingName) and getattr(world, settingName)[player].value: + if hasattr(options, settingName) and getattr(options, settingName).value: args.patches.append(patchName) - args.hud = world.hud[player].value - args.morphPlacement = defaultMultiValues["morphPlacement"][world.morph_placement[player].value] + args.hud = options.hud.value + args.morphPlacement = defaultMultiValues["morphPlacement"][options.morph_placement.value] #args.majorsSplit #args.scavNumLocs #args.scavRandomized - args.startLocation = defaultMultiValues["startLocation"][world.start_location[player].value] + args.startLocation = defaultMultiValues["startLocation"][options.start_location.value] #args.progressionDifficulty #args.progressionSpeed - args.missileQty = world.missile_qty[player].value / float(10) - args.superQty = world.super_qty[player].value / float(10) - args.powerBombQty = world.power_bomb_qty[player].value / float(10) - args.minorQty = world.minor_qty[player].value - args.energyQty = defaultMultiValues["energyQty"][world.energy_qty[player].value] - args.objectiveRandom = world.custom_objective[player].value - args.objectiveList = list(world.custom_objective_list[player].value) - args.nbObjective = world.custom_objective_count[player].value - args.objective = list(world.objective[player].value) - args.tourian = defaultMultiValues["tourian"][world.tourian[player].value] + args.missileQty = options.missile_qty.value / float(10) + args.superQty = options.super_qty.value / float(10) + args.powerBombQty = options.power_bomb_qty.value / float(10) + args.minorQty = options.minor_qty.value + args.energyQty = defaultMultiValues["energyQty"][options.energy_qty.value] + args.objectiveRandom = options.custom_objective.value + args.objectiveList = list(options.custom_objective_list.value) + args.nbObjective = options.custom_objective_count.value + args.objective = list(options.objective.value) + args.tourian = defaultMultiValues["tourian"][options.tourian.value] #args.minimizerN #args.minimizerTourian - return presetValues[world.preset[player].value] + return presetValues[options.preset.value] def getRandomizerDefaultParameters(): defaultParams = {} diff --git a/worlds/smz3/Options.py b/worlds/smz3/Options.py index 8c5efc431f5c..7df01f8710e1 100644 --- a/worlds/smz3/Options.py +++ b/worlds/smz3/Options.py @@ -1,5 +1,6 @@ import typing -from Options import Choice, Option, Toggle, DefaultOnToggle, Range, ItemsAccessibility +from Options import Choice, Option, PerGameCommonOptions, Toggle, DefaultOnToggle, Range, ItemsAccessibility +from dataclasses import dataclass class SMLogic(Choice): """This option selects what kind of logic to use for item placement inside @@ -126,20 +127,19 @@ class EnergyBeep(DefaultOnToggle): """Toggles the low health energy beep in Super Metroid.""" display_name = "Energy Beep" - -smz3_options: typing.Dict[str, type(Option)] = { - "accessibility": ItemsAccessibility, - "sm_logic": SMLogic, - "sword_location": SwordLocation, - "morph_location": MorphLocation, - "goal": Goal, - "key_shuffle": KeyShuffle, - "open_tower": OpenTower, - "ganon_vulnerable": GanonVulnerable, - "open_tourian": OpenTourian, - "spin_jumps_animation": SpinJumpsAnimation, - "heart_beep_speed": HeartBeepSpeed, - "heart_color": HeartColor, - "quick_swap": QuickSwap, - "energy_beep": EnergyBeep - } +@dataclass +class SMZ3Options(PerGameCommonOptions): + accessibility: ItemsAccessibility + sm_logic: SMLogic + sword_location: SwordLocation + morph_location: MorphLocation + goal: Goal + key_shuffle: KeyShuffle + open_tower: OpenTower + ganon_vulnerable: GanonVulnerable + open_tourian: OpenTourian + spin_jumps_animation: SpinJumpsAnimation + heart_beep_speed: HeartBeepSpeed + heart_color: HeartColor + quick_swap: QuickSwap + energy_beep: EnergyBeep diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py index 690e5172a25c..5e6a6ac60965 100644 --- a/worlds/smz3/__init__.py +++ b/worlds/smz3/__init__.py @@ -22,8 +22,8 @@ from .Client import SMZ3SNIClient from .Rom import get_base_rom_bytes, SMZ3DeltaPatch from .ips import IPS_Patch -from .Options import smz3_options -from Options import Accessibility +from .Options import SMZ3Options +from Options import Accessibility, ItemsAccessibility world_folder = os.path.dirname(__file__) logger = logging.getLogger("SMZ3") @@ -68,7 +68,9 @@ class SMZ3World(World): """ game: str = "SMZ3" topology_present = False - option_definitions = smz3_options + options_dataclass = SMZ3Options + options: SMZ3Options + item_names: Set[str] = frozenset(TotalSMZ3Item.lookup_name_to_id) location_names: Set[str] item_name_to_id = TotalSMZ3Item.lookup_name_to_id @@ -189,14 +191,14 @@ def generate_early(self): self.config = Config() self.config.GameMode = GameMode.Multiworld self.config.Z3Logic = Z3Logic.Normal - self.config.SMLogic = SMLogic(self.multiworld.sm_logic[self.player].value) - self.config.SwordLocation = SwordLocation(self.multiworld.sword_location[self.player].value) - self.config.MorphLocation = MorphLocation(self.multiworld.morph_location[self.player].value) - self.config.Goal = Goal(self.multiworld.goal[self.player].value) - self.config.KeyShuffle = KeyShuffle(self.multiworld.key_shuffle[self.player].value) - self.config.OpenTower = OpenTower(self.multiworld.open_tower[self.player].value) - self.config.GanonVulnerable = GanonVulnerable(self.multiworld.ganon_vulnerable[self.player].value) - self.config.OpenTourian = OpenTourian(self.multiworld.open_tourian[self.player].value) + self.config.SMLogic = SMLogic(self.options.sm_logic.value) + self.config.SwordLocation = SwordLocation(self.options.sword_location.value) + self.config.MorphLocation = MorphLocation(self.options.morph_location.value) + self.config.Goal = Goal(self.options.goal.value) + self.config.KeyShuffle = KeyShuffle(self.options.key_shuffle.value) + self.config.OpenTower = OpenTower(self.options.open_tower.value) + self.config.GanonVulnerable = GanonVulnerable(self.options.ganon_vulnerable.value) + self.config.OpenTourian = OpenTourian(self.options.open_tourian.value) self.local_random = random.Random(self.multiworld.random.randint(0, 1000)) self.smz3World = TotalSMZ3World(self.config, self.multiworld.get_player_name(self.player), self.player, self.multiworld.seed_name) @@ -222,7 +224,7 @@ def create_items(self): else: progressionItems = self.progression # Dungeons items here are not in the itempool and will be prefilled locally so they must stay local - self.multiworld.non_local_items[self.player].value -= frozenset(item_name for item_name in self.item_names if TotalSMZ3Item.Item.IsNameDungeonItem(item_name)) + self.options.non_local_items.value -= frozenset(item_name for item_name in self.item_names if TotalSMZ3Item.Item.IsNameDungeonItem(item_name)) for item in self.keyCardsItems: self.multiworld.push_precollected(SMZ3Item(item.Type.name, ItemClassification.filler, item.Type, self.item_name_to_id[item.Type.name], self.player, item)) @@ -244,7 +246,7 @@ def set_rules(self): set_rule(entrance, lambda state, region=region: region.CanEnter(state.smz3state[self.player])) for loc in region.Locations: l = self.locations[loc.Name] - if self.multiworld.accessibility[self.player] != 'full': + if self.options.accessibility.value != ItemsAccessibility.option_full: l.always_allow = lambda state, item, loc=loc: \ item.game == "SMZ3" and \ loc.alwaysAllow(item.item, state.smz3state[self.player]) @@ -405,12 +407,12 @@ def apply_customization(self): patch = {} # smSpinjumps - if (self.multiworld.spin_jumps_animation[self.player].value == 1): + if (self.options.spin_jumps_animation.value == 1): patch[self.SnesCustomization(0x9B93FE)] = bytearray([0x01]) # z3HeartBeep values = [ 0x00, 0x80, 0x40, 0x20, 0x10] - index = self.multiworld.heart_beep_speed[self.player].value + index = self.options.heart_beep_speed.value patch[0x400033] = bytearray([values[index if index < len(values) else 2]]) # z3HeartColor @@ -420,17 +422,17 @@ def apply_customization(self): [0x2C, [0xC9, 0x69]], [0x28, [0xBC, 0x02]] ] - index = self.multiworld.heart_color[self.player].value + index = self.options.heart_color.value (hud, fileSelect) = values[index if index < len(values) else 0] for i in range(0, 20, 2): patch[self.SnesCustomization(0xDFA1E + i)] = bytearray([hud]) patch[self.SnesCustomization(0x1BD6AA)] = bytearray(fileSelect) # z3QuickSwap - patch[0x40004B] = bytearray([0x01 if self.multiworld.quick_swap[self.player].value else 0x00]) + patch[0x40004B] = bytearray([0x01 if self.options.quick_swap.value else 0x00]) # smEnergyBeepOff - if (self.multiworld.energy_beep[self.player].value == 0): + if (self.options.energy_beep.value == 0): for ([addr, value]) in [ [0x90EA9B, 0x80], [0x90F337, 0x80], @@ -551,7 +553,7 @@ def post_fill(self): # some small or big keys (those always_allow) can be unreachable in-game # while logic still collects some of them (probably to simulate the player collecting pot keys in the logic), some others don't # so we need to remove those exceptions as progression items - if self.multiworld.accessibility[self.player] == 'items': + if self.options.accessibility.value == ItemsAccessibility.option_items: state = CollectionState(self.multiworld) locs = [self.multiworld.get_location("Swamp Palace - Big Chest", self.player), self.multiworld.get_location("Skull Woods - Big Chest", self.player), From 8a809be67a02ac44ebdbe748869585e703e40f6f Mon Sep 17 00:00:00 2001 From: agilbert1412 Date: Sat, 31 Aug 2024 21:57:43 +0300 Subject: [PATCH 52/60] Stardew Valley - Prize Ticket and Mystery Box grinding requires the abilty to redeem them #3728 --- worlds/stardew_valley/logic/grind_logic.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/worlds/stardew_valley/logic/grind_logic.py b/worlds/stardew_valley/logic/grind_logic.py index ccd8c5daccfb..e0ac84639d9c 100644 --- a/worlds/stardew_valley/logic/grind_logic.py +++ b/worlds/stardew_valley/logic/grind_logic.py @@ -5,6 +5,7 @@ from .book_logic import BookLogicMixin from .has_logic import HasLogicMixin from .received_logic import ReceivedLogicMixin +from .region_logic import RegionLogicMixin from .time_logic import TimeLogicMixin from ..options import Booksanity from ..stardew_rule import StardewRule, HasProgressionPercent @@ -13,6 +14,7 @@ from ..strings.currency_names import Currency from ..strings.fish_names import WaterChest from ..strings.geode_names import Geode +from ..strings.region_names import Region from ..strings.tool_names import Tool if TYPE_CHECKING: @@ -31,26 +33,28 @@ def __init__(self, *args, **kwargs): self.grind = GrindLogic(*args, **kwargs) -class GrindLogic(BaseLogic[Union[GrindLogicMixin, HasLogicMixin, ReceivedLogicMixin, BookLogicMixin, TimeLogicMixin, ToolLogicMixin]]): +class GrindLogic(BaseLogic[Union[GrindLogicMixin, HasLogicMixin, ReceivedLogicMixin, RegionLogicMixin, BookLogicMixin, TimeLogicMixin, ToolLogicMixin]]): def can_grind_mystery_boxes(self, quantity: int) -> StardewRule: + opening_rule = self.logic.region.can_reach(Region.blacksmith) mystery_box_rule = self.logic.has(Consumable.mystery_box) book_of_mysteries_rule = self.logic.true_ \ if self.options.booksanity == Booksanity.option_none \ else self.logic.book.has_book_power(Book.book_of_mysteries) # Assuming one box per day, but halved because we don't know how many months have passed before Mr. Qi's Plane Ride. time_rule = self.logic.time.has_lived_months(quantity // 14) - return self.logic.and_(mystery_box_rule, - book_of_mysteries_rule, - time_rule) + return self.logic.and_(opening_rule, mystery_box_rule, + book_of_mysteries_rule, time_rule,) def can_grind_artifact_troves(self, quantity: int) -> StardewRule: - return self.logic.and_(self.logic.has(Geode.artifact_trove), + opening_rule = self.logic.region.can_reach(Region.blacksmith) + return self.logic.and_(opening_rule, self.logic.has(Geode.artifact_trove), # Assuming one per month if the player does not grind it. self.logic.time.has_lived_months(quantity)) def can_grind_prize_tickets(self, quantity: int) -> StardewRule: - return self.logic.and_(self.logic.has(Currency.prize_ticket), + claiming_rule = self.logic.region.can_reach(Region.mayor_house) + return self.logic.and_(claiming_rule, self.logic.has(Currency.prize_ticket), # Assuming two per month if the player does not grind it. self.logic.time.has_lived_months(quantity // 2)) From 499dad53b1a3943019f1bf57897e48edf563150e Mon Sep 17 00:00:00 2001 From: Mysteryem Date: Sat, 31 Aug 2024 20:00:19 +0100 Subject: [PATCH 53/60] AHIT: Fix thug shops having 0 items after the first shop rolls 0 items (#3799) Once a thug shop rolled 0 as the number of items it should have, all remaining iterations would do nothing because neither the `count == -1` condition nor the `count >= 1` condition would be met. This caused all remaining thug shops to have zero items. This also caused the item counts of remaining thug shops to be absent from slot data, which was how this issue was found. I found the old code confusing and, rather than try to figure out how to fix it, I opted to rewrite it. With the new code, a local variable dictionary tracks the number of created locations for each thug and no more locations are created for a thug once their number of locations equals the number of shop items that thug rolled. --- worlds/ahit/Regions.py | 49 +++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/worlds/ahit/Regions.py b/worlds/ahit/Regions.py index 8cb3782bdec6..c70f08b475eb 100644 --- a/worlds/ahit/Regions.py +++ b/worlds/ahit/Regions.py @@ -968,40 +968,35 @@ def get_act_by_number(world: "HatInTimeWorld", chapter_name: str, num: int) -> R def create_thug_shops(world: "HatInTimeWorld"): min_items: int = world.options.NyakuzaThugMinShopItems.value max_items: int = world.options.NyakuzaThugMaxShopItems.value - count = -1 - step = 0 - old_name = "" + + thug_location_counts: Dict[str, int] = {} for key, data in shop_locations.items(): - if data.nyakuza_thug == "": + thug_name = data.nyakuza_thug + if thug_name == "": + # Different shop type. continue - if old_name != "" and old_name == data.nyakuza_thug: - continue + if thug_name not in world.nyakuza_thug_items: + shop_item_count = world.random.randint(min_items, max_items) + world.nyakuza_thug_items[thug_name] = shop_item_count + else: + shop_item_count = world.nyakuza_thug_items[thug_name] - try: - if world.nyakuza_thug_items[data.nyakuza_thug] <= 0: - continue - except KeyError: - pass + if shop_item_count <= 0: + continue - if count == -1: - count = world.random.randint(min_items, max_items) - world.nyakuza_thug_items.setdefault(data.nyakuza_thug, count) - if count <= 0: - continue + location_count = thug_location_counts.setdefault(thug_name, 0) + if location_count >= shop_item_count: + # Already created all the locations for this thug. + continue - if count >= 1: - region = world.multiworld.get_region(data.region, world.player) - loc = HatInTimeLocation(world.player, key, data.id, region) - region.locations.append(loc) - world.shop_locs.append(loc.name) - - step += 1 - if step >= count: - old_name = data.nyakuza_thug - step = 0 - count = -1 + # Create the shop location. + region = world.multiworld.get_region(data.region, world.player) + loc = HatInTimeLocation(world.player, key, data.id, region) + region.locations.append(loc) + world.shop_locs.append(loc.name) + thug_location_counts[thug_name] = location_count + 1 def create_events(world: "HatInTimeWorld") -> int: From fc8462f4e9f782bd123ce6123efab91c6850228a Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Sat, 31 Aug 2024 22:51:41 +0200 Subject: [PATCH 54/60] The Witness: Add Beginner Mode option preset #3691 --- worlds/witness/presets.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/worlds/witness/presets.py b/worlds/witness/presets.py index 105514c91eda..8993048065f4 100644 --- a/worlds/witness/presets.py +++ b/worlds/witness/presets.py @@ -3,6 +3,13 @@ from .options import * witness_option_presets: Dict[str, Dict[str, Any]] = { + # Best for beginners. This is just default options, but with a much easier goal that skips the Mountain puzzles. + "Beginner Mode": { + "victory_condition": VictoryCondition.option_mountain_box_short, + + "puzzle_skip_amount": 15, + }, + # Great for short syncs & scratching that "speedrun with light routing elements" itch. "Short & Dense": { "progression_balancing": 30, From 456b4adaa177ed13fda00b66b93cec1ef9c7333f Mon Sep 17 00:00:00 2001 From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Date: Sat, 31 Aug 2024 17:36:29 -0400 Subject: [PATCH 55/60] ALttP/Docs: Correcting the plando docs (#3835) * Correcting some text * Reword sentence --- worlds/alttp/docs/plando_en.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/worlds/alttp/docs/plando_en.md b/worlds/alttp/docs/plando_en.md index af8cbfe1b039..13224cb4d54e 100644 --- a/worlds/alttp/docs/plando_en.md +++ b/worlds/alttp/docs/plando_en.md @@ -2,8 +2,8 @@ ## Configuration -1. Plando features have to be enabled first, before they can be used (opt-in). -2. To do so, go to your installation directory (Windows default: `C:\ProgramData\Archipelago`), then open the host.yaml +1. All plando options are enabled by default, except for "items plando" which has to be enabled before it can be used (opt-in). +2. To enable it, go to your installation directory (Windows default: `C:\ProgramData\Archipelago`), then open the host.yaml file with a text editor. 3. In it, you're looking for the option key `plando_options`. To enable all plando modules you can set the value to `bosses, items, texts, connections` @@ -66,6 +66,7 @@ boss_shuffle: - ignored if only one world is generated - can be a number, to target that slot in the multiworld - can be a name, to target that player's world + - can be a list of names, to target those players' worlds - can be true, to target any other player's world - can be false, to target own world and is the default - can be null, to target a random world @@ -132,17 +133,15 @@ plando_items: ### Texts -- This module is disabled by default. - Has the options `text`, `at`, and `percentage` +- All of these options support subweights - percentage is the percentage chance for this text to be placed, can be omitted entirely for 100% - text is the text to be placed. - - can be weighted. - `\n` is a newline. - `@` is the entered player's name. - Warning: Text Mapper does not support full unicode. - [Alphabet](https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/alttp/Text.py#L758) - at is the location within the game to attach the text to. - - can be weighted. - [List of targets](https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/alttp/Text.py#L1499) #### Example @@ -162,7 +161,6 @@ and `uncle_dying_sewer`, then places the text "This is a plando. You've been war ### Connections -- This module is disabled by default. - Has the options `percentage`, `entrance`, `exit` and `direction`. - All options support subweights - percentage is the percentage chance for this to be connected, can be omitted entirely for 100% From 34a3b5f058766c650499eb48c2eced7e06c14c9b Mon Sep 17 00:00:00 2001 From: Scipio Wright Date: Sat, 31 Aug 2024 17:37:18 -0400 Subject: [PATCH 56/60] TUNIC: Add alias for Ladders in Overworld Town #3862 --- worlds/tunic/items.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worlds/tunic/items.py b/worlds/tunic/items.py index 3e7f2c1a4382..e0ee17831a0a 100644 --- a/worlds/tunic/items.py +++ b/worlds/tunic/items.py @@ -235,9 +235,10 @@ def get_item_group(item_name: str) -> str: "Questagons": {"Red Questagon", "Green Questagon", "Blue Questagon", "Gold Questagon"}, "Ladder to Atoll": {"Ladder to Ruined Atoll"}, # fuzzy matching made it hint Ladders in Well, now it won't "Ladders to Bell": {"Ladders to West Bell"}, - "Ladders to Well": {"Ladders in Well"}, # fuzzy matching decided ladders in well was ladders to west bell + "Ladders to Well": {"Ladders in Well"}, # fuzzy matching decided Ladders in Well was Ladders to West Bell "Ladders in Atoll": {"Ladders in South Atoll"}, "Ladders in Ruined Atoll": {"Ladders in South Atoll"}, + "Ladders in Town": {"Ladders in Overworld Town"}, # fuzzy matching decided this was Ladders in South Atoll } item_name_groups.update(extra_groups) From 1a41e1acc8417d2791cc50c2f8082f57ef076ea1 Mon Sep 17 00:00:00 2001 From: black-sliver <59490463+black-sliver@users.noreply.github.com> Date: Sun, 1 Sep 2024 20:34:50 +0200 Subject: [PATCH 57/60] customserver: fix memory leak (#3864) --- MultiServer.py | 18 ++++++++++++++++++ WebHostLib/customserver.py | 12 +++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/MultiServer.py b/MultiServer.py index b7c0e0f74555..fb539f56713b 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -67,6 +67,21 @@ def update_dict(dictionary, entries): return dictionary +def queue_gc(): + import gc + from threading import Thread + + gc_thread: typing.Optional[Thread] = getattr(queue_gc, "_thread", None) + def async_collect(): + time.sleep(2) + setattr(queue_gc, "_thread", None) + gc.collect() + if not gc_thread: + gc_thread = Thread(target=async_collect) + setattr(queue_gc, "_thread", gc_thread) + gc_thread.start() + + # functions callable on storable data on the server by clients modify_functions = { # generic: @@ -551,6 +566,9 @@ def get_datetime_second(): self.logger.info(f"Saving failed. Retry in {self.auto_save_interval} seconds.") else: self.save_dirty = False + if not atexit_save: # if atexit is used, that keeps a reference anyway + queue_gc() + self.auto_saver_thread = threading.Thread(target=save_regularly, daemon=True) self.auto_saver_thread.start() diff --git a/WebHostLib/customserver.py b/WebHostLib/customserver.py index ccffc40b384d..a2eef108b0a1 100644 --- a/WebHostLib/customserver.py +++ b/WebHostLib/customserver.py @@ -72,6 +72,14 @@ def __init__(self, static_server_data: dict, logger: logging.Logger): self.video = {} self.tags = ["AP", "WebHost"] + def __del__(self): + try: + import psutil + from Utils import format_SI_prefix + self.logger.debug(f"Context destroyed, Mem: {format_SI_prefix(psutil.Process().memory_info().rss, 1024)}iB") + except ImportError: + self.logger.debug("Context destroyed") + def _load_game_data(self): for key, value in self.static_server_data.items(): # NOTE: attributes are mutable and shared, so they will have to be copied before being modified @@ -249,6 +257,7 @@ async def start_room(room_id): ctx = WebHostContext(static_server_data, logger) ctx.load(room_id) ctx.init_save() + assert ctx.server is None try: ctx.server = websockets.serve( functools.partial(server, ctx=ctx), ctx.host, ctx.port, ssl=ssl_context) @@ -279,6 +288,7 @@ async def start_room(room_id): ctx.auto_shutdown = Room.get(id=room_id).timeout if ctx.saving: setattr(asyncio.current_task(), "save", lambda: ctx._save(True)) + assert ctx.shutdown_task is None ctx.shutdown_task = asyncio.create_task(auto_shutdown(ctx, [])) await ctx.shutdown_task @@ -325,7 +335,7 @@ def _done(self, task: asyncio.Future): def run(self): while 1: next_room = rooms_to_run.get(block=True, timeout=None) - gc.collect(0) + gc.collect() task = asyncio.run_coroutine_threadsafe(start_room(next_room), loop) self._tasks.append(task) task.add_done_callback(self._done) From 6f46397185ea945ed4db7d1404980c8f2d92253d Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Sun, 1 Sep 2024 21:41:55 +0200 Subject: [PATCH 58/60] Rogue Legacy: Crash generation when there are overlapping IDs (#3865) Client literally does not work when there are overlapping IDs. Phar is not currently intending to fix it. https://discord.com/channels/731205301247803413/929585237695029268/1269684436853723156 --- worlds/rogue_legacy/__init__.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/worlds/rogue_legacy/__init__.py b/worlds/rogue_legacy/__init__.py index eb657699540f..78e56a794c85 100644 --- a/worlds/rogue_legacy/__init__.py +++ b/worlds/rogue_legacy/__init__.py @@ -49,6 +49,30 @@ def fill_slot_data(self) -> dict: return {option_name: self.get_setting(option_name).value for option_name in rl_options} def generate_early(self): + location_ids_used_per_game = { + world.game: set(world.location_id_to_name) for world in self.multiworld.worlds.values() + } + item_ids_used_per_game = { + world.game: set(world.item_id_to_name) for world in self.multiworld.worlds.values() + } + overlapping_games = set() + + for id_lookup in (location_ids_used_per_game, item_ids_used_per_game): + for game_1, ids_1 in id_lookup.items(): + for game_2, ids_2 in id_lookup.items(): + if game_1 == game_2: + continue + + if ids_1 & ids_2: + overlapping_games.add(tuple(sorted([game_1, game_2]))) + + if overlapping_games: + raise RuntimeError( + "In this multiworld, there are games with overlapping item/location IDs.\n" + "The current Rogue Legacy does not support these and a fix is not currently planned.\n" + f"The overlapping games are: {overlapping_games}" + ) + # Check validation of names. additional_lady_names = len(self.get_setting("additional_lady_names").value) additional_sir_names = len(self.get_setting("additional_sir_names").value) From 3ab71daa8d14bfc4d83836c185a48692cbeaf518 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sun, 1 Sep 2024 21:59:37 +0200 Subject: [PATCH 59/60] MultiServer: put some limits in place (#3858) Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> --- MultiServer.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MultiServer.py b/MultiServer.py index fb539f56713b..e0b137fd68ce 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -1221,6 +1221,10 @@ def _cmd_countdown(self, seconds: str = "10") -> bool: timer = int(seconds, 10) except ValueError: timer = 10 + else: + if timer > 60 * 60: + raise ValueError(f"{timer} is invalid. Maximum is 1 hour.") + async_start(countdown(self.ctx, timer)) return True @@ -2057,6 +2061,8 @@ def _cmd_send_multiple(self, amount: typing.Union[int, str], player_name: str, * item_name, usable, response = get_intended_text(item_name, names) if usable: amount: int = int(amount) + if amount > 100: + raise ValueError(f"{amount} is invalid. Maximum is 100.") new_items = [NetworkItem(names[item_name], -1, 0) for _ in range(int(amount))] send_items_to(self.ctx, team, slot, *new_items) From 73701292b599c658b5d2f728230cd20743759181 Mon Sep 17 00:00:00 2001 From: black-sliver <59490463+black-sliver@users.noreply.github.com> Date: Mon, 2 Sep 2024 10:08:16 +0200 Subject: [PATCH 60/60] Core, CI: Add Python 3.12 support (#3290) * Core, CI: add py3.12 compat * Stardew Valley: Fix tests for Py3.12 * ModuleUpdate: always install pkg_resources * Docs: update supported python versions * WebHost: update pony to upstream 0.7.18 * CI: test hosting update to py3.12 * Update docs/running from source.md --- .github/workflows/unittests.yml | 7 ++++--- ModuleUpdate.py | 6 +++--- WebHostLib/requirements.txt | 2 +- docs/running from source.md | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 3ad29b007772..9a3a6d11217f 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -37,12 +37,13 @@ jobs: - {version: '3.9'} - {version: '3.10'} - {version: '3.11'} + - {version: '3.12'} include: - python: {version: '3.8'} # win7 compat os: windows-latest - - python: {version: '3.11'} # current + - python: {version: '3.12'} # current os: windows-latest - - python: {version: '3.11'} # current + - python: {version: '3.12'} # current os: macos-latest steps: @@ -70,7 +71,7 @@ jobs: os: - ubuntu-latest python: - - {version: '3.11'} # current + - {version: '3.12'} # current steps: - uses: actions/checkout@v4 diff --git a/ModuleUpdate.py b/ModuleUpdate.py index ed041bef4604..f49182bb7863 100644 --- a/ModuleUpdate.py +++ b/ModuleUpdate.py @@ -75,13 +75,13 @@ def update(yes: bool = False, force: bool = False) -> None: if not update_ran: update_ran = True + install_pkg_resources(yes=yes) + import pkg_resources + if force: update_command() return - install_pkg_resources(yes=yes) - import pkg_resources - prev = "" # if a line ends in \ we store here and merge later for req_file in requirements_files: path = os.path.join(os.path.dirname(sys.argv[0]), req_file) diff --git a/WebHostLib/requirements.txt b/WebHostLib/requirements.txt index 3452c9d416db..c61a153d24e0 100644 --- a/WebHostLib/requirements.txt +++ b/WebHostLib/requirements.txt @@ -1,6 +1,6 @@ flask>=3.0.3 werkzeug>=3.0.3 -pony>=0.7.17 +pony>=0.7.18 waitress>=3.0.0 Flask-Caching>=2.3.0 Flask-Compress>=1.15 diff --git a/docs/running from source.md b/docs/running from source.md index 34083a603d1b..4bd335648d66 100644 --- a/docs/running from source.md +++ b/docs/running from source.md @@ -8,7 +8,7 @@ use that version. These steps are for developers or platforms without compiled r What you'll need: * [Python 3.8.7 or newer](https://www.python.org/downloads/), not the Windows Store version - * **Python 3.12 is currently unsupported** + * Python 3.12.x is currently the newest supported version * pip: included in downloads from python.org, separate in many Linux distributions * Matching C compiler * possibly optional, read operating system specific sections @@ -31,7 +31,7 @@ After this, you should be able to run the programs. Recommended steps * Download and install a "Windows installer (64-bit)" from the [Python download page](https://www.python.org/downloads) - * **Python 3.12 is currently unsupported** + * [read above](#General) which versions are supported * **Optional**: Download and install Visual Studio Build Tools from [Visual Studio Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/).